Use byte-buddy-dep instead of byte-buddy (#4400)

* Use byte-buddy-dep instead of byte-buddy

* print stacktrace on examples failure

* try to fix gradle plugins

* try to fix extension build

* try to fix extension build

* try to fix extension build

* try to fix extension build

* try removing mavenLocal

* add mavenLocal plugin repository

* publish gradle-plugins to mavenLocal for examples ci build

* Fix bytebuddy exclusion

Author: laurit

.github/workflows/ci.yml

@@ -275,6 +275,10 @@ jobs:
         # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
         run: ./gradlew publishToMavenLocal -x javadoc
 
+      - name: Local publish gradle plugin
+        run: ../gradlew publishToMavenLocal -x javadoc
+        working-directory: gradle-plugins
+
       - name: Build distro
         run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
         working-directory: examples/distro

.github/workflows/pr.yml

@@ -276,12 +276,16 @@ jobs:
         # javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
         run: ./gradlew publishToMavenLocal -x javadoc
 
+      - name: Local publish gradle plugin
+        run: ../gradlew publishToMavenLocal -x javadoc
+        working-directory: gradle-plugins
+
       - name: Build distro
-        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
+        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts --stacktrace
         working-directory: examples/distro
 
       - name: Build extension
-        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts
+        run: ./gradlew build --init-script ../../.github/scripts/local.init.gradle.kts --stacktrace
         working-directory: examples/extension
 
   accept-pr:

conventions/build.gradle.kts

@@ -44,8 +44,8 @@ dependencies {
   implementation("org.ow2.asm:asm-tree:9.1")
   implementation("org.apache.httpcomponents:httpclient:4.5.13")
   implementation("org.gradle:test-retry-gradle-plugin:1.2.1")
-  // When updating, also update dependencyManagement/dependencyManagement.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.11.18")
+  // When updating, also update dependencyManagement/build.gradle.kts
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.11.20")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.5")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:2.0.1")

dependencyManagement/build.gradle.kts

@@ -62,9 +62,9 @@ val DEPENDENCY_SETS = listOf(
   ),
   DependencySet(
     "net.bytebuddy",
-    // When updating, also update buildSrc/build.gradle.kts
-    "1.11.18",
-    listOf("byte-buddy", "byte-buddy-agent", "byte-buddy-gradle-plugin")
+    // When updating, also update conventions/build.gradle.kts
+    "1.11.20",
+    listOf("byte-buddy", "byte-buddy-dep", "byte-buddy-agent", "byte-buddy-gradle-plugin")
   ),
   DependencySet(
     "org.openjdk.jmh",

examples/distro/build.gradle

@@ -17,8 +17,7 @@ subprojects {
     ]
 
     deps = [
-      bytebuddy           : "net.bytebuddy:byte-buddy:${versions.bytebuddy}",
-      bytebuddyagent      : "net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}",
+      bytebuddy           : "net.bytebuddy:byte-buddy-dep:${versions.bytebuddy}",
       autoservice         : [
         "com.google.auto.service:auto-service:1.0-rc7",
         "com.google.auto:auto-common:0.8",

examples/extension/settings.gradle

@@ -1,5 +1,6 @@
 pluginManagement {
   repositories {
+    mavenLocal()
     gradlePluginPortal()
     maven {
       url = uri("https://oss.sonatype.org/content/repositories/snapshots")

gradle-plugins/build.gradle.kts

@@ -15,9 +15,18 @@ repositories {
   mavenCentral()
 }
 
+val bbGradlePlugin by configurations.creating
+configurations.named("compileOnly") {
+  extendsFrom(bbGradlePlugin)
+}
+
 dependencies {
   implementation("com.google.guava:guava:30.1.1-jre")
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.11.18")
+  // we need to use byte buddy variant that does not shade asm
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.11.20") {
+    exclude(group = "net.bytebuddy", module = "byte-buddy")
+  }
+  implementation("net.bytebuddy:byte-buddy-dep:1.11.20")
 
   implementation("org.eclipse.aether:aether-connector-basic:1.1.0")
   implementation("org.eclipse.aether:aether-transport-http:1.1.0")
@@ -72,4 +81,4 @@ tasks {
   publishPlugins {
     enabled = !version.toString().contains("SNAPSHOT")
   }
-}
+}

instrumentation/external-annotations/javaagent-unit-tests/build.gradle.kts

@@ -6,6 +6,5 @@ dependencies {
   testImplementation(project(":instrumentation-api"))
   testImplementation(project(":javaagent-extension-api"))
   testImplementation(project(":javaagent-tooling"))
-  testImplementation("net.bytebuddy:byte-buddy")
   testImplementation(project(":instrumentation:external-annotations:javaagent"))
 }

instrumentation/internal/internal-lambda/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/lambda/InnerClassLambdaMetafactoryInstrumentation.java

@@ -15,13 +15,13 @@
 import net.bytebuddy.description.method.MethodList;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.implementation.Implementation;
-import net.bytebuddy.jar.asm.ClassVisitor;
-import net.bytebuddy.jar.asm.ClassWriter;
-import net.bytebuddy.jar.asm.MethodVisitor;
-import net.bytebuddy.jar.asm.Opcodes;
-import net.bytebuddy.jar.asm.Type;
 import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.pool.TypePool;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
 
 public class InnerClassLambdaMetafactoryInstrumentation implements TypeInstrumentation {
 

instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
 
   testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
   testImplementation(project(":instrumentation-api-annotation-support"))
-  testImplementation("net.bytebuddy:byte-buddy:${versions["net.bytebuddy"]}")
+  testImplementation("net.bytebuddy:byte-buddy")
 }
 
 tasks {