Skip to content

Commit

Permalink
Fix Kafka lag instrumentation for version 2.7 of Kafka (#7941)
Browse files Browse the repository at this point in the history
Fix Kafka lag instrumentation for version 2.7 of Kafka
  • Loading branch information
piochelepiotr authored Nov 14, 2024
1 parent 105c9dc commit f19e110
Show file tree
Hide file tree
Showing 7 changed files with 504 additions and 1,378 deletions.
3 changes: 0 additions & 3 deletions dd-java-agent/instrumentation/kafka-clients-0.11/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,8 @@ dependencies {
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')

// Include latest version of kafka itself along with latest version of client libs.
// This seems to help with jar compatibility hell.
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+'
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.+'
// latest depending to kafka client 2.x -> to be fixed when this instrumentation will test 3.x as well
latestDepTestImplementation group: 'io.projectreactor.kafka', name: 'reactor-kafka', version: '1.3.21'
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.+'
latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.+'
latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.+'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,8 @@ io.netty:netty-resolver:4.1.63.Final=latestDepTestCompileClasspath,latestDepTest
io.netty:netty-transport-native-epoll:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
io.netty:netty-transport-native-unix-common:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
io.netty:netty-transport:4.1.63.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
io.projectreactor.kafka:reactor-kafka:1.0.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath
io.projectreactor.kafka:reactor-kafka:1.3.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
io.projectreactor:reactor-core:3.1.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath
io.projectreactor:reactor-core:3.4.32=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
io.projectreactor.kafka:reactor-kafka:1.0.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
io.projectreactor:reactor-core:3.1.0.RELEASE=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
io.sqreen:libsqreen:11.1.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
javax.activation:activation:1.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
javax.servlet:javax.servlet-api:3.1.0=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down Expand Up @@ -203,8 +201,7 @@ org.ow2.asm:asm-util:9.2=iastLatestDepTest3RuntimeClasspath,instrumentPluginClas
org.ow2.asm:asm-util:9.4=spotbugs
org.ow2.asm:asm:9.2=iastLatestDepTest3RuntimeClasspath,instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
org.ow2.asm:asm:9.4=spotbugs
org.reactivestreams:reactive-streams:1.0.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.reactivestreams:reactive-streams:1.0.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.reactivestreams:reactive-streams:1.0.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.rocksdb:rocksdbjni:6.29.4.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
org.scala-lang.modules:scala-collection-compat_2.13:2.6.0=latestDepTestRuntimeClasspath
org.scala-lang.modules:scala-java8-compat_2.13:1.0.2=latestDepTestRuntimeClasspath
Expand Down
Loading

0 comments on commit f19e110

Please sign in to comment.