removed type erasure workaorund

Author: JonasKunz

dependencyManagement/build.gradle.kts

@@ -41,7 +41,7 @@ val DEPENDENCY_BOMS = listOf(
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
 val errorProneVersion = "2.36.0"
-val byteBuddyVersion = "1.15.11"
+val byteBuddyVersion = "1.15.12-SNAPSHOT"
 val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"
@@ -62,7 +62,7 @@ val CORE_DEPENDENCIES = listOf(
   "net.bytebuddy:byte-buddy:${byteBuddyVersion}",
   "net.bytebuddy:byte-buddy-dep:${byteBuddyVersion}",
   "net.bytebuddy:byte-buddy-agent:${byteBuddyVersion}",
-  "net.bytebuddy:byte-buddy-gradle-plugin:${byteBuddyVersion}",
+  "net.bytebuddy:byte-buddy-gradle-plugin:1.15.11",
   "org.ow2.asm:asm:${asmVersion}",
   "org.ow2.asm:asm-tree:${asmVersion}",
   "org.ow2.asm:asm-util:${asmVersion}",

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/AdviceSignatureEraser.java

@@ -20,8 +20,6 @@
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
-import net.bytebuddy.description.annotation.AnnotationDescription;
-import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.utility.JavaConstant;
 
 /**
@@ -229,19 +227,10 @@ static Advice.BootstrapArgumentResolver.Factory getAdviceBootstrapArguments(
             Arrays.asList(
                 JavaConstant.Simple.ofLoaded(BOOTSTRAP_KIND_ADVICE),
                 JavaConstant.Simple.ofLoaded(moduleName),
-                JavaConstant.Simple.ofLoaded(getOriginalSignature(adviceMethod)),
+                JavaConstant.Simple.ofLoaded(adviceMethod.getDescriptor()),
                 JavaConstant.Simple.ofLoaded(adviceMethod.getDeclaringType().getName()));
   }
 
-  private static String getOriginalSignature(MethodDescription.InDefinedShape adviceMethod) {
-    for (AnnotationDescription an : adviceMethod.getDeclaredAnnotations()) {
-      if (OriginalDescriptor.class.getName().equals(an.getAnnotationType().getName())) {
-        return (String) an.getValue("value").resolve();
-      }
-    }
-    throw new IllegalStateException("OriginalSignature annotation is not present!");
-  }
-
   private static ConstantCallSite bootstrapProxyMethod(
       MethodHandles.Lookup lookup,
       String proxyMethodName,

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/IndyBootstrap.java

@@ -13,11 +13,15 @@
 import net.bytebuddy.agent.builder.AgentBuilder;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.dynamic.ClassFileLocator;
 import net.bytebuddy.dynamic.ClassFileLocator.Resolution;
 import net.bytebuddy.matcher.ElementMatcher;
 
 public final class IndyTypeTransformerImpl implements TypeTransformer {
+
+  private static final TypeDescription.Generic OBJECT_TYPE = TypeDescription.ForLoadedType.of(Object.class).asGenericType();
+
   // path (with trailing slash) to dump transformed advice class to
   private static final String DUMP_PATH = null;
   private final Advice.WithCustomMapping adviceMapping;
@@ -35,7 +39,49 @@ public IndyTypeTransformerImpl(
                     new Advice.AssignReturned.Factory().withSuppressed(Throwable.class)))
             .bootstrap(
                 IndyBootstrap.getIndyBootstrapMethod(),
-                IndyBootstrap.getAdviceBootstrapArguments(instrumentationModule));
+                IndyBootstrap.getAdviceBootstrapArguments(instrumentationModule),
+                new TypeDescription.Generic.Visitor<TypeDescription.Generic>() {
+                  @Override
+                  public TypeDescription.Generic onGenericArray(TypeDescription.Generic generic) {
+                    return reduceErasedType(generic.asErasure());
+                  }
+
+                  @Override
+                  public TypeDescription.Generic onWildcard(TypeDescription.Generic generic) {
+                    return reduceErasedType(generic.asErasure());
+                  }
+
+                  @Override
+                  public TypeDescription.Generic onParameterizedType(TypeDescription.Generic generic) {
+                    return reduceErasedType(generic.asErasure());
+                  }
+
+                  @Override
+                  public TypeDescription.Generic onTypeVariable(TypeDescription.Generic generic) {
+                    return reduceErasedType(generic.asErasure());
+                  }
+
+                  @Override
+                  public TypeDescription.Generic onNonGenericType(TypeDescription.Generic generic) {
+                    return reduceErasedType(generic.asErasure());
+                  }
+
+                  private TypeDescription.Generic reduceErasedType(TypeDescription erased) {
+                    if (erased.isPrimitive()) {
+                      return erased.asGenericType();
+                    }
+                    if (erased.isArray()) {
+                      return TypeDescription.Generic.Builder.of(reduceErasedType(erased.getComponentType()))
+                          .asArray()
+                          .build();
+                    }
+                    if (!erased.getName().startsWith("java.")) {
+                      return OBJECT_TYPE;
+                    }
+                    return erased.asGenericType();
+                  }
+                }
+            );
   }
 
   @Override
@@ -106,7 +152,6 @@ public byte[] resolve() {
       } else {
         result = bytes;
       }
-      result = AdviceSignatureEraser.transform(result);
       return result;
     }
   }