Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-servlet3

Author: SylvainJuge

README.md

@@ -80,9 +80,9 @@ java -javaagent:path/to/opentelemetry-javaagent.jar \
      -jar myapp.jar
 ```
 
-By default, the OpenTelemetry Java agent uses
+By default, the OpenTelemetry Java agent uses the
 [OTLP exporter](https://github.com/open-telemetry/opentelemetry-java/tree/main/exporters/otlp)
-configured to send data to
+configured to send data to an
 [OpenTelemetry collector](https://github.com/open-telemetry/opentelemetry-collector/blob/main/receiver/otlpreceiver/README.md)
 at `http://localhost:4318`.
 
@@ -197,6 +197,6 @@ Thanks to all the people who already contributed!
 
 [config-sdk]: https://opentelemetry.io/docs/languages/java/configuration/
 
-[manual]: https://opentelemetry.io/docs/instrumentation/java/manual/
+[manual]: https://opentelemetry.io/docs/languages/java/instrumentation/#manual-instrumentation
 
-[suppress]: https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/#suppressing-specific-auto-instrumentation
+[suppress]: https://opentelemetry.io/docs/zero-code/java/agent/disable/

conventions/build.gradle.kts

@@ -64,7 +64,7 @@ dependencies {
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
   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.9")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.10")
   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.35.1"
-val byteBuddyVersion = "1.15.9"
+val byteBuddyVersion = "1.15.10"
 val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"

gradle-plugins/build.gradle.kts

@@ -24,7 +24,7 @@ configurations.named("compileOnly") {
   extendsFrom(bbGradlePlugin)
 }
 
-val byteBuddyVersion = "1.15.9"
+val byteBuddyVersion = "1.15.10"
 val aetherVersion = "1.1.0"
 
 dependencies {

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java

@@ -137,7 +137,6 @@ private static void installBytebuddyAgent(
             .with(new RedefinitionDiscoveryStrategy())
             .with(AgentBuilder.DescriptionStrategy.Default.POOL_ONLY)
             .with(AgentTooling.poolStrategy())
-            .with(new ClassLoadListener())
             .with(AgentTooling.transformListener())
             .with(AgentTooling.locationStrategy());
     if (JavaModule.isSupported()) {
@@ -172,6 +171,7 @@ private static void installBytebuddyAgent(
       agentListener.beforeAgent(autoConfiguredSdk);
     }
 
+    agentBuilder = agentBuilder.with(new ClassLoadListener());
     agentBuilder = configureIgnoredTypes(sdkConfig, extensionClassLoader, agentBuilder);
 
     int numberOfLoadedExtensions = 0;

javaagent/build.gradle.kts

@@ -141,23 +141,43 @@ tasks {
     archiveFileName.set("bootstrapLibs.jar")
   }
 
-  val relocateBaseJavaagentLibs by registering(ShadowJar::class) {
+  val relocateBaseJavaagentLibsTmp by registering(ShadowJar::class) {
     configurations = listOf(baseJavaagentLibs)
 
     excludeBootstrapClasses()
 
     duplicatesStrategy = DuplicatesStrategy.FAIL
 
+    archiveFileName.set("baseJavaagentLibs-relocated-tmp.jar")
+  }
+
+  val relocateBaseJavaagentLibs by registering(Jar::class) {
+    dependsOn(relocateBaseJavaagentLibsTmp)
+
+    copyByteBuddy(relocateBaseJavaagentLibsTmp.get().archiveFile)
+
+    duplicatesStrategy = DuplicatesStrategy.FAIL
+
     archiveFileName.set("baseJavaagentLibs-relocated.jar")
   }
 
-  val relocateJavaagentLibs by registering(ShadowJar::class) {
+  val relocateJavaagentLibsTmp by registering(ShadowJar::class) {
     configurations = listOf(javaagentLibs)
 
     excludeBootstrapClasses()
 
     duplicatesStrategy = DuplicatesStrategy.FAIL
 
+    archiveFileName.set("javaagentLibs-relocated-tmp.jar")
+  }
+
+  val relocateJavaagentLibs by registering(Jar::class) {
+    dependsOn(relocateJavaagentLibsTmp)
+
+    copyByteBuddy(relocateJavaagentLibsTmp.get().archiveFile)
+
+    duplicatesStrategy = DuplicatesStrategy.FAIL
+
     archiveFileName.set("javaagentLibs-relocated.jar")
   }
 
@@ -363,6 +383,24 @@ fun CopySpec.isolateClasses(jar: Provider<RegularFile>) {
   }
 }
 
+fun CopySpec.copyByteBuddy(jar: Provider<RegularFile>) {
+  // Byte buddy jar includes classes compiled for java 5 at the root of the jar and the same classes
+  // compiled for java 8 under META-INF/versions/9. Here we move the classes from
+  // META-INF/versions/9/net/bytebuddy to net/bytebuddy to get rid of the duplicate classes.
+  from(zipTree(jar)) {
+    eachFile {
+      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()
+      } else if (path.startsWith("META-INF/versions/9/net/bytebuddy/")) {
+        path = path.removePrefix("META-INF/versions/9/")
+      }
+    }
+    includeEmptyDirs = false
+  }
+}
+
 // exclude bootstrap projects from javaagent libs - they won't be added to inst/
 fun ShadowJar.excludeBootstrapClasses() {
   dependencies {

licenses/byte-buddy-dep-1.15.9.jar/META-INF/LICENSE renamed to licenses/byte-buddy-dep-1.15.10.jar/META-INF/LICENSE

@@ -20,12 +20,6 @@ dependencies {
   implementation("io.quarkus:quarkus-rest")
 }
 
-quarkus {
-  // Expected by jib extension.
-  // TODO(anuraaga): Switch to quarkus plugin native jib support.
-  setFinalName("opentelemetry-quarkus-$version")
-}
-
 // Quarkus 3.7+ requires Java 17+
 val targetJDK = project.findProperty("targetJDK") ?: "17"
 
@@ -34,10 +28,10 @@ val tag = findProperty("tag")
 
 java {
   // this is needed to avoid jib failing with
-  // "Your project is using Java 17 but the base image is for Java 8"
+  // "Your project is using Java 21 but the base image is for Java 17"
   // (it seems the jib plugins does not understand toolchains yet)
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 jib {
@@ -46,6 +40,12 @@ jib {
   container {
     mainClass = "bogus" // to suppress Jib warning about missing main class
   }
+  pluginExtensions {
+    pluginExtension {
+      implementation = "com.google.cloud.tools.jib.gradle.extension.quarkus.JibQuarkusExtension"
+      properties = mapOf("packageType" to "fast-jar")
+    }
+  }
 }
 
 tasks {