fix: pr suggestions

daniel-mohedano · daniel-mohedano · commit adb3df5bd2c9 · 2026-03-13T17:43:29.000+01:00
diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/compiler/CompilerModuleExporter.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/compiler/CompilerModuleExporter.java
@@ -4,8 +4,6 @@
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
 import java.security.ProtectionDomain;
-import java.util.Collections;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,8 +33,8 @@ public class CompilerModuleExporter implements ClassFileTransformer {
   };
 
   private final Instrumentation inst;
-  private final Set<ClassLoader> exportedClassLoaders =
-      Collections.newSetFromMap(new ConcurrentHashMap<>());
+  private final ConcurrentHashMap<ClassLoader, Boolean> exportedClassLoaders =
+      new ConcurrentHashMap<>();
 
   public CompilerModuleExporter(Instrumentation inst) {
     this.inst = inst;
@@ -49,18 +47,19 @@ public byte[] transform(
       Class<?> classBeingRedefined,
       ProtectionDomain protectionDomain,
       byte[] classfileBuffer) {
-    if (loader != null
-        && className != null
-        && className.startsWith(COMPILER_PLUGIN_CLASS_PREFIX)
-        && exportedClassLoaders.add(loader)) {
-      try {
-        JDK9ModuleAccess.exportModuleToUnnamedModule(
-            inst, "jdk.compiler", COMPILER_PACKAGES, loader);
-        LOGGER.debug("Exported jdk.compiler to classloader {}", loader);
-      } catch (Throwable e) {
-        LOGGER.debug("Could not export jdk.compiler packages for compiler plugin", e);
-      }
+    if (loader != null && className != null && className.startsWith(COMPILER_PLUGIN_CLASS_PREFIX)) {
+      exportedClassLoaders.computeIfAbsent(loader, this::exportJdkCompilerModule);
     }
     return null; // no bytecode modification
   }
+
+  private Boolean exportJdkCompilerModule(ClassLoader loader) {
+    try {
+      JDK9ModuleAccess.exportModuleToUnnamedModule(inst, "jdk.compiler", COMPILER_PACKAGES, loader);
+      LOGGER.debug("Exported jdk.compiler to classloader {}", loader);
+    } catch (Throwable e) {
+      LOGGER.debug("Could not export jdk.compiler packages for compiler plugin", e);
+    }
+    return Boolean.TRUE;
+  }
 }
diff --git a/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ModuleAccess.java b/internal-api/internal-api-9/src/main/java/datadog/trace/util/JDK9ModuleAccess.java
@@ -58,6 +58,6 @@ public static void exportModuleToUnnamedModule(
       extraExports.put(packageName, target);
     }
 
-    inst.redefineModule(module, emptySet(), (Map) extraExports, emptyMap(), emptySet(), emptyMap());
+    inst.redefineModule(module, emptySet(), extraExports, emptyMap(), emptySet(), emptyMap());
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,6 @@ public static void exportModuleToUnnamedModule(`
`58`	`58`	`extraExports.put(packageName, target);`
`59`	`59`	`}`
`60`	`60`
`61`		`- inst.redefineModule(module, emptySet(), (Map) extraExports, emptyMap(), emptySet(), emptyMap());`
	`61`	`+ inst.redefineModule(module, emptySet(), extraExports, emptyMap(), emptySet(), emptyMap());`
`62`	`62`	`}`
`63`	`63`	`}`