Only apply bootstrap classpath modifications to instrumentation tests

Author: nikita-tkachenko-datadog

dd-java-agent/instrumentation/testing/build.gradle

@@ -0,0 +1,12 @@
+apply from: "$rootDir/gradle/java.gradle"
+
+dependencies {
+  api libs.bytebuddy
+  api libs.bytebuddyagent
+  api libs.guava
+
+  api project(':dd-java-agent:testing')
+  api project(':utils:test-utils')
+
+  implementation 'org.junit.platform:junit-platform-launcher:1.12.0'
+}

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/BootstrapClasspathSetup.java renamed to dd-java-agent/instrumentation/testing/src/main/groovy/datadog/trace/agent/test/BootstrapClasspathSetup.java

@@ -13,7 +13,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.jar.JarFile;
-import net.bytebuddy.agent.ByteBuddyAgent;
+import net.bytebuddy.ageAgentTestRunnerTestnt.ByteBuddyAgent;
 import org.junit.platform.launcher.LauncherSession;
 import org.junit.platform.launcher.LauncherSessionListener;
 

dd-java-agent/instrumentation/testing/src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener

@@ -0,0 +1 @@
+datadog.trace.agent.test.BootstrapClasspathSetup

dd-java-agent/instrumentation/testing/src/test/groovy/datadog/trace/agent/test/BootstrapClasspathSetupTest.groovy

@@ -0,0 +1,13 @@
+package datadog.trace.agent.test
+
+
+import datadog.trace.bootstrap.Constants
+import datadog.trace.test.util.DDSpecification
+
+class BootstrapClasspathSetupTest extends DDSpecification {
+
+  def "spock runner bootstrap prefixes correct for test setup"() {
+    expect:
+    BootstrapClasspathSetup.BOOTSTRAP_PACKAGE_PREFIXES_COPY == Constants.BOOTSTRAP_PACKAGE_PREFIXES
+  }
+}

dd-java-agent/testing/build.gradle

@@ -87,6 +87,3 @@ shadowJar {
   relocate "org.eclipse.jetty", "datadog.eclipse.jetty"
 }
 
-tasks.withType(Test).configureEach {
-  useJUnitPlatform()
-}

dd-java-agent/testing/src/test/groovy/AgentTestRunnerTest.groovy

@@ -1,6 +1,5 @@
 import com.google.common.reflect.ClassPath
 import datadog.trace.agent.test.AgentTestRunner
-import datadog.trace.agent.test.BootstrapClasspathSetup
 import datadog.trace.agent.test.utils.ClasspathUtils
 import datadog.trace.api.GlobalTracer
 import datadog.trace.api.Platform
@@ -35,11 +34,6 @@ class AgentTestRunnerTest extends AgentTestRunner {
     sharedSpanClass = AgentSpan
   }
 
-  def "spock runner bootstrap prefixes correct for test setup"() {
-    expect:
-    BootstrapClasspathSetup.BOOTSTRAP_PACKAGE_PREFIXES_COPY == Constants.BOOTSTRAP_PACKAGE_PREFIXES
-  }
-
   def "classpath setup"() {
     setup:
     boolean jfrSupported = isJFRSupported()

gradle/java_no_deps.gradle

@@ -35,6 +35,12 @@ if (applyCodeCoverage) {
   apply from: "$rootDir/gradle/jacoco.gradle"
 }
 
+if (project.path.startsWith(":dd-java-agent:instrumentation")) {
+  project.dependencies {
+    testImplementation project(':dd-java-agent:instrumentation:testing')
+  }
+}
+
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 

settings.gradle

@@ -209,6 +209,9 @@ include ':dd-smoke-tests:iast-util:iast-util-17'
 // annotation processor for checking instrumentation advice
 include ':dd-java-agent:instrumentation-annotation-processor'
 
+// instrumentation testing utilities
+include ':dd-java-agent:instrumentation:testing'
+
 // instrumentation:
 include ':dd-java-agent:instrumentation:aerospike-4'
 include ':dd-java-agent:instrumentation:akka:akka-actor-2.5'