-
Notifications
You must be signed in to change notification settings - Fork 293
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Instrument self hosted Kafka connectors #7959
Merged
piochelepiotr
merged 5 commits into
master
from
piotr-wolski/instrument-kafka-connectors
Dec 11, 2024
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e64755b
Add kafka connect instrumentation
piochelepiotr d043275
muzzle instrumentation before 0.11
piochelepiotr 65c3925
update service name in right order
piochelepiotr 63200d6
sort gradle includes
piochelepiotr 67e1e7b
Put delegate calls in try / finally
piochelepiotr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
dd-java-agent/instrumentation/kafka-connect-0.11/build.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
muzzle { | ||
pass { | ||
group = "org.apache.kafka" | ||
module = "connect-runtime" | ||
versions = "[0.11.0.0,)" | ||
assertInverse = true | ||
} | ||
} | ||
|
||
apply from: "$rootDir/gradle/java.gradle" | ||
|
||
dependencies { | ||
compileOnly group: 'org.apache.kafka', name: 'connect-runtime', version: '0.11.0.0' | ||
|
||
testImplementation(testFixtures(project(':dd-java-agent:agent-iast'))) | ||
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter') | ||
testRuntimeOnly project(':dd-java-agent:instrumentation:java-lang') | ||
testRuntimeOnly project(':dd-java-agent:instrumentation:java-io') | ||
testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core') | ||
testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8') | ||
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10') | ||
testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+' | ||
testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0' | ||
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3' | ||
testImplementation 'org.apache.kafka:connect-api:2.7.0' // Fixed version | ||
testImplementation 'org.apache.kafka:connect-runtime:2.7.0' | ||
testImplementation 'org.apache.kafka:connect-file:2.7.0' // For FileStreamSourceConnector | ||
testImplementation 'org.apache.kafka:kafka-clients:2.7.0' | ||
// Spring Kafka Test library | ||
testImplementation 'org.springframework.kafka:spring-kafka-test:2.7.9' // Version compatible with Kafka 2.7.x | ||
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka-clients-0.11') | ||
} | ||
|
||
configurations.testRuntimeClasspath { | ||
// spock-core depends on assertj version that is not compatible with kafka-clients | ||
resolutionStrategy.force 'org.assertj:assertj-core:2.9.1' | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you please also add
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka-clients-3.8')
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same for
kafka-streams-0.11
andkafka-streams-1.0
just in case to test interactionsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added them here. They should not be applied. Is that OK?