Prefer Strings.getPackageName() over ClassLoader.getPackage() when defining instrumentation if you just want the package name

Author: mcculls

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/iast/IastPostProcessorFactory.java

@@ -20,6 +20,7 @@
 import datadog.trace.api.iast.telemetry.IastMetric;
 import datadog.trace.api.iast.telemetry.IastMetricCollector;
 import datadog.trace.api.iast.telemetry.Verbosity;
+import datadog.trace.util.Strings;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nonnull;
@@ -44,7 +45,7 @@ public class IastPostProcessorFactory implements Advice.PostProcessor.Factory {
     INSTANCE = verbosity == Verbosity.OFF ? null : new IastPostProcessorFactory(verbosity);
   }
 
-  private static final String IAST_ANNOTATIONS_PKG = Sink.class.getPackage().getName();
+  private static final String IAST_ANNOTATIONS_PKG = Strings.getPackageName(Sink.class.getName());
   private static final String SINK_NAME = Sink.class.getSimpleName();
   private static final String PROPAGATION_NAME = Propagation.class.getSimpleName();
   private static final String SOURCE_NAME = Source.class.getSimpleName();

dd-java-agent/instrumentation/gradle-testing/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/AbstractJUnitTestClassProcessorInstrumentation.java

@@ -8,6 +8,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.CIConstants;
 import datadog.trace.instrumentation.junit4.JUnit4Instrumentation;
+import datadog.trace.util.Strings;
 import java.util.Set;
 import net.bytebuddy.asm.Advice;
 import org.gradle.api.Action;
@@ -32,12 +33,14 @@ public String instrumentedType() {
 
   @Override
   public String[] helperClassNames() {
+    String junit4InstrumentationPackageName =
+        Strings.getPackageName(JUnit4Instrumentation.class.getName());
     return new String[] {
-      JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
-      JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
-      JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
+      junit4InstrumentationPackageName + ".SkippedByDatadog",
+      junit4InstrumentationPackageName + ".JUnit4Utils",
+      junit4InstrumentationPackageName + ".TestEventsHandlerHolder",
+      junit4InstrumentationPackageName + ".TracingListener",
+      junit4InstrumentationPackageName + ".order.JUnit4FailFastClassOrderer",
       packageName + ".DDCollectAllTestClassesExecutor",
     };
   }

dd-java-agent/instrumentation/gradle-testing/src/main/groovy/datadog/trace/instrumentation/gradle/junit4/JUnitTestClassProcessorInstrumentation.java

@@ -10,6 +10,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.civisibility.CIConstants;
 import datadog.trace.instrumentation.junit4.JUnit4Instrumentation;
+import datadog.trace.util.Strings;
 import java.util.Set;
 import net.bytebuddy.asm.Advice;
 import org.gradle.api.Action;
@@ -33,12 +34,14 @@ public String instrumentedType() {
 
   @Override
   public String[] helperClassNames() {
+    String junit4InstrumentationPackageName =
+        Strings.getPackageName(JUnit4Instrumentation.class.getName());
     return new String[] {
-      JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
-      JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
-      JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
+      junit4InstrumentationPackageName + ".JUnit4Utils",
+      junit4InstrumentationPackageName + ".TestEventsHandlerHolder",
+      junit4InstrumentationPackageName + ".SkippedByDatadog",
+      junit4InstrumentationPackageName + ".TracingListener",
+      junit4InstrumentationPackageName + ".order.JUnit4FailFastClassOrderer",
       packageName + ".DDCollectAllTestClassesExecutor",
     };
   }

dd-java-agent/instrumentation/maven-surefire/src/main/java/datadog/trace/instrumentation/maven/surefire/junit4/JUnit4ClassOrderInstrumentation.java

@@ -12,6 +12,7 @@
 import datadog.trace.instrumentation.junit4.JUnit4Utils;
 import datadog.trace.instrumentation.junit4.TestEventsHandlerHolder;
 import datadog.trace.instrumentation.junit4.order.JUnit4FailFastClassOrderer;
+import datadog.trace.util.Strings;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
@@ -42,12 +43,14 @@ public String[] knownMatchingTypes() {
 
   @Override
   public String[] helperClassNames() {
+    String junit4InstrumentationPackageName =
+        Strings.getPackageName(JUnit4Instrumentation.class.getName());
     return new String[] {
-      JUnit4Instrumentation.class.getPackage().getName() + ".JUnit4Utils",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TestEventsHandlerHolder",
-      JUnit4Instrumentation.class.getPackage().getName() + ".SkippedByDatadog",
-      JUnit4Instrumentation.class.getPackage().getName() + ".TracingListener",
-      JUnit4Instrumentation.class.getPackage().getName() + ".order.JUnit4FailFastClassOrderer",
+      junit4InstrumentationPackageName + ".JUnit4Utils",
+      junit4InstrumentationPackageName + ".TestEventsHandlerHolder",
+      junit4InstrumentationPackageName + ".SkippedByDatadog",
+      junit4InstrumentationPackageName + ".TracingListener",
+      junit4InstrumentationPackageName + ".order.JUnit4FailFastClassOrderer",
     };
   }