Skip to content

Commit f19e110

Browse files
Fix Kafka lag instrumentation for version 2.7 of Kafka (#7941)
Fix Kafka lag instrumentation for version 2.7 of Kafka
1 parent 105c9dc commit f19e110

File tree

7 files changed

+504
-1378
lines changed

7 files changed

+504
-1378
lines changed

dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ dependencies {
3838
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
3939

4040
// Include latest version of kafka itself along with latest version of client libs.
41-
// This seems to help with jar compatibility hell.
42-
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+'
4341
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.+'
4442
// latest depending to kafka client 2.x -> to be fixed when this instrumentation will test 3.x as well
45-
latestDepTestImplementation group: 'io.projectreactor.kafka', name: 'reactor-kafka', version: '1.3.21'
4643
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.+'
4744
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.+'
4845
latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.+'

dd-java-agent/instrumentation/kafka-clients-0.11/gradle.lockfile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,8 @@ io.netty:netty-resolver:4.1.63.Final=latestDepTestCompileClasspath,latestDepTest
8080
io.netty:netty-transport-native-epoll:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8181
io.netty:netty-transport-native-unix-common:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8282
io.netty:netty-transport:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
83-
io.projectreactor.kafka:reactor-kafka:1.0.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath
84-
io.projectreactor.kafka:reactor-kafka:1.3.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
85-
io.projectreactor:reactor-core:3.1.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath
86-
io.projectreactor:reactor-core:3.4.32=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
83+
io.projectreactor.kafka:reactor-kafka:1.0.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
84+
io.projectreactor:reactor-core:3.1.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8785
io.sqreen:libsqreen:11.1.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
8886
javax.activation:activation:1.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8987
javax.servlet:javax.servlet-api:3.1.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -203,8 +201,7 @@ org.ow2.asm:asm-util:9.2=iastLatestDepTest3RuntimeClasspath,instrumentPluginClas
203201
org.ow2.asm:asm-util:9.4=spotbugs
204202
org.ow2.asm:asm:9.2=iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
205203
org.ow2.asm:asm:9.4=spotbugs
206-
org.reactivestreams:reactive-streams:1.0.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath
207-
org.reactivestreams:reactive-streams:1.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
204+
org.reactivestreams:reactive-streams:1.0.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
208205
org.rocksdb:rocksdbjni:6.29.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
209206
org.scala-lang.modules:scala-collection-compat_2.13:2.6.0=latestDepTestRuntimeClasspath
210207
org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=latestDepTestRuntimeClasspath

0 commit comments

Comments
 (0)