Move jpms clearance advice to bootstrap

Author: amarziali

dd-java-agent/agent-bootstrap/build.gradle

@@ -45,6 +45,7 @@ compileMain_java11Java.configure {
 dependencies {
   main_java11CompileOnly project(':internal-api')
   main_java11CompileOnly sourceSets.main.output
+  main_java11CompileOnly libs.bytebuddy
 }
 
 jar {

…umentation/mule4/JpmsAdvisingHelper.java …rumentation/jpms/JpmsAdvisingHelper.javadd-java-agent/instrumentation/mule-4/src/main/java11/datadog/trace/instrumentation/mule4/JpmsAdvisingHelper.java renamed to dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jpms/JpmsAdvisingHelper.java dd-java-agent/instrumentation/mule-4/src/main/java11/datadog/trace/instrumentation/mule4/JpmsAdvisingHelper.java renamed to dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jpms/JpmsAdvisingHelper.java

@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.mule4;
+package datadog.trace.bootstrap.instrumentation.jpms;
 
 import datadog.trace.api.GenericClassValue;
 import java.util.concurrent.atomic.AtomicBoolean;

…mentation/mule4/JpmsClearanceAdvice.java …umentation/jpms/JpmsClearanceAdvice.javadd-java-agent/instrumentation/mule-4/src/main/java11/datadog/trace/instrumentation/mule4/JpmsClearanceAdvice.java renamed to dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jpms/JpmsClearanceAdvice.java dd-java-agent/instrumentation/mule-4/src/main/java11/datadog/trace/instrumentation/mule4/JpmsClearanceAdvice.java renamed to dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jpms/JpmsClearanceAdvice.java

@@ -1,10 +1,15 @@
-package datadog.trace.instrumentation.mule4;
+package datadog.trace.bootstrap.instrumentation.jpms;
 
-import static datadog.trace.instrumentation.mule4.JpmsAdvisingHelper.ALREADY_PROCESSED_CACHE;
+import static datadog.trace.bootstrap.instrumentation.jpms.JpmsAdvisingHelper.ALREADY_PROCESSED_CACHE;
 
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
 
+/**
+ * This advice can be used by any instrumentation needing that the instrumented class export its
+ * package to the unnamed module (where our things resides). This ensures that an instrumentation
+ * will grant visibility to that class.
+ */
 public class JpmsClearanceAdvice {
   @Advice.OnMethodExit(suppress = Throwable.class)
   public static void openOnReturn(@Advice.This(typing = Assigner.Typing.DYNAMIC) Object self) {

dd-java-agent/instrumentation/mule-4/build.gradle

@@ -90,9 +90,6 @@ configurations.all {
 }
 
 sourceSets {
-  main_java11 {
-    java.srcDirs "${project.projectDir}/src/main/java11"
-  }
   test {
     output.dir("$buildDir/generated-resources/test", builtBy: 'generateAppResources')
   }
@@ -104,20 +101,6 @@ sourceSets {
   }
 }
 
-compileMain_java11Java.configure {
-  setJavaVersion(it, 11)
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-jar {
-  from sourceSets.main_java11.output
-}
-
-forbiddenApisMain_java11 {
-  failOnMissingClasses = false
-}
-
 tasks.named("compileTestGroovy").configure {
   dependsOn 'mvnPackage', 'extractMuleServices'
 }
@@ -138,13 +121,7 @@ tasks.named("compileLatestDepForkedTestJava").configure {
 dependencies {
   compileOnly group: 'org.mule.runtime', name: 'mule-core', version: muleVersion
   compileOnly group: 'org.mule.runtime', name: 'mule-tracer-customization-impl', version: muleVersion
-  compileOnly sourceSets.main_java11.output
-
-  main_java11CompileOnly project(':internal-api')
-  main_java11CompileOnly project(':dd-java-agent:agent-tooling')
-  main_java11CompileOnly project(':dd-java-agent:agent-bootstrap')
 
-  testImplementation sourceSets.main_java11.output
   testImplementation project(':dd-java-agent:instrumentation:aws-common')
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
   testImplementation project(':dd-java-agent:instrumentation:reactive-streams')

dd-java-agent/instrumentation/mule-4/src/main/java/datadog/trace/instrumentation/mule4/JpmsMuleInstrumentation.java

@@ -29,13 +29,6 @@ public String[] knownMatchingTypes() {
     };
   }
 
-  @Override
-  public String[] helperClassNames() {
-    return new String[] {
-      packageName + ".JpmsAdvisingHelper",
-    };
-  }
-
   @Override
   public Reference[] additionalMuzzleReferences() {
     return new Reference[] {
@@ -54,6 +47,7 @@ public Reference[] additionalMuzzleReferences() {
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     // it does not work with typeInitializer()
-    transformer.applyAdvice(isConstructor(), packageName + ".JpmsClearanceAdvice");
+    transformer.applyAdvice(
+        isConstructor(), "datadog.trace.bootstrap.instrumentation.jpms.JpmsClearanceAdvice");
   }
 }