Move isAnonymousType check to the only place that uses it: IastInstrumentation

Author: mcculls

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeFactory.java

@@ -383,11 +383,6 @@ public TypeList.Generic getInterfaces() {
       return outline().getInterfaces();
     }
 
-    @Override
-    public boolean isAnonymousType() {
-      return outline().isAnonymousType();
-    }
-
     @Override
     public boolean isPublic() {
       return isPublicFilter.contains(name) || super.isPublic();

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeOutline.java

@@ -113,21 +113,6 @@ public MethodList<MethodDescription.InDefinedShape> getDeclaredMethods() {
     return declaredMethods.isEmpty() ? NO_METHODS : new MethodList.Explicit<>(declaredMethods);
   }
 
-  @Override
-  public boolean isAnonymousType() {
-    // this method is only used when dd.iast.anonymous-classes.enabled=false
-    // so take simple approach and look for '$number' at the end of the name
-    for (int end = name.length() - 1, i = end; i > 0; i--) {
-      char c = name.charAt(i);
-      if (c == '$' && i < end) {
-        return true; // only seen digits so far, assume anonymous
-      } else if (c < '0' || c > '9') {
-        break; // non-digit character found, assume not anonymous
-      }
-    }
-    return false;
-  }
-
   void declare(AnnotationDescription annotation) {
     if (null != annotation) {
       if (null == declaredAnnotations) {

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParserTest.groovy

@@ -5,7 +5,7 @@ import spock.lang.Specification
 
 class OutlineTypeParserTest extends Specification {
 
-  void 'test modifiers are correct and anonymous classes are detected'() {
+  void 'test modifiers are correct'() {
     setup:
     final parser = new OutlineTypeParser()
     final locator = ClassFileLocators.classFileLocator(Thread.currentThread().contextClassLoader)
@@ -15,12 +15,13 @@ class OutlineTypeParserTest extends Specification {
     final outline = parser.parse(bytes)
 
     then:
-    outline.anonymousType == anonymous
     outline.interface == isinterface
     outline.abstract == isabstract
     outline.annotation == annotation
     outline.enum == isenum
 
+    // isAnonymousType is no longer supported in outlines for performance reasons
+
     where:
     clazz                                                    | anonymous | isinterface | isabstract | annotation | isenum
     'datadog.trace.agent.test.EnclosedClasses'               | false     | false       | false      | false      | false

dd-java-agent/instrumentation/iast-instrumenter/src/main/java/datadog/trace/instrumentation/iastinstrumenter/IastInstrumentation.java

@@ -76,11 +76,30 @@ protected boolean doMatch(TypeDescription target) {
           }
         };
 
+    // this deliberately only considers anonymous types following the Java naming convention
+    private static final ElementMatcher.Junction<TypeDescription> ANONYMOUS_TYPE_MATCHER =
+        new ElementMatcher.Junction.ForNonNullValues<TypeDescription>() {
+          @Override
+          protected boolean doMatch(TypeDescription target) {
+            String name = target.getName();
+            // search the name in reverse until we find a $ or non-digit
+            for (int end = name.length() - 1, i = end; i > 0; i--) {
+              char c = name.charAt(i);
+              if (c == '$' && i < end) {
+                return true; // only seen digits so far, assume anonymous
+              } else if (c < '0' || c > '9') {
+                break; // non-digit character found, assume not anonymous
+              }
+            }
+            return false;
+          }
+        };
+
     static {
       if (Config.get().isIastAnonymousClassesEnabled()) {
         INSTANCE = TRIE_MATCHER;
       } else {
-        INSTANCE = TRIE_MATCHER.and(not(TypeDescription::isAnonymousType));
+        INSTANCE = TRIE_MATCHER.and(not(ANONYMOUS_TYPE_MATCHER));
       }
     }
   }