move classloading to java-lang

Author: amarziali

dd-java-agent/instrumentation/build.gradle

@@ -69,7 +69,7 @@ subprojects { Project subProj ->
       testImplementation project(':dd-java-agent:instrumentation:java:java-concurrent:java-concurrent-1.8')
       // FIXME: we should enable this, but currently this fails tests for google http client
       //testImplementation project(':dd-java-agent:instrumentation:http-url-connection')
-      testImplementation project(':dd-java-agent:instrumentation:classloading')
+      testImplementation project(':dd-java-agent:instrumentation:java:java-lang:java-lang-classloading-1.8')
 
       testImplementation project(':dd-java-agent:instrumentation-testing')
     }

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

@@ -0,0 +1,44 @@
+muzzle {
+  pass {
+    coreJdk()
+  }
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+
+addTestSuite('classloadingJbossTest')
+addTestSuite('classloadingTomcatTest')
+addTestSuiteExtendingForDir('classloadingTomcatLatestDepTest', 'classloadingTomcatTest', 'classloadingTomcatTest')
+addTestSuite('classloadingOsgiTest')
+addTestSuite('classloadingJsr14Test')
+
+tasks.named("classloadingJbossTest") {
+  testJvmConstraints {
+    // TODO Java 17: This version of jboss-modules doesn't support Java 17
+    //  __redirected.__SAXParserFactory can't access com.sun.org.apache.xerces.internal.jaxp
+    maxJavaVersion = JavaVersion.VERSION_15
+  }
+}
+
+tasks.named("classloadingTomcatLatestDepTest") {
+  testJvmConstraints {
+    minJavaVersion = JavaVersion.VERSION_17
+  }
+}
+
+dependencies {
+  classloadingJbossTestImplementation group: 'org.jboss.modules', name: 'jboss-modules', version: '1.3.10.Final'
+  classloadingJsr14TestImplementation files('src/classloadingJsr14Test/precompiled')
+  // TODO: we should separate core and Eclipse tests at some point,
+  // but right now core-specific tests are quite dump and are run with
+  // core version provided by Eclipse implementation.
+  //testImplementation group: 'org.osgi', name: 'org.osgi.core', version: '4.0.0'
+  classloadingOsgiTestImplementation group: 'org.eclipse.platform', name: 'org.eclipse.osgi', version: '3.13.200'
+  classloadingOsgiTestImplementation group: 'org.apache.felix', name: 'org.apache.felix.framework', version: '6.0.2'
+  //This seems to be the earliest version that has org.apache.catalina.loader.WebappClassLoaderBase
+  //Older versions would require slightly different instrumentation.
+  classloadingTomcatTestImplementation group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '8.0.14'
+
+  // Tomcat 10.1.+ seems to require Java 11. Limit to fix build.
+  classloadingTomcatLatestDepTestImplementation group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '+'
+}

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

@@ -0,0 +1,34 @@
+import datadog.trace.agent.test.InstrumentationSpecification
+import org.jboss.modules.ModuleFinder
+import org.jboss.modules.ModuleIdentifier
+import org.jboss.modules.ModuleLoadException
+import org.jboss.modules.ModuleLoader
+import org.jboss.modules.ModuleSpec
+
+class JBossClassloadingTest extends InstrumentationSpecification {
+  def "delegates to bootstrap class loader for agent classes"() {
+    setup:
+    def moduleFinders = new ModuleFinder[1]
+    moduleFinders[0] = new ModuleFinder() {
+        @Override
+        ModuleSpec findModule(ModuleIdentifier identifier, ModuleLoader delegateLoader) throws ModuleLoadException {
+          return ModuleSpec.build(identifier).create()
+        }
+      }
+    def moduleLoader = new ModuleLoader(moduleFinders)
+    def moduleId = ModuleIdentifier.fromString("test")
+    def testModule = moduleLoader.loadModule(moduleId)
+    def classLoader = testModule.getClassLoader()
+
+    when:
+    Class<?> clazz
+    try {
+      clazz = Class.forName("datadog.trace.api.GlobalTracer", false, classLoader)
+    } catch (ClassNotFoundException e) {
+    }
+
+    then:
+    assert clazz != null
+    assert clazz.getClassLoader() == null
+  }
+}

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

@@ -0,0 +1,23 @@
+import datadog.trace.agent.test.InstrumentationSpecification
+import test.jsr14.Jsr14ClassLoader
+
+class Jsr14ClassloadingTest extends InstrumentationSpecification {
+  def "OSGI delegates to bootstrap class loader for agent classes using #args args"() {
+    when:
+    def clazz
+    if (args == 1) {
+      clazz = loader.loadClass("datadog.trace.api.GlobalTracer")
+    } else {
+      clazz = loader.loadClass("datadog.trace.api.GlobalTracer", false)
+    }
+
+    then:
+    assert clazz != null
+    assert clazz.getClassLoader() == null
+
+    where:
+    loader                 | args
+    new Jsr14ClassLoader() | 1
+    new Jsr14ClassLoader() | 2
+  }
+}