Skip to content

Group kafka instrumentations under a super module #9528

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.

Sign up for GitHub

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

Merged
amarziali merged 2 commits into from
Sep 16, 2025
Merged

Group kafka instrumentations under a super module #9528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a4e9a4
Group kafka instrumentation under a super module
amarziali Sep 15, 2025
ec066d8
Merge branch 'master' into andrea.marziali/kafka
amarziali Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...mentation/kafka-clients-0.11/build.gradle → ...ion/kafka/kafka-clients-0.11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ forkedTest {

dependencies {
compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
implementation project(':dd-java-agent:instrumentation:kafka-common')
implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')

testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
Expand Down
0 ...tation/kafka-clients-0.11/gradle.lockfile → .../kafka/kafka-clients-0.11/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ovy/iast/KafkaIastDeserializerTest.groovy → ...ovy/iast/KafkaIastDeserializerTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...DepTest/groovy/KafkaClientTestBase.groovy → ...DepTest/groovy/KafkaClientTestBase.groovy
View file
Open in desktop
File renamed without changes.
0 ...on/kafka_clients/AvroSchemaExtractor.java → ...on/kafka_clients/AvroSchemaExtractor.java
View file
Open in desktop
File renamed without changes.
0 ...s/ConsumerCoordinatorInstrumentation.java → ...s/ConsumerCoordinatorInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...tion/kafka_clients/KafkaConsumerInfo.java → ...tion/kafka_clients/KafkaConsumerInfo.java
View file
Open in desktop
File renamed without changes.
0 ...nts/KafkaConsumerInfoInstrumentation.java → ...nts/KafkaConsumerInfoInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...clients/KafkaConsumerInstrumentation.java → ...clients/KafkaConsumerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...s/KafkaConsumerInstrumentationHelper.java → ...s/KafkaConsumerInstrumentationHelper.java
View file
Open in desktop
File renamed without changes.
0 ...ntation/kafka_clients/KafkaDecorator.java → ...ntation/kafka_clients/KafkaDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...nts/KafkaDeserializerInstrumentation.java → ...nts/KafkaDeserializerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...tation/kafka_clients/KafkaIastHelper.java → ...tation/kafka_clients/KafkaIastHelper.java
View file
Open in desktop
File renamed without changes.
0 .../kafka_clients/KafkaProducerCallback.java → .../kafka_clients/KafkaProducerCallback.java
View file
Open in desktop
File renamed without changes.
0 ...clients/KafkaProducerInstrumentation.java → ...clients/KafkaProducerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...afka_clients/MetadataInstrumentation.java → ...afka_clients/MetadataInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...fka_clients/NoopTextMapInjectAdapter.java → ...fka_clients/NoopTextMapInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 .../kafka_clients/TextMapExtractAdapter.java → .../kafka_clients/TextMapExtractAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...n/kafka_clients/TextMapInjectAdapter.java → ...n/kafka_clients/TextMapInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...lients/TextMapInjectAdapterInterface.java → ...lients/TextMapInjectAdapterInterface.java
View file
Open in desktop
File renamed without changes.
0 ...tation/kafka_clients/TracingIterable.java → ...tation/kafka_clients/TracingIterable.java
View file
Open in desktop
File renamed without changes.
0 ...fka_clients/TracingIterableDelegator.java → ...fka_clients/TracingIterableDelegator.java
View file
Open in desktop
File renamed without changes.
0 ...tation/kafka_clients/TracingIterator.java → ...tation/kafka_clients/TracingIterator.java
View file
Open in desktop
File renamed without changes.
0 ...umentation/kafka_clients/TracingList.java → ...umentation/kafka_clients/TracingList.java
View file
Open in desktop
File renamed without changes.
0 ...on/kafka_clients/TracingListIterator.java → ...on/kafka_clients/TracingListIterator.java
View file
Open in desktop
File renamed without changes.
0 ...lients-0.11/src/test/groovy/AvroMock.java → ...lients-0.11/src/test/groovy/AvroMock.java
View file
Open in desktop
File renamed without changes.
0 ...1/src/test/groovy/AvroMockSerializer.java → ...1/src/test/groovy/AvroMockSerializer.java
View file
Open in desktop
File renamed without changes.
0 ...aClientCustomPropagationConfigTest.groovy → ...aClientCustomPropagationConfigTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...rc/test/groovy/KafkaClientTestBase.groovy → ...rc/test/groovy/KafkaClientTestBase.groovy
View file
Open in desktop
File renamed without changes.
0 ...test/groovy/KafkaReactorForkedTest.groovy → ...test/groovy/KafkaReactorForkedTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...t/groovy/TextMapExtractAdapterTest.groovy → ...t/groovy/TextMapExtractAdapterTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...st/KafkaIastDeserializerForkedTest.groovy → ...st/KafkaIastDeserializerForkedTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...umentation/kafka-clients-3.8/build.gradle → ...tion/kafka/kafka-clients-3.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ tasks.withType(GroovyCompile) {
dependencies {
// compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '3.8.0'
main_java17CompileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '3.8.0'
implementation project(':dd-java-agent:instrumentation:kafka-common')
main_java17Implementation project(':dd-java-agent:instrumentation:kafka-common')
implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
main_java17Implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')

implementation project(':dd-java-agent:instrumentation:span-origin')

Expand Down
0 ...ntation/kafka-clients-3.8/gradle.lockfile → ...n/kafka/kafka-clients-3.8/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...8/ConsumerCoordinatorInstrumentation.java → ...8/ConsumerCoordinatorInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...s38/KafkaConsumerInfoInstrumentation.java → ...s38/KafkaConsumerInfoInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ients38/KafkaConsumerInstrumentation.java → ...ients38/KafkaConsumerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ients38/KafkaProducerInstrumentation.java → ...ients38/KafkaProducerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...gacyKafkaConsumerInfoInstrumentation.java → ...gacyKafkaConsumerInfoInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...nts38/MessageListenerInstrumentation.java → ...nts38/MessageListenerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ka_clients38/MetadataInstrumentation.java → ...ka_clients38/MetadataInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...CommitCallbackInvokerInstrumentation.java → ...CommitCallbackInvokerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../kafka_clients38/AvroSchemaExtractor.java → .../kafka_clients38/AvroSchemaExtractor.java
View file
Open in desktop
File renamed without changes.
0 ...on/kafka_clients38/ConstructorAdvice.java → ...on/kafka_clients38/ConstructorAdvice.java
View file
Open in desktop
File renamed without changes.
0 ..._clients38/ConsumerCoordinatorAdvice.java → ..._clients38/ConsumerCoordinatorAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...fka_clients38/DDOffsetCommitCallback.java → ...fka_clients38/DDOffsetCommitCallback.java
View file
Open in desktop
File renamed without changes.
0 ...ation/kafka_clients38/IterableAdvice.java → ...ation/kafka_clients38/IterableAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...ation/kafka_clients38/IteratorAdvice.java → ...ation/kafka_clients38/IteratorAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...on/kafka_clients38/KafkaConsumerInfo.java → ...on/kafka_clients38/KafkaConsumerInfo.java
View file
Open in desktop
File renamed without changes.
0 ...8/KafkaConsumerInstrumentationHelper.java → ...8/KafkaConsumerInstrumentationHelper.java
View file
Open in desktop
File renamed without changes.
0 ...ation/kafka_clients38/KafkaDecorator.java → ...ation/kafka_clients38/KafkaDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...afka_clients38/KafkaProducerCallback.java → ...afka_clients38/KafkaProducerCallback.java
View file
Open in desktop
File renamed without changes.
0 ...ka_clients38/LegacyConstructorAdvice.java → ...ka_clients38/LegacyConstructorAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...mentation/kafka_clients38/ListAdvice.java → ...mentation/kafka_clients38/ListAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...nts38/MetadataUpdate22AndAfterAdvice.java → ...nts38/MetadataUpdate22AndAfterAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...ients38/MetadataUpdateBefore22Advice.java → ...ients38/MetadataUpdateBefore22Advice.java
View file
Open in desktop
File renamed without changes.
0 ...a_clients38/NoopTextMapInjectAdapter.java → ...a_clients38/NoopTextMapInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...38/OffsetCommitCallbackInvokerAdvice.java → ...38/OffsetCommitCallbackInvokerAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...on/kafka_clients38/PayloadSizeAdvice.java → ...on/kafka_clients38/PayloadSizeAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...ation/kafka_clients38/ProducerAdvice.java → ...ation/kafka_clients38/ProducerAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...tation/kafka_clients38/RecordsAdvice.java → ...tation/kafka_clients38/RecordsAdvice.java
View file
Open in desktop
File renamed without changes.
0 ...afka_clients38/TextMapExtractAdapter.java → ...afka_clients38/TextMapExtractAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...kafka_clients38/TextMapInjectAdapter.java → ...kafka_clients38/TextMapInjectAdapter.java
View file
Open in desktop
File renamed without changes.
0 ...ents38/TextMapInjectAdapterInterface.java → ...ents38/TextMapInjectAdapterInterface.java
View file
Open in desktop
File renamed without changes.
0 ...tion/kafka_clients38/TracingIterable.java → ...tion/kafka_clients38/TracingIterable.java
View file
Open in desktop
File renamed without changes.
0 ...a_clients38/TracingIterableDelegator.java → ...a_clients38/TracingIterableDelegator.java
View file
Open in desktop
File renamed without changes.
0 ...tion/kafka_clients38/TracingIterator.java → ...tion/kafka_clients38/TracingIterator.java
View file
Open in desktop
File renamed without changes.
0 ...entation/kafka_clients38/TracingList.java → ...entation/kafka_clients38/TracingList.java
View file
Open in desktop
File renamed without changes.
0 .../kafka_clients38/TracingListIterator.java → .../kafka_clients38/TracingListIterator.java
View file
Open in desktop
File renamed without changes.
0 ...clients-3.8/src/test/groovy/AvroMock.java → ...clients-3.8/src/test/groovy/AvroMock.java
View file
Open in desktop
File renamed without changes.
0 ...8/src/test/groovy/AvroMockSerializer.java → ...8/src/test/groovy/AvroMockSerializer.java
View file
Open in desktop
File renamed without changes.
0 ...aClientCustomPropagationConfigTest.groovy → ...aClientCustomPropagationConfigTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...rc/test/groovy/KafkaClientTestBase.groovy → ...rc/test/groovy/KafkaClientTestBase.groovy
View file
Open in desktop
File renamed without changes.
0 ...t/groovy/TextMapExtractAdapterTest.groovy → ...t/groovy/TextMapExtractAdapterTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...instrumentation/kafka-common/build.gradle → ...mentation/kafka/kafka-common/build.gradle
View file
Open in desktop
File renamed without changes.
0 ...trumentation/kafka-common/gradle.lockfile → ...tation/kafka/kafka-common/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...tation/kafka_common/StreamingContext.java → ...tation/kafka_common/StreamingContext.java
View file
Open in desktop
File renamed without changes.
0 ...e/instrumentation/kafka_common/Utils.java → ...e/instrumentation/kafka_common/Utils.java
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...mentation/kafka-connect-0.11/build.gradle → ...ion/kafka/kafka-connect-0.11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ dependencies {
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')
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka-clients-3.8')
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka-streams-0.11')
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka-streams-1.0')
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka:kafka-clients-0.11')
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka:kafka-clients-3.8')
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka:kafka-streams-0.11')
testRuntimeOnly project(':dd-java-agent:instrumentation:kafka:kafka-streams-1.0')
}

configurations.testRuntimeClasspath {
Expand Down
0 ...tation/kafka-connect-0.11/gradle.lockfile → .../kafka/kafka-connect-0.11/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...connect/ConnectWorkerInstrumentation.java → ...connect/ConnectWorkerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...mentation/kafka_connect/TaskListener.java → ...mentation/kafka_connect/TaskListener.java
View file
Open in desktop
File renamed without changes.
0 ...y/ConnectWorkerInstrumentationTest.groovy → ...y/ConnectWorkerInstrumentationTest.groovy
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...mentation/kafka-streams-0.11/build.gradle → ...ion/kafka/kafka-streams-0.11/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ addTestSuite('latestDepTest')
dependencies {
compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'

implementation project(':dd-java-agent:instrumentation:kafka-common')
implementation project(':dd-java-agent:instrumentation:kafka-clients-0.11')
implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
implementation project(':dd-java-agent:instrumentation:kafka:kafka-clients-0.11')

testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
testImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
Expand Down
0 ...tation/kafka-streams-0.11/gradle.lockfile → .../kafka/kafka-streams-0.11/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...estDepTest/groovy/KafkaStreamsTest.groovy → ...estDepTest/groovy/KafkaStreamsTest.groovy
View file
Open in desktop
File renamed without changes.
0 ...reams/KafkaStreamTaskInstrumentation.java → ...reams/KafkaStreamTaskInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../kafka_streams/KafkaStreamsDecorator.java → .../kafka_streams/KafkaStreamsDecorator.java
View file
Open in desktop
File renamed without changes.
0 ...odeRecordDeserializerInstrumentation.java → ...odeRecordDeserializerInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 .../ProcessorRecordContextHeadersAccess.java → .../ProcessorRecordContextHeadersAccess.java
View file
Open in desktop
File renamed without changes.
0 ...streams/ProcessorRecordContextSetter.java → ...streams/ProcessorRecordContextSetter.java
View file
Open in desktop
File renamed without changes.
0 ...treams/ProcessorRecordContextVisitor.java → ...treams/ProcessorRecordContextVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...a_streams/StampedRecordContextSetter.java → ...a_streams/StampedRecordContextSetter.java
View file
Open in desktop
File renamed without changes.
0 ..._streams/StampedRecordContextVisitor.java → ..._streams/StampedRecordContextVisitor.java
View file
Open in desktop
File renamed without changes.
0 ...tion/kafka_streams/StreamTaskContext.java → ...tion/kafka_streams/StreamTaskContext.java
View file
Open in desktop
File renamed without changes.
0 ...c/test/groovy/KafkaStreamsTestBase.groovy → ...c/test/groovy/KafkaStreamsTestBase.groovy
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...umentation/kafka-streams-1.0/build.gradle → ...tion/kafka/kafka-streams-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ addTestSuite('latestDepTest')

dependencies {
compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '1.0.0'
implementation project(':dd-java-agent:instrumentation:kafka-common')
implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
}
0 ...ntation/kafka-streams-1.0/gradle.lockfile → ...n/kafka/kafka-streams-1.0/gradle.lockfile
View file
Open in desktop
File renamed without changes.
0 ...ternalTopologyBuilderInstrumentation.java → ...ternalTopologyBuilderInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...ka_streams10/StreamingContextUpdater.java → ...ka_streams10/StreamingContextUpdater.java
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,12 +429,12 @@ include(
":dd-java-agent:instrumentation:junit-5.3:junit-5.8",
":dd-java-agent:instrumentation:junit-5.3:cucumber-junit-5",
":dd-java-agent:instrumentation:junit-5.3:spock-junit-5",
":dd-java-agent:instrumentation:kafka-clients-0.11",
":dd-java-agent:instrumentation:kafka-clients-3.8",
":dd-java-agent:instrumentation:kafka-common",
":dd-java-agent:instrumentation:kafka-connect-0.11",
":dd-java-agent:instrumentation:kafka-streams-0.11",
":dd-java-agent:instrumentation:kafka-streams-1.0",
":dd-java-agent:instrumentation:kafka:kafka-clients-0.11",
":dd-java-agent:instrumentation:kafka:kafka-clients-3.8",
":dd-java-agent:instrumentation:kafka:kafka-common",
":dd-java-agent:instrumentation:kafka:kafka-connect-0.11",
":dd-java-agent:instrumentation:kafka:kafka-streams-0.11",
":dd-java-agent:instrumentation:kafka:kafka-streams-1.0",
":dd-java-agent:instrumentation:karate",
":dd-java-agent:instrumentation:kotlin-coroutines",
":dd-java-agent:instrumentation:lettuce-4",
Expand Down