Add convetion for netty-concurrent tests

build-logic/conventions/src/main/kotlin/dd-trace-java.instrumentation.netty-concurrent-tests.gradle.kts

@@ -0,0 +1,6 @@
+pluginManager.withPlugin("dd-trace-java.module.instrumentation") {
+  dependencies {
+    // java-concurrent captures Netty tasks; netty-concurrent owns their activation and cleanup.
+    add("testImplementation", project(":dd-java-agent:instrumentation:netty:netty-concurrent-4.0"))
+  }
+}

build.gradle.kts

@@ -13,6 +13,9 @@ plugins {
   id("dd-trace-java.gradle-debug")
   id("dd-trace-java.tracer-version")
 
+  // Keep the shared image resolver in one classloader across subproject plugin combinations.
+  id("dd-trace-java.testcontainers") apply false
+
   alias(libs.plugins.shadow) apply false
   alias(libs.plugins.spotless)
   id("com.github.spotbugs") version "6.5.11"

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle

@@ -1,6 +1,7 @@
 plugins {
   id 'com.google.protobuf' version '0.10.0'
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'idea'
 }
 
@@ -56,7 +57,6 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-3.8')
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.0')
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
 
   latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes
   latestDepTestImplementation group: 'com.linecorp.armeria', name: 'armeria-grpc', version: '1.+'

dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -80,7 +81,6 @@ dependencies {
   jetty9LatestDepTestImplementation "org.eclipse.jetty:jetty-servlet:9.+",  {
     exclude group: 'org.slf4j', module: 'slf4j-api'
   }
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'dd-trace-java.testcontainers'
 }
 
@@ -71,7 +72,6 @@ dependencies {
   }
 
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(':dd-java-agent:instrumentation:guava-10.0')
 
   latestDepTestImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.7+'

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'dd-trace-java.testcontainers'
 }
 
@@ -39,7 +40,6 @@ dependencies {
     exclude group: 'com.datastax.cassandra', module: 'cassandra-driver-core'
   }
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(':dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.0')
   testImplementation project(':dd-java-agent:instrumentation:guava-10.0')
 

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'dd-trace-java.testcontainers'
 }
 
@@ -32,7 +33,6 @@ dependencies {
   // Force 0.3.3 because 0.3.0 has a version parsing bug that fails on jdk 15
   testImplementation group: 'com.github.jbellis', name: "jamm", version: '0.3.3'
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(':dd-java-agent:instrumentation:guava-10.0')
 
   latestDepTestImplementation group: 'com.datastax.oss', name: 'java-driver-core', version: '+'

dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/google-pubsub-1.116/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'dd-trace-java.testcontainers'
 }
 
@@ -23,7 +24,6 @@ dependencies {
   testImplementation group: 'org.testcontainers', name: 'gcloud', version: libs.versions.testcontainers.get()
   testImplementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.116.0'
   testImplementation project(":dd-java-agent:instrumentation:grpc-1.5")
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(":dd-java-agent:instrumentation:guava-10.0")
   testImplementation project(":dd-java-agent:instrumentation:gax-1.4")
   latestDepTestImplementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '+'

dd-java-agent/instrumentation/grpc-1.5/build.gradle

@@ -1,6 +1,7 @@
 plugins {
   id 'com.google.protobuf' version '0.10.0'
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'idea'
 }
 
@@ -40,7 +41,6 @@ dependencies {
   testImplementation group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion
   testImplementation group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
   testImplementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
 
   latestDepTestImplementation sourceSets.test.output // include the protobuf generated classes

dd-java-agent/instrumentation/lettuce/lettuce-4.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -16,7 +17,6 @@ addTestSuiteForDir('latestDepTest', 'test')
 dependencies {
   compileOnly group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final'
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation group: 'com.github.codemonstur', name: 'embedded-redis', version: '1.4.3'
   testImplementation group: 'biz.paluch.redis', name: 'lettuce', version: '4.0.Final'
 

dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'dd-trace-java.jmh-conventions'
   id 'dd-trace-java.testcontainers'
 }
@@ -28,7 +29,6 @@ dependencies {
   testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis', version: '1.6.2'
   testImplementation libs.testcontainers
   testImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE'
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
   testImplementation project(':dd-java-agent:instrumentation:reactive-streams-1.0')
   // Needed for tests using Lettuce 5.1.0 -> Reactor 3.2.0, 6.0.0 -> 3.3.10, and 6.1.0 -> 3.3.15.

dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-2.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -22,7 +23,6 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-3.0')
 
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '2.0.0'
 
   testAnnotationProcessor "io.micronaut:micronaut-inject-java:2.0.0"

dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-3.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -22,7 +23,6 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:micronaut:micronaut-http-server-netty:micronaut-http-server-netty-2.0')
 
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation group: 'io.micronaut', name: 'micronaut-http-server-netty', version: '3.0.0'
   testImplementation group: 'io.projectreactor', name: 'reactor-core', version: '3.5.3'
 

dd-java-agent/instrumentation/netty/netty-4.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 testJvmConstraints {
@@ -39,7 +40,6 @@ addTestSuiteForDir('latestDepTest', 'test')
 dependencies {
   compileOnly group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-promise-4.0')
   testImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
   testImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.0'

dd-java-agent/instrumentation/netty/netty-4.1/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -44,7 +45,6 @@ dependencies {
   api project(':dd-java-agent:instrumentation:netty:netty-common')
 
   testImplementation libs.bundles.mockito
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-promise-4.0')
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
   testImplementation project(':dd-java-agent:instrumentation:reactive-streams-1.0')

dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -17,7 +18,6 @@ addTestSuiteForDir('latestDepTest', 'test')
 dependencies {
   compileOnly group: 'io.netty', name: 'netty-common', version: '4.0.0.Final'
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation group: 'io.netty', name: 'netty-common', version: '4.0.0.Final'
 
   latestDep4TestImplementation group: 'io.netty', name: 'netty-common', version: '4.+'

dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {

dd-java-agent/instrumentation/play/play-appsec-2.5/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'scala'
 }
 
@@ -79,7 +80,6 @@ dependencies {
   routeGeneratorImplementation libs.scala211
   routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.11", version: '2.5.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testRuntimeOnly project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')

dd-java-agent/instrumentation/ratpack-1.5/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -17,7 +18,6 @@ addTestSuiteForDir('latestDepTest', 'test')
 dependencies {
   compileOnly group: 'io.ratpack', name: 'ratpack-core', version: '1.5.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
   testImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0'
   testImplementation 'com.sun.activation:jakarta.activation:1.2.2'

dd-java-agent/instrumentation/reactor-netty-1.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -25,7 +26,6 @@ dependencies {
 
   testImplementation group: 'io.projectreactor.netty', name: 'reactor-netty-http', version: '1.0.0'
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation libs.mokito.core
   testRuntimeOnly project(':dd-java-agent:instrumentation:reactor-core-3.1')
   testRuntimeOnly project(':dd-java-agent:instrumentation:reactive-streams-1.0')

dd-java-agent/instrumentation/redisson/redisson-2.0.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'dd-trace-java.testcontainers'
 }
 
@@ -20,7 +21,6 @@ dependencies {
   compileOnly group: 'org.redisson', name: 'redisson', version: '2.0.0'
   testContainerImage(image('redis:6.2.6', 'test.redis.image'))
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis', version: '1.6.2'
   testImplementation libs.testcontainers
   testImplementation group: 'org.redisson', name: 'redisson', version: '2.0.0'

dd-java-agent/instrumentation/redisson/redisson-2.3.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'dd-trace-java.testcontainers'
 }
 
@@ -20,7 +21,6 @@ dependencies {
   compileOnly group: 'org.redisson', name: 'redisson', version: '2.3.0'
   testContainerImage(image('redis:6.2.6', 'test.redis.image'))
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis', version: '1.6.2'
   testImplementation libs.testcontainers
   testImplementation group: 'org.redisson', name: 'redisson', version: '2.3.0'

dd-java-agent/instrumentation/redisson/redisson-3.10.3/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
   id 'dd-trace-java.testcontainers'
 }
 
@@ -22,7 +23,6 @@ dependencies {
   }
   testContainerImage(image('redis:6.2.6', 'test.redis.image'))
 
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis', version: '1.6.2'
   testImplementation libs.testcontainers
   testImplementation group: 'org.redisson', name: 'redisson', version: '3.10.3', {

dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id 'dd-trace-java.module.instrumentation'
+  id 'dd-trace-java.instrumentation.netty-concurrent-tests'
 }
 
 muzzle {
@@ -22,7 +23,6 @@ dependencies {
   // Required so that GrpcServerModule / GrpcClientModule are discovered via ServiceLoader
   // in SofaRpcTripleWithGrpcForkedTest.
   testImplementation project(':dd-java-agent:instrumentation:grpc-1.5')
-  testImplementation project(':dd-java-agent:instrumentation:netty:netty-concurrent-4.0')
   testImplementation group: "io.grpc", name: "grpc-netty", version: "1.53.0"
   testImplementation group: "io.grpc", name: "grpc-core", version: "1.53.0"
   testImplementation group: "io.grpc", name: "grpc-stub", version: "1.53.0"