Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into jmx-metric-lowercase-attribute

Author: SylvainJuge

CHANGELOG.md

@@ -8,6 +8,13 @@
   `io.opentelemetry.instrumentation.httpclient` was deprecated in favor of the new package name
   `io.opentelemetry.instrumentation.javahttpclient`
 
+## Version 2.13.2 (2025-02-27)
+
+### 🛠️ Bug fixes
+
+- Backport: Fix Spring boot starter dependency resolution failure with Gradle and Java 11
+  ([#13402](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/13402))
+
 ## Version 2.13.1 (2025-02-18)
 
 ### 🛠️ Bug fixes

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

@@ -143,7 +143,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
     with(ctx.details) {
       if (id.group == "io.netty" && id.name != "netty") {
         if (id.version.startsWith("4.1.")) {
-          belongsTo("io.netty:netty-bom:4.1.118.Final", false)
+          belongsTo("io.netty:netty-bom:4.1.119.Final", false)
         } else if (id.version.startsWith("4.0.")) {
           belongsTo("io.netty:netty-bom:4.0.56.Final", false)
         }

docs/apidiffs/2.13.2_vs_2.13.1/opentelemetry-instrumentation-annotations.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.13.2.jar against opentelemetry-instrumentation-annotations-2.13.1.jar
+No changes.

docs/apidiffs/2.13.2_vs_2.13.1/opentelemetry-instrumentation-api.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-instrumentation-api-2.13.2.jar against opentelemetry-instrumentation-api-2.13.1.jar
+No changes.

docs/apidiffs/2.13.2_vs_2.13.1/opentelemetry-spring-boot-autoconfigure.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.13.2.jar against opentelemetry-spring-boot-autoconfigure-2.13.1.jar
+No changes.

docs/apidiffs/2.13.2_vs_2.13.1/opentelemetry-spring-boot-starter.txt

@@ -0,0 +1,2 @@
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.13.2.jar against opentelemetry-spring-boot-starter-2.13.1.jar
+No changes.

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

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.13.1.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.13.2.jar
 No changes.

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

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.13.1.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.14.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.13.2.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.13.1.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.13.2.jar
 No changes.

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.13.1.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.14.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.13.2.jar
 No changes.

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts

@@ -57,4 +57,17 @@ tasks {
     dependsOn(testPS)
     dependsOn(testSerial)
   }
+
+  tasks {
+    compileJava {
+      // We compile this module for java 8 because it is used as a dependency in spring-boot-autoconfigure.
+      // If this module is compiled for java 17 then gradle can figure out based on the metadata that
+      // spring-boot-autoconfigure has a dependency that requires 17 and fails the build when it is used
+      // in a project that targets an earlier java version.
+      // https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/13384
+      sourceCompatibility = "1.8"
+      targetCompatibility = "1.8"
+      options.release.set(null as Int?)
+    }
+  }
 }

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/SpringWebfluxServerInstrumentationTest.java

@@ -41,7 +41,6 @@ public void stopServer(ConfigurableApplicationContext applicationContext) {
   protected void configure(HttpServerTestOptions options) {
     options.setContextPath(CONTEXT_PATH);
     options.setTestPathParam(true);
-    options.setExpectedException(new RuntimeException(ServerEndpoint.EXCEPTION.getBody()));
 
     options.setExpectedHttpRoute(
         (endpoint, method) -> {

instrumentation/spring/spring-webflux/spring-webflux-5.3/library/src/test/java/io/opentelemetry/instrumentation/spring/webflux/v5_3/TestWebfluxSpringBootApp.java

@@ -97,12 +97,12 @@ Mono<ResponseEntity<String>> error() {
     }
 
     @RequestMapping("/exception")
-    Flux<ResponseEntity<String>> exception() throws Exception {
+    Flux<ResponseEntity<String>> exception() {
       return Flux.just(
           controller(
               EXCEPTION,
               () -> {
-                throw new RuntimeException(EXCEPTION.getBody());
+                throw new IllegalStateException(EXCEPTION.getBody());
               }));
     }