Use single shaded testing artifact (#14676)

Author: laurit

instrumentation/build.gradle.kts

@@ -24,8 +24,8 @@ subprojects {
     // this only exists to make Intellij happy since it doesn't (currently at least) understand our
     // inclusion of this artifact inside :testing-common
     dependencies {
-      compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
-      testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
+      compileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
+      testCompileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
     }
   }
 

instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts

@@ -69,7 +69,7 @@ testing {
       dependencies {
         // this only exists to make Intellij happy since it doesn't (currently at least) understand our
         // inclusion of this artifact inside :testing-common
-        compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
+        compileOnly(project.dependencies.project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
 
         if (findProperty("testLatestDeps") as Boolean) {
           implementation("com.typesafe.akka:akka-http_2.13:latest.release")

instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts

@@ -35,7 +35,7 @@ testing {
       dependencies {
         // this only exists to make Intellij happy since it doesn't (currently at least) understand our
         // inclusion of this artifact inside :testing-common
-        compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
+        compileOnly(project.dependencies.project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
 
         val version = if (testLatestDeps) "3.+" else "3.5.0"
         implementation("org.hsqldb:hsqldb:2.3.4")
@@ -52,7 +52,7 @@ testing {
       dependencies {
         // this only exists to make Intellij happy since it doesn't (currently at least) understand our
         // inclusion of this artifact inside :testing-common
-        compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
+        compileOnly(project.dependencies.project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
 
         val version = if (testLatestDeps) "4.+" else "4.1.0"
         implementation("org.hsqldb:hsqldb:2.3.4")
@@ -69,7 +69,7 @@ testing {
       dependencies {
         // this only exists to make Intellij happy since it doesn't (currently at least) understand our
         // inclusion of this artifact inside :testing-common
-        compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
+        compileOnly(project.dependencies.project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
 
         val version = if (testLatestDeps) "latest.release" else "5.0.0"
         implementation("org.hsqldb:hsqldb:2.3.4")

settings.gradle.kts

@@ -102,9 +102,7 @@ include(":instrumentation-docs")
 include(":test-report")
 include(":testing:agent-exporter")
 include(":testing:agent-for-testing")
-include(":testing:armeria-shaded-for-testing")
-include(":testing:proto-shaded-for-testing")
-include(":testing:wiremock-shaded-for-testing")
+include(":testing:dependencies-shaded-for-testing")
 include(":testing-common")
 include(":testing-common:integration-tests")
 include(":testing-common:library-for-integration-tests")

smoke-tests/build.gradle.kts

@@ -38,9 +38,8 @@ dependencies {
   implementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion")
 
   // make IntelliJ see shaded Armeria and protobuf
-  compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
-  testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
-  compileOnly(project(":testing:proto-shaded-for-testing", configuration = "shadow"))
+  compileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
+  testCompileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
 }
 
 tasks {

testing-common/build.gradle.kts

@@ -8,22 +8,10 @@ group = "io.opentelemetry.javaagent"
 
 sourceSets {
   main {
-    val armeriaShadedDeps = project(":testing:armeria-shaded-for-testing")
+    val shadedDeps = project(":testing:dependencies-shaded-for-testing")
     output.dir(
-      armeriaShadedDeps.file("build/extracted/shadow"),
-      "builtBy" to ":testing:armeria-shaded-for-testing:extractShadowJar"
-    )
-
-    val protoShadedDeps = project(":testing:proto-shaded-for-testing")
-    output.dir(
-      protoShadedDeps.file("build/extracted/shadow"),
-      "builtBy" to ":testing:proto-shaded-for-testing:extractShadowJar"
-    )
-
-    val wiremockShadedDeps = project(":testing:wiremock-shaded-for-testing")
-    output.dir(
-      wiremockShadedDeps.file("build/extracted/shadow"),
-      "builtBy" to ":testing:wiremock-shaded-for-testing:extractShadowJar"
+      shadedDeps.file("build/extracted/shadow"),
+      "builtBy" to ":testing:dependencies-shaded-for-testing:extractShadowJar"
     )
   }
 }
@@ -59,11 +47,9 @@ dependencies {
   api("org.awaitility:awaitility")
   api("org.mockito:mockito-core")
   api("org.slf4j:slf4j-api")
+  api("com.google.code.findbugs:annotations")
 
-  compileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
-  compileOnly(project(":testing:proto-shaded-for-testing", configuration = "shadow"))
-  // used to record LLM responses in gen AI tests
-  compileOnly(project(":testing:wiremock-shaded-for-testing", configuration = "shadow"))
+  compileOnly(project(":testing:dependencies-shaded-for-testing", configuration = "shadow"))
   compileOnly(project(":javaagent-bootstrap"))
 
   compileOnly("com.google.auto.value:auto-value-annotations")

testing/armeria-shaded-for-testing/build.gradle.kts renamed to testing/dependencies-shaded-for-testing/build.gradle.kts

@@ -6,6 +6,10 @@ plugins {
 dependencies {
   implementation("com.linecorp.armeria:armeria-junit5:1.33.2")
   implementation("com.google.errorprone:error_prone_annotations")
+  implementation("io.opentelemetry.proto:opentelemetry-proto")
+  implementation("com.google.protobuf:protobuf-java-util:4.32.1")
+  implementation("com.github.tomakehurst:wiremock-jre8:2.35.2")
+  implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0")
 }
 
 tasks {
@@ -14,6 +18,7 @@ tasks {
       exclude(dependency("org.slf4j:slf4j-api"))
       exclude(dependency("org.junit.jupiter:junit-jupiter-api"))
       exclude(dependency("org.junit.platform:junit-platform-commons"))
+      exclude(dependency("com.google.code.findbugs:annotations"))
     }
 
     // Ensures tests are not affected by Armeria instrumentation
@@ -37,11 +42,30 @@ tasks {
     relocate("org.HdrHistogram", "io.opentelemetry.testing.internal.org.hdrhistogram")
     relocate("org.LatencyUtils", "io.opentelemetry.testing.internal.org.latencyutils")
 
+    relocate("io.opentelemetry.proto", "io.opentelemetry.testing.internal.proto")
+    relocate("com.google.protobuf", "io.opentelemetry.testing.internal.protobuf")
+    relocate("com.google.gson", "io.opentelemetry.testing.internal.gson")
+    relocate("com.google.common", "io.opentelemetry.testing.internal.guava")
+    relocate("org.apache.commons", "io.opentelemetry.testing.internal.apachecommons")
+    relocate("org.apache.hc", "io.opentelemetry.testing.internal.apachehttp")
+    relocate("org.eclipse.jetty", "io.opentelemetry.testing.internal.jetty")
+    relocate("com.fasterxml.jackson", "io.opentelemetry.testing.internal.jackson")
+    relocate("com.jayway.jsonpath", "io.opentelemetry.testing.internal.jsonpath")
+    relocate("javax.servlet", "io.opentelemetry.testing.internal.servlet")
+    relocate("org.yaml", "io.opentelemetry.testing.internal.yaml")
+
+    // don't relocate wiremock itself
+    relocate("com.github.tomakehurst.wiremock", "com.github.tomakehurst.wiremock")
+
     mergeServiceFiles()
     // mergeServiceFiles requires that duplicate strategy is set to include
     filesMatching("META-INF/services/**") {
       duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
+
+    // relocate everything else
+    enableAutoRelocation = true
+    relocationPrefix = "io.opentelemetry.testing.internal"
   }
 
   val extractShadowJar by registering(Copy::class) {