Remove injected helper classes from OpenTelemetry's generated muzzle map

mcculls · mcculls · commit 50953dfd49ca · 2024-06-10T12:27:58.000+01:00
diff --git a/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenterModule.java b/dd-java-agent/agent-otel/otel-tooling/src/main/java/datadog/opentelemetry/tooling/OtelInstrumenterModule.java
@@ -40,8 +40,17 @@ private static String[] namespace(String[] names) {
     return namespaced;
   }
 
+  private volatile String[] helperClassNames;
+
   @Override
   public String[] helperClassNames() {
+    if (null == helperClassNames) {
+      helperClassNames = buildHelperClassNames();
+    }
+    return helperClassNames;
+  }
+
+  private String[] buildHelperClassNames() {
     List<String> helperClassNames;
     List<String> additionalClassNames = getAdditionalHelperClassNames();
     if (additionalClassNames.isEmpty()) {
@@ -93,13 +102,17 @@ public interface VirtualFieldBuilder {
   @Override
   public ReferenceProvider runtimeMuzzleReferences() {
     return new ReferenceProvider() {
-      private Iterable<Reference> muzzleReferences;
+      private volatile Iterable<Reference> muzzleReferences;
 
       @Override
       @SuppressWarnings({"unchecked", "rawtypes"})
       public Iterable<Reference> buildReferences(TypePool ignored) {
         if (null == muzzleReferences) {
-          muzzleReferences = (Iterable) getMuzzleReferences().values();
+          Map<String, ClassRef> muzzleMap = getMuzzleReferences();
+          for (String helper : helperClassNames()) {
+            muzzleMap.remove(helper);
+          }
+          muzzleReferences = (Iterable) muzzleMap.values();
         }
         return muzzleReferences;
       }
