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

Author: SylvainJuge

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## Version 2.20.1 (2025-09-22)
+
+### 🛠️ Bug fixes
+
+- Backport: Update the OpenTelemetry SDK version to 1.54.1
+  ([#14720](https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/14720))
+
 ## Version 2.20.0 (2025-09-13)
 
 ### Migration notes

benchmark-overhead/Dockerfile.petclinic

@@ -13,7 +13,7 @@ RUN git checkout 8aa4d49
 RUN ./mvnw package -Dmaven.test.skip=true
 RUN cp target/spring-petclinic-rest*.jar /app/spring-petclinic-rest.jar
 
-FROM bellsoft/liberica-openjdk-alpine:21.0.8@sha256:c4052811bba52c7a06ebde235c839108bf723dfab3c65066f61145a252480b16
+FROM bellsoft/liberica-openjdk-alpine:25@sha256:2ef36da2e7dbde0730121d6a5d018d318adaecc1a420bd170031c1453dbf4b6d
 COPY --from=app-build /app/spring-petclinic-rest.jar /app/spring-petclinic-rest.jar
 WORKDIR /app
 EXPOSE 9966

conventions/build.gradle.kts

@@ -73,5 +73,5 @@ dependencies {
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-  testImplementation("org.assertj:assertj-core:3.27.5")
+  testImplementation("org.assertj:assertj-core:3.27.6")
 }

dependencyManagement/build.gradle.kts

@@ -110,7 +110,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-samplers:${otelContribVersion}",
   "io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha",
   "io.opentelemetry:opentelemetry-extension-annotations:1.18.0", // deprecated, no longer part of bom
-  "org.assertj:assertj-core:3.27.5",
+  "org.assertj:assertj-core:3.27.6",
   "org.awaitility:awaitility:4.3.0",
   "com.google.code.findbugs:annotations:3.0.1u2",
   "com.google.code.findbugs:jsr305:3.0.2",
@@ -121,7 +121,7 @@ val DEPENDENCIES = listOf(
   "org.objenesis:objenesis:3.4",
   "javax.validation:validation-api:2.0.1.Final",
   "org.snakeyaml:snakeyaml-engine:2.10",
-  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.14"
+  "org.elasticmq:elasticmq-rest-sqs_2.13:1.6.15"
 )
 
 javaPlatform {

docs/apidiffs/2.20.1_vs_2.20.0/opentelemetry-instrumentation-annotations.txt

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

docs/apidiffs/2.20.1_vs_2.20.0/opentelemetry-instrumentation-api.txt

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

docs/apidiffs/2.20.1_vs_2.20.0/opentelemetry-spring-boot-autoconfigure.txt

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

docs/apidiffs/2.20.1_vs_2.20.0/opentelemetry-spring-boot-starter.txt

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

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

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-annotations-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.20.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.20.1.jar
 No changes.

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

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-instrumentation-api-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.20.0.jar
+Comparing source compatibility of opentelemetry-instrumentation-api-2.21.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.20.1.jar
 No changes.