muzzle

Author: amarziali

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

@@ -35,11 +35,19 @@ muzzle {
     module = 'mule-core'
     versions = "[$muleVersion,)"
     javaVersion = "17"
-    assertInverse true
     excludeDependency 'om.google.guava:guava'
     excludeDependency 'com.google.code.findbugs:jsr305'
     additionalDependencies +="org.mule.runtime:mule-tracer-customization-impl:$muleVersion"
   }
+
+  fail {
+    name = 'before-4.5.0'
+    group = 'org.mule.runtime'
+    module = 'mule-core'
+    versions =  "[, $muleVersion)"
+    excludeDependency 'om.google.guava:guava'
+    excludeDependency 'com.google.code.findbugs:jsr305'
+  }
 }
 
 apply from: "$rootDir/gradle/java.gradle"
@@ -130,10 +138,9 @@ 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
-  main_java11CompileOnly project(':internal-api')
-  main_java11CompileOnly project(':dd-java-agent:agent-tooling')
-  main_java11CompileOnly project(':dd-java-agent:agent-bootstrap')
-  main_java11CompileOnly sourceSets.main.output
+  compileOnly sourceSets.main_java11.output
+  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

@@ -6,6 +6,9 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.api.Platform;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.implementation.bytecode.assign.Assigner;
+import org.mule.runtime.tracer.api.EventTracer;
 
 @AutoService(InstrumenterModule.class)
 public class JpmsMuleInstrumentation extends InstrumenterModule.Tracing
@@ -38,6 +41,18 @@ public String[] helperClassNames() {
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     // it does not work with typeInitializer()
-    transformer.applyAdvice(isConstructor(), packageName + ".JpmsClearanceAdvice");
+    transformer.applyAdvice(isConstructor(), getClass().getName() + "$JpmsClearanceAdvice");
+  }
+
+  public static class JpmsClearanceAdvice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void openOnReturn(@Advice.This(typing = Assigner.Typing.DYNAMIC) Object self) {
+      JpmsAdvisingHelper.allowAccessOnModuleClass(self.getClass());
+    }
+
+    private static void muzzleCheck(final EventTracer<?> tracer) {
+      // introduced in 4.5.0
+      tracer.endCurrentSpan(null);
+    }
   }
 }

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

@@ -3,10 +3,19 @@
 import java.util.WeakHashMap;
 
 public class JpmsAdvisingHelper {
-  private static final WeakHashMap<Module, Boolean> ALREADY_PROCESSED_CACHE = new WeakHashMap<>();
+  private static final WeakHashMap<Class<?>, Boolean> ALREADY_PROCESSED_CACHE = new WeakHashMap<>();
 
-  public static boolean isModuleAlreadyProcessed(final Module module) {
-    return Boolean.TRUE.equals(ALREADY_PROCESSED_CACHE.putIfAbsent(module, Boolean.TRUE));
+  public static void allowAccessOnModuleClass(final Class<?> cls) {
+    if (Boolean.TRUE.equals(ALREADY_PROCESSED_CACHE.putIfAbsent(cls, Boolean.TRUE))) {
+      return;
+    }
+    final Module module = cls.getModule();
+    if (module != null) {
+      try {
+        module.addExports(cls.getPackageName(), module.getClassLoader().getUnnamedModule());
+      } catch (Throwable ignored) {
+      }
+    }
   }
 
   private JpmsAdvisingHelper() {}