Merge branch 'main' into fix-logic-errors

Author: trask

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

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.

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

@@ -1,2 +1,2 @@
-Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.21.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.20.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.21.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.20.1.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.21.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.20.0.jar
+Comparing source compatibility of opentelemetry-spring-boot-starter-2.21.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.20.1.jar
 No changes.

smoke-tests/images/grpc/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
   implementation(platform("io.grpc:grpc-bom:1.75.0"))
   implementation(platform("io.opentelemetry:opentelemetry-bom:1.0.0"))
   implementation(platform("io.opentelemetry:opentelemetry-bom-alpha:1.0.0-alpha"))
-  implementation(platform("org.apache.logging.log4j:log4j-bom:2.25.1"))
+  implementation(platform("org.apache.logging.log4j:log4j-bom:2.25.2"))
 
   implementation("io.grpc:grpc-netty-shaded")
   implementation("io.grpc:grpc-protobuf")