Simplify anonymous detection per PR feedback

manuel-alvarez-alvarez · manuel-alvarez-alvarez · commit 9c5129c96b67 · 2024-04-30T10:50:36.000+02:00
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParser.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParser.java
@@ -8,7 +8,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import net.bytebuddy.ClassFileVersion;
-import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.jar.asm.AnnotationVisitor;
 import net.bytebuddy.jar.asm.ClassReader;
@@ -111,11 +110,7 @@ public void visit(
 
     @Override
     public void visitOuterClass(String owner, String name, String descriptor) {
-      if (name != null && !name.equals(MethodDescription.TYPE_INITIALIZER_INTERNAL_NAME)) {
-        selfContained = false;
-      } else if (owner != null) {
-        selfContained = false;
-      }
+      selfContained = false;
     }
 
     @Override
diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParserTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParserTest.groovy
@@ -18,9 +18,13 @@ class OutlineTypeParserTest extends Specification {
     outline.anonymousType == anonymous
 
     where:
-    clazz                                       | anonymous
-    'datadog.trace.agent.test.AnonymousClass'   | false
-    'datadog.trace.agent.test.AnonymousClass$1' | true
-    'datadog.trace.agent.test.AnonymousClass$2' | true
+    clazz                                                    | anonymous
+    'datadog.trace.agent.test.EnclosedClasses'               | false
+    'datadog.trace.agent.test.EnclosedClasses$Inner'         | false
+    'datadog.trace.agent.test.EnclosedClasses$InnerStatic'   | false
+    'datadog.trace.agent.test.EnclosedClasses$1'             | true
+    'datadog.trace.agent.test.EnclosedClasses$2'             | true
+    'datadog.trace.agent.test.EnclosedClasses$Inner$1'       | true
+    'datadog.trace.agent.test.EnclosedClasses$InnerStatic$1' | true
   }
 }
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/AnonymousClass.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/AnonymousClass.java
diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/EnclosedClasses.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/test/EnclosedClasses.java
@@ -0,0 +1,51 @@
+package datadog.trace.agent.test;
+
+import java.util.function.Supplier;
+
+public class EnclosedClasses {
+
+  static {
+    String id =
+        new Supplier<String>() {
+          @Override
+          public String get() {
+            return Long.toString(System.currentTimeMillis());
+          }
+        }.get();
+    assert id != null;
+  }
+
+  @Override
+  public String toString() {
+    return new Supplier<String>() {
+      @Override
+      public String get() {
+        return EnclosedClasses.class + "@" + System.identityHashCode(this);
+      }
+    }.get();
+  }
+
+  public static class InnerStatic {
+    @Override
+    public String toString() {
+      return new Supplier<String>() {
+        @Override
+        public String get() {
+          return InnerStatic.class + "@" + System.identityHashCode(this);
+        }
+      }.get();
+    }
+  }
+
+  public static class Inner {
+    @Override
+    public String toString() {
+      return new Supplier<String>() {
+        @Override
+        public String get() {
+          return Inner.class + "@" + System.identityHashCode(this);
+        }
+      }.get();
+    }
+  }
+}
