For certain metadata we only ever need outlines, regardless of whethe…

…r we're matching or transforming (#4322)
DataDog · Nov 29, 2022 · 9eb605c · 9eb605c
1 parent 66e787a
commit 9eb605c
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 3 deletions.
diff --git a/...gent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/CachingType.java b/...gent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/CachingType.java
@@ -10,10 +10,16 @@
 
 /** Type description that lazily caches expensive results. */
 final class CachingType extends WithName {
+
+  // non-null sentinels for fields that can legitimately be null
+  private static final Generic UNSET_SUPER_CLASS = Generic.VOID;
+  private static final TypeDescription UNSET_DECLARING_TYPE = TypeDescription.VOID;
+
   private final TypeDescription delegate;
 
-  private Generic superClass;
+  private Generic superClass = UNSET_SUPER_CLASS;
   private TypeList.Generic interfaces;
+  private TypeDescription declaringType = UNSET_DECLARING_TYPE;
   private AnnotationList annotations;
   private FieldList<FieldDescription.InDefinedShape> fields;
   private MethodList<MethodDescription.InDefinedShape> methods;
@@ -30,7 +36,7 @@ protected TypeDescription delegate() {
 
   @Override
   public Generic getSuperClass() {
-    if (superClass == null) {
+    if (superClass == UNSET_SUPER_CLASS) {
       superClass = delegate.getSuperClass();
     }
     return superClass;
@@ -44,6 +50,14 @@ public TypeList.Generic getInterfaces() {
     return interfaces;
   }
 
+  @Override
+  public TypeDescription getDeclaringType() {
+    if (declaringType == UNSET_DECLARING_TYPE) {
+      declaringType = delegate.getDeclaringType();
+    }
+    return declaringType;
+  }
+
   @Override
   public AnnotationList getDeclaredAnnotations() {
     if (annotations == null) {

diff --git a/...ooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParser.java b/...ooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/OutlineTypeParser.java
@@ -40,6 +40,11 @@ public TypeDescription parse(Class<?> loadedType) {
             null != superClass ? superClass.getName() : null,
             extractTypeNames(loadedType.getInterfaces()));
 
+    Class<?> declaringClass = loadedType.getDeclaringClass();
+    if (null != declaringClass) {
+      typeOutline.declaredBy(declaringClass.getName());
+    }
+
     for (Annotation a : loadedType.getDeclaredAnnotations()) {
       typeOutline.declare(annotationOutline(Type.getDescriptor(a.annotationType())));
     }
@@ -102,6 +107,13 @@ public void visit(
       typeOutline = new TypeOutline(version, access, name, superName, interfaces);
     }
 
+    @Override
+    public void visitInnerClass(String name, String outerName, String innerName, int access) {
+      if (null != outerName && typeOutline.getInternalName().equals(name)) {
+        typeOutline.declaredBy(outerName);
+      }
+    }
+
     @Override
     public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
       typeOutline.declare(annotationOutline(descriptor));

diff --git a/...gent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeFactory.java b/...gent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeFactory.java
@@ -17,6 +17,7 @@
 import java.util.Map;
 import java.util.function.Function;
 import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.description.type.TypeList;
 import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.jar.asm.Type;
 import net.bytebuddy.pool.TypePool;
@@ -301,14 +302,47 @@ final class LazyType extends WithName {
       super(name);
     }
 
+    @Override
+    public int getModifiers() {
+      return outline().getModifiers();
+    }
+
+    @Override
+    public Generic getSuperClass() {
+      return outline().getSuperClass();
+    }
+
+    @Override
+    public TypeList.Generic getInterfaces() {
+      return outline().getInterfaces();
+    }
+
+    @Override
+    public TypeDescription getDeclaringType() {
+      return outline().getDeclaringType();
+    }
+
+    private TypeDescription outline() {
+      TypeDescription outline;
+      if (createOutlines) {
+        outline = doResolve(true);
+      } else {
+        // temporarily switch to outlines as that's all we need
+        createOutlines = true;
+        outline = doResolve(true);
+        createOutlines = false;
+      }
+      return outline;
+    }
+
     @Override
     protected TypeDescription delegate() {
       return doResolve(true);
     }
 
     TypeDescription doResolve(boolean throwIfMissing) {
       // re-resolve type when switching to full descriptions
-      if (null == delegate || createOutlines != isOutline) {
+      if (null == delegate || (isOutline && !createOutlines)) {
         delegate = resolveType(name);
         isOutline = createOutlines;
         if (throwIfMissing && null == delegate) {

diff --git a/...gent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeOutline.java b/...gent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/outline/TypeOutline.java
@@ -30,6 +30,7 @@ final class TypeOutline extends WithName {
   private final int modifiers;
   private final String superName;
   private final String[] interfaces;
+  private String declaringName;
 
   private List<AnnotationDescription> declaredAnnotations;
 
@@ -69,6 +70,14 @@ public TypeList.Generic getInterfaces() {
     return new TypeList.Generic.Explicit(outlines);
   }
 
+  @Override
+  public TypeDescription getDeclaringType() {
+    if (null != declaringName) {
+      return findType(declaringName.replace('/', '.'));
+    }
+    return null;
+  }
+
   @Override
   public int getModifiers() {
     return modifiers;
@@ -96,6 +105,10 @@ public MethodList<MethodDescription.InDefinedShape> getDeclaredMethods() {
     return declaredMethods.isEmpty() ? NO_METHODS : new MethodList.Explicit<>(declaredMethods);
   }
 
+  void declaredBy(String declaringName) {
+    this.declaringName = declaringName;
+  }
+
   void declare(AnnotationDescription annotation) {
     if (null != annotation) {
       if (null == declaredAnnotations) {