Fix latestDep tests

Author: ygree

dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/build.gradle

@@ -6,12 +6,12 @@ muzzle {
   pass {
     group = 'io.servicetalk'
     module = 'servicetalk-concurrent-api'
-    versions = '[0.42.0,0.42.56)'
+    versions = '[0.42.0,0.42.55]'
   }
   fail {
     group = 'io.servicetalk'
     module = 'servicetalk-concurrent-api'
-    versions = '[0.42.56,]'
+    versions = '(0.42.55,]'
   }
 }
 
@@ -27,12 +27,13 @@ dependencies {
   compileOnly group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '0.42.0'
   compileOnly group: 'io.servicetalk', name: 'servicetalk-context-api', version: '0.42.0'
 
-  testImplementation group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '0.42.55'
-  testImplementation group: 'io.servicetalk', name: 'servicetalk-context-api', version: '0.42.55'
+  testImplementation group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '0.42.42'
+  testImplementation group: 'io.servicetalk', name: 'servicetalk-context-api', version: '0.42.42'
 
+  // import the newer instrumentation into the test to ensure that it does not interfere with it
   testRuntimeOnly project(":dd-java-agent:instrumentation:servicetalk:servicetalk-0.42.56")
 
-  latestDepTestImplementation group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '0.42.56'
-  latestDepTestImplementation group: 'io.servicetalk', name: 'servicetalk-context-api', version: '0.42.56'
+  latestDepTestImplementation group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '0.42.55'
+  latestDepTestImplementation group: 'io.servicetalk', name: 'servicetalk-context-api', version: '0.42.55'
 }
 

dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/gradle.lockfile

@@ -4,14 +4,16 @@
 cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 ch.qos.logback:logback-classic:1.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+ch.qos.logback:logback-core:1.2.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath
+ch.qos.logback:logback-core:1.5.18=testRuntimeClasspath
 com.beust:jcommander:1.78=latestDepTestRuntimeClasspath,testRuntimeClasspath
 com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.15.4=testCompileClasspath,testRuntimeClasspath
 com.github.javaparser:javaparser-core:3.25.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -21,8 +23,9 @@ com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,latestDepTestRuntimeClas
 com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
+com.github.spotbugs:spotbugs-annotations:4.8.3=testCompileClasspath,testRuntimeClasspath
 com.github.spotbugs:spotbugs:4.7.3=spotbugs
 com.github.stefanbirkner:system-rules:1.19.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath
@@ -36,6 +39,7 @@ com.google.guava:guava:20.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl
 com.google.guava:guava:27.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
 com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
+com.google.protobuf:protobuf-bom:3.25.1=testCompileClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.7=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -47,23 +51,26 @@ commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDe
 commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 de.thetaphi:forbiddenapis:3.8=compileClasspath
 info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
-io.servicetalk:servicetalk-annotations:0.42.55=testRuntimeClasspath
-io.servicetalk:servicetalk-annotations:0.42.56=latestDepTestRuntimeClasspath
-io.servicetalk:servicetalk-buffer-api:0.42.55=testRuntimeClasspath
-io.servicetalk:servicetalk-buffer-api:0.42.56=latestDepTestRuntimeClasspath
+io.netty:netty-bom:4.1.107.Final=testCompileClasspath,testRuntimeClasspath
+io.servicetalk:servicetalk-annotations:0.42.42=testRuntimeClasspath
+io.servicetalk:servicetalk-annotations:0.42.55=latestDepTestRuntimeClasspath
+io.servicetalk:servicetalk-bom:0.42.42=testCompileClasspath,testRuntimeClasspath
+io.servicetalk:servicetalk-buffer-api:0.42.42=testRuntimeClasspath
+io.servicetalk:servicetalk-buffer-api:0.42.55=latestDepTestRuntimeClasspath
 io.servicetalk:servicetalk-concurrent-api:0.42.0=compileClasspath
-io.servicetalk:servicetalk-concurrent-api:0.42.55=testCompileClasspath,testRuntimeClasspath
-io.servicetalk:servicetalk-concurrent-api:0.42.56=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-io.servicetalk:servicetalk-concurrent-internal:0.42.55=testRuntimeClasspath
-io.servicetalk:servicetalk-concurrent-internal:0.42.56=latestDepTestRuntimeClasspath
+io.servicetalk:servicetalk-concurrent-api:0.42.42=testCompileClasspath,testRuntimeClasspath
+io.servicetalk:servicetalk-concurrent-api:0.42.55=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+io.servicetalk:servicetalk-concurrent-internal:0.42.42=testRuntimeClasspath
+io.servicetalk:servicetalk-concurrent-internal:0.42.55=latestDepTestRuntimeClasspath
 io.servicetalk:servicetalk-concurrent:0.42.0=compileClasspath
-io.servicetalk:servicetalk-concurrent:0.42.55=testCompileClasspath,testRuntimeClasspath
-io.servicetalk:servicetalk-concurrent:0.42.56=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+io.servicetalk:servicetalk-concurrent:0.42.42=testCompileClasspath,testRuntimeClasspath
+io.servicetalk:servicetalk-concurrent:0.42.55=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 io.servicetalk:servicetalk-context-api:0.42.0=compileClasspath
-io.servicetalk:servicetalk-context-api:0.42.55=testCompileClasspath,testRuntimeClasspath
-io.servicetalk:servicetalk-context-api:0.42.56=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-io.servicetalk:servicetalk-utils-internal:0.42.55=testRuntimeClasspath
-io.servicetalk:servicetalk-utils-internal:0.42.56=latestDepTestRuntimeClasspath
+io.servicetalk:servicetalk-context-api:0.42.42=testCompileClasspath,testRuntimeClasspath
+io.servicetalk:servicetalk-context-api:0.42.55=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+io.servicetalk:servicetalk-dependencies:0.42.42=testCompileClasspath,testRuntimeClasspath
+io.servicetalk:servicetalk-utils-internal:0.42.42=testRuntimeClasspath
+io.servicetalk:servicetalk-utils-internal:0.42.55=latestDepTestRuntimeClasspath
 io.sqreen:libsqreen:13.0.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
 javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:1.2.0=spotbugs
@@ -89,6 +96,7 @@ org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
 org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
 org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
 org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
+org.apache.logging.log4j:log4j-bom:2.22.1=testCompileClasspath,testRuntimeClasspath
 org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
 org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:2.5.2=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor
@@ -128,6 +136,7 @@ org.eclipse.jetty:jetty-http:9.4.56.v20240826=latestDepTestCompileClasspath,late
 org.eclipse.jetty:jetty-io:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-server:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty:jetty-util:9.4.56.v20240826=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.glassfish.jersey:jersey-bom:2.37=testCompileClasspath,testRuntimeClasspath
 org.gmetrics:GMetrics:1.1=codenarc
 org.hamcrest:hamcrest-core:1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -162,15 +171,15 @@ org.ow2.asm:asm:9.8=latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:jul-to-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath
-org.slf4j:slf4j-api:1.7.36=latestDepTestRuntimeClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath
+org.slf4j:slf4j-api:1.7.36=latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
 org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
+org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 org.spockframework:spock-core:2.3-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.spockframework:spock-junit4:2.3-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.testng:testng:7.5=latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:4.4.3=spotbugs
-org.yaml:snakeyaml:2.4=instrumentPluginClasspath,latestDepTestRuntimeClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 xml-apis:xml-apis:1.4.01=spotbugs
 empty=main_java11AnnotationProcessor,spotbugsPlugins,testFixturesAnnotationProcessor,testFixturesCompileClasspath

dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/build.gradle

@@ -32,6 +32,7 @@ dependencies {
   testImplementation group: 'io.servicetalk', name: 'servicetalk-concurrent-api', version: '0.42.56'
   testImplementation group: 'io.servicetalk', name: 'servicetalk-context-api', version: '0.42.56'
 
+  // import the previous instrumentation into the test to ensure that it does not interfere with it
   testRuntimeOnly project(":dd-java-agent:instrumentation:servicetalk:servicetalk-0.42.0")
 
   // TODO currently 0.42.56 is the latest version. Enable this once the next (0.42.57) is out, add 'latestDepTest'