merge

Author: laurit

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -136,9 +136,9 @@ testing {
       implementation(project(project.path))
 
       implementation(enforcedPlatform("org.junit:junit-bom:5.12.0"))
-      implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.20.5"))
+      implementation(enforcedPlatform("org.testcontainers:testcontainers-bom:1.20.6"))
       implementation(enforcedPlatform("com.google.guava:guava-bom:33.4.0-jre"))
-      implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.31.3"))
+      implementation(enforcedPlatform("com.linecorp.armeria:armeria-bom:1.32.0"))
 
       compileOnly("com.google.auto.value:auto-value-annotations")
       compileOnly("com.google.errorprone:error_prone_annotations")

dependencyManagement/build.gradle.kts

@@ -51,7 +51,7 @@ dependencies {
     api("org.junit-pioneer:junit-pioneer:1.9.1")
     api("org.skyscreamer:jsonassert:1.5.3")
     api("org.apache.kafka:kafka-clients:3.9.0")
-    api("org.testcontainers:kafka:1.20.5")
+    api("org.testcontainers:kafka:1.20.6")
     api("com.lmax:disruptor:3.4.4")
     api("org.jctools:jctools-core:4.0.5")
     api("tools.profiler:async-profiler:3.0")

gcp-auth-extension/README.md

@@ -48,6 +48,10 @@ Here is a list of configurable options for the extension:
 The OpenTelemetry Java Agent Extension can be easily added to any Java application by modifying the startup command to the application.
 For more information on Extensions, see the [documentation here](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/examples/extension/README.md).
 
+> [!IMPORTANT]
+> Make sure to download the 'shaded' variant of the Authentication Extension for use with OpenTelemetry Java auto-instrumentation agent. The shaded version is available under the classifier name `shadow`.\
+> See instructions for [Downloading Shaded JAR](#downloading-shaded-jar) below.
+
 Below is a snippet showing how to add the extension to a Java application using the Gradle build system.
 
 ```gradle
@@ -80,6 +84,21 @@ application {
 }
 ```
 
+#### Downloading Shaded JAR
+
+You can download the shaded JAR for Google Cloud Authentication Extension from the following link -
+
+```text
+https://repo1.maven.org/maven2/io/opentelemetry/contrib/opentelemetry-gcp-auth-extension/<VERSION>/opentelemetry-gcp-auth-extension-<VERSION>-shadow.jar
+```
+
+Replace `<VERSION>` with the version you wish to download. For instance, shaded
+variant for `v1.44.0-alpha`, will be found at -
+
+`https://repo1.maven.org/maven2/io/opentelemetry/contrib/opentelemetry-gcp-auth-extension/1.44.0-alpha/opentelemetry-gcp-auth-extension-1.44.0-alpha-shadow.jar`
+
+*Note: Typically, you would want to use the most recent version of the extension.*
+
 ### Without OpenTelemetry Java agent
 
 This extension can be used without the OpenTelemetry Java agent by leveraging the [OpenTelemetry SDK Autoconfigure](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md) module.\

gcp-auth-extension/build.gradle.kts

@@ -60,6 +60,13 @@ tasks {
   }
 
   shadowJar {
+    /**
+     * Shaded version of this extension is required when using it as a OpenTelemetry Java Agent
+     * extension. Shading bundles the dependencies required by this extension in the resulting JAR,
+     * ensuring their presence on the classpath at runtime.
+     *
+     * See http://gradleup.com/shadow/introduction/#introduction for reference.
+     */
     archiveClassifier.set("shadow")
   }
 

jmx-metrics/build.gradle.kts

@@ -17,7 +17,7 @@ val groovyVersion = "3.0.24"
 dependencies {
   api(platform("org.codehaus.groovy:groovy-bom:$groovyVersion"))
 
-  implementation("io.grpc:grpc-netty-shaded:1.70.0")
+  implementation("io.grpc:grpc-netty-shaded:1.71.0")
   implementation("org.codehaus.groovy:groovy-jmx")
   implementation("org.codehaus.groovy:groovy")
   implementation("io.prometheus:simpleclient")

processors/README.md

@@ -25,8 +25,7 @@ tracer_provider: ...
 
 logger_provider:
   processors:
-      # TODO(jack-berg): remove "{}" after releasing [opentelemetry-java#6891](https://github.com/open-telemetry/opentelemetry-java/pull/6891/files)
-      - event_to_span_event_bridge: {}
+      - event_to_span_event_bridge:
 ```
 
 ## Component owners

processors/src/test/java/io/opentelemetry/contrib/eventbridge/internal/EventToSpanBridgeComponentProviderTest.java

@@ -21,9 +21,7 @@ void endToEnd() {
         "file_format: 0.3\n"
             + "logger_provider:\n"
             + "  processors:\n"
-            // TODO(jack-berg): remove "{}" after releasing
-            // https://github.com/open-telemetry/opentelemetry-java/pull/6891/files
-            + "    - event_to_span_event_bridge: {}\n";
+            + "    - event_to_span_event_bridge:";
 
     OpenTelemetrySdk openTelemetrySdk =
         FileConfiguration.parseAndCreate(