Upgrade bytebuddy to 1.16.1 release

Author: JonasKunz

conventions/build.gradle.kts

@@ -65,7 +65,7 @@ dependencies {
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.2")
   implementation("org.spdx:spdx-gradle-plugin:0.8.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.12-SNAPSHOT")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.16.1")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")

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.12-SNAPSHOT"
+val byteBuddyVersion = "1.16.1"
 val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"

docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt

@@ -1,2 +1,2 @@
 Comparing source compatibility of opentelemetry-instrumentation-annotations-2.12.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.11.0.jar
-No changes.
+No changes.

gradle-plugins/build.gradle.kts

@@ -26,7 +26,7 @@ configurations.named("compileOnly") {
   extendsFrom(bbGradlePlugin)
 }
 
-val byteBuddyVersion = "1.15.12-SNAPSHOT"
+val byteBuddyVersion = "1.16.1"
 val aetherVersion = "1.1.0"
 
 dependencies {

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

@@ -18,7 +18,6 @@
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.implementation.bytecode.assign.Assigner;
-import net.bytebuddy.matcher.ElementMatchers;
 
 /**
  * This factory is designed to wrap around {@link Advice.PostProcessor.Factory} and ensures that
@@ -53,27 +52,15 @@ public ForceDynamicallyTypedAssignReturnedFactory(Advice.PostProcessor.Factory d
   }
 
   @Override
-  public Advice.PostProcessor make(MethodDescription.InDefinedShape adviceMethod, boolean exit) {
-    return delegate.make(forceDynamicTyping(adviceMethod), exit);
+  public Advice.PostProcessor make(
+      List<? extends AnnotationDescription> methodAnnotations,
+      TypeDescription returnType,
+      boolean exit) {
+    return delegate.make(forceDynamicTyping(methodAnnotations), returnType, exit);
   }
 
   // Visible for testing
-  static MethodDescription.InDefinedShape forceDynamicTyping(
-      MethodDescription.InDefinedShape adviceMethod) {
-    return new MethodDescription.Latent(
-        adviceMethod.getDeclaringType(),
-        adviceMethod.getInternalName(),
-        adviceMethod.getModifiers(),
-        adviceMethod.getTypeVariables().asTokenList(ElementMatchers.none()),
-        adviceMethod.getReturnType(),
-        adviceMethod.getParameters().asTokenList(ElementMatchers.none()),
-        adviceMethod.getExceptionTypes(),
-        forceDynamicTyping(adviceMethod.getDeclaredAnnotations()),
-        adviceMethod.getDefaultValue(),
-        adviceMethod.getReceiverType());
-  }
-
-  private static List<? extends AnnotationDescription> forceDynamicTyping(
+  static List<? extends AnnotationDescription> forceDynamicTyping(
       List<? extends AnnotationDescription> declaredAnnotations) {
     return declaredAnnotations.stream()
         .map(ForceDynamicallyTypedAssignReturnedFactory::forceDynamicTyping)

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

@@ -20,8 +20,6 @@
 
 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;
@@ -40,48 +38,7 @@ public IndyTypeTransformerImpl(
             .bootstrap(
                 IndyBootstrap.getIndyBootstrapMethod(),
                 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();
-                  }
-                }
-            );
+                TypeDescription.Generic.Visitor.Generalizing.INSTANCE);
   }
 
   @Override

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/ForceDynamicallyTypedAssignReturnedFactoryTest.java

@@ -7,6 +7,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.List;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.asm.Advice.AssignReturned;
 import net.bytebuddy.asm.Advice.AssignReturned.ToArguments.ToArgument;
@@ -40,9 +41,10 @@ public void checkTypingMadeDynamic() {
 
     ClassLoader cl = ForceDynamicallyTypedAssignReturnedFactoryTest.class.getClassLoader();
 
-    MethodDescription modified =
-        ForceDynamicallyTypedAssignReturnedFactory.forceDynamicTyping(original);
-    assertThat(modified.getDeclaredAnnotations())
+    List<? extends AnnotationDescription> modifiedAnnotations =
+        ForceDynamicallyTypedAssignReturnedFactory.forceDynamicTyping(
+            original.getDeclaredAnnotations());
+    assertThat(modifiedAnnotations)
         .hasSize(7)
         .anySatisfy(
             toFields -> {

javaagent/build.gradle.kts

@@ -397,7 +397,7 @@ fun CopySpec.copyByteBuddy(jar: Provider<RegularFile>) {
       if (path.startsWith("net/bytebuddy/") &&
         // this is our class that we have placed in the byte buddy package, need to preserve it
         !path.startsWith("net/bytebuddy/agent/builder/AgentBuilderUtil")) {
-        //exclude() //local build seems to not include the classes under META-INF
+        exclude()
       } else if (path.startsWith("META-INF/versions/9/net/bytebuddy/")) {
         path = path.removePrefix("META-INF/versions/9/")
       }