Address review comments

nikita-tkachenko-datadog · nikita-tkachenko-datadog · commit c007c15acc1f · 2024-05-01T23:45:11.000+02:00
diff --git a/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java b/dd-java-agent/agent-builder/src/main/java/datadog/trace/agent/tooling/CombiningTransformerBuilder.java
@@ -131,9 +131,7 @@ private void prepareInstrumentation(InstrumenterModule module, int instrumentati
     helperTransformer =
         helperClassNames.length > 0
             ? new HelperTransformer(
-                module.injectHelperClassesWithAgentCodeSource(),
-                module.getClass().getSimpleName(),
-                helperClassNames)
+                module.useAgentCodeSource(), module.getClass().getSimpleName(), helperClassNames)
             : null;
 
     muzzle = new MuzzleCheck(module, instrumentationId);
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
@@ -20,6 +20,7 @@
 import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.dynamic.DynamicType;
 import net.bytebuddy.dynamic.loading.ClassInjector;
+import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
 import net.bytebuddy.utility.JavaModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -160,7 +161,7 @@ private ProtectionDomain createProtectionDomain(final ClassLoader classLoader) {
       CodeSource codeSource = HelperInjector.class.getProtectionDomain().getCodeSource();
       return new ProtectionDomain(codeSource, null, classLoader, null);
     } else {
-      return null;
+      return ClassLoadingStrategy.NO_PROTECTION_DOMAIN;
     }
   }
 
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java
@@ -112,7 +112,7 @@ public String[] helperClassNames() {
   /**
    * @return {@code true} if helper classes should be injected with the agent's {@link CodeSource}
    */
-  public boolean injectHelperClassesWithAgentCodeSource() {
+  public boolean useAgentCodeSource() {
     return false;
   }
 
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/MuzzleVersionScanPlugin.java
@@ -73,7 +73,7 @@ public static void assertInstrumentationMuzzled(
           final String[] helperClassNames = module.helperClassNames();
           if (helperClassNames.length > 0) {
             new HelperInjector(
-                    module.injectHelperClassesWithAgentCodeSource(),
+                    module.useAgentCodeSource(),
                     MuzzleVersionScanPlugin.class.getSimpleName(),
                     createHelperMap(module))
                 .transform(null, null, testApplicationLoader, null, null);
diff --git a/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java b/dd-java-agent/instrumentation/gradle/src/main/groovy/datadog/trace/instrumentation/gradle/GradlePluginInjectorInstrumentation.java
@@ -59,7 +59,7 @@ public String[] helperClassNames() {
   }
 
   @Override
-  public boolean injectHelperClassesWithAgentCodeSource() {
+  public boolean useAgentCodeSource() {
     return true;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public String[] helperClassNames() {`
`112`	`112`	`/**`
`113`	`113`	`* @return {@code true} if helper classes should be injected with the agent's {@link CodeSource}`
`114`	`114`	`*/`
`115`		`- public boolean injectHelperClassesWithAgentCodeSource() {`
	`115`	`+ public boolean useAgentCodeSource() {`
`116`	`116`	`return false;`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public String[] helperClassNames() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
`62`		`- public boolean injectHelperClassesWithAgentCodeSource() {`
	`62`	`+ public boolean useAgentCodeSource() {`
`63`	`63`	`return true;`
`64`	`64`	`}`
`65`	`65`