Merge branch 'main' into renovate/errorproneversion

laurit · laurit · commit 99cc922de88f · 2025-09-24T10:08:39.000+03:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -257,7 +257,7 @@ jobs:
           GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
         run: |
           message="Post-release updates for $VERSION"
-          body="Post-release updates for `$VERSION`."
+          body="Post-release updates for \`$VERSION\`."
           branch="otelbot/update-apidiff-baseline-to-released-version-${VERSION}"
 
           git checkout -b $branch
diff --git a/.github/workflows/reusable-native-tests.yml b/.github/workflows/reusable-native-tests.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - id: read-java
         run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
-      - uses: graalvm/setup-graalvm@7a1da54cb7fdef4ea19f6ecdfa9ecf59dc5a48fe # v1.3.6.1
+      - uses: graalvm/setup-graalvm@aba6a077d71fbfc02138d7470c4ad6e7f85bd2a9 # v1.3.7.1
         with:
           version: "latest"
           java-version: ${{ matrix.test-java-version }}
diff --git a/CHANGELOG.md b/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
diff --git a/benchmark-overhead/Dockerfile.petclinic b/benchmark-overhead/Dockerfile.petclinic
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.28_6-jdk@sha256:ce8a016736cac5f2664ee47d7628557a00fe37997c49bc3c55802070416d75f2 as app-build
+FROM eclipse-temurin:11.0.28_6-jdk@sha256:cbc00ee9dbeb737367035e19e2655529c4cd5e887f33a69a80dd56928f3bef65 as app-build
 
 # This is the base image that will contain a built version of the spring-petclinic-rest
 # application. Installing the dependencies and maven compiling the application is time
diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
@@ -59,7 +59,7 @@ dependencies {
   implementation("com.gradleup.shadow:shadow-gradle-plugin:9.1.0")
   implementation("org.apache.httpcomponents:httpclient:4.5.14")
   implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.2")
-  implementation("org.owasp:dependency-check-gradle:12.1.3")
+  implementation("org.owasp:dependency-check-gradle:12.1.5")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
   implementation("org.spdx:spdx-gradle-plugin:0.9.0")
   // When updating, also update dependencyManagement/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")
 }
diff --git a/dependencyManagement/build.gradle.kts b/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 {
diff --git a/docs/apidiffs/2.20.1_vs_2.20.0/opentelemetry-instrumentation-annotations.txt b/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.
diff --git a/docs/apidiffs/2.20.1_vs_2.20.0/opentelemetry-instrumentation-api.txt b/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.
diff --git a/docs/apidiffs/2.20.1_vs_2.20.0/opentelemetry-spring-boot-autoconfigure.txt b/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.
diff --git a/docs/apidiffs/2.20.1_vs_2.20.0/opentelemetry-spring-boot-starter.txt b/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.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt b/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.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/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.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt b/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.
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt b/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.
diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
@@ -67,7 +67,7 @@ subprojects {
     implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions.opentelemetryJavaagent}"))
     implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.opentelemetryJavaagentAlpha}"))
 
-    testImplementation("org.mockito:mockito-core:5.19.0")
+    testImplementation("org.mockito:mockito-core:5.20.0")
 
     testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
     testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/examples/distro/gradle/instrumentation.gradle b/examples/distro/gradle/instrumentation.gradle
@@ -25,7 +25,7 @@ dependencies {
   // test dependencies
   testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
-  testImplementation("org.assertj:assertj-core:3.27.5")
+  testImplementation("org.assertj:assertj-core:3.27.6")
 
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:${versions.opentelemetryJavaagentAlpha}")
diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
 
   implementation("com.gradleup.shadow:shadow-gradle-plugin:9.1.0")
 
-  testImplementation("org.assertj:assertj-core:3.27.5")
+  testImplementation("org.assertj:assertj-core:3.27.6")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
diff --git a/instrumentation-docs/build.gradle.kts b/instrumentation-docs/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-sdk-common")
 
   testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
-  testImplementation("org.assertj:assertj-core:3.27.5")
+  testImplementation("org.assertj:assertj-core:3.27.6")
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
diff --git a/instrumentation-docs/instrumentations.sh b/instrumentation-docs/instrumentations.sh
diff --git a/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts b/instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts
diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java
diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java
diff --git a/smoke-tests/images/early-jdk8/Dockerfile b/smoke-tests/images/early-jdk8/Dockerfile
diff --git a/smoke-tests/images/grpc/build.gradle.kts b/smoke-tests/images/grpc/build.gradle.kts
diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/test/utils/PortAllocator.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/test/utils/PortAllocator.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM eclipse-temurin:11.0.28_6-jdk@sha256:ce8a016736cac5f2664ee47d7628557a00fe37997c49bc3c55802070416d75f2 as app-build`
	`1`	`+FROM eclipse-temurin:11.0.28_6-jdk@sha256:cbc00ee9dbeb737367035e19e2655529c4cd5e887f33a69a80dd56928f3bef65 as app-build`
`2`	`2`
`3`	`3`	`# This is the base image that will contain a built version of the spring-petclinic-rest`
`4`	`4`	`# application. Installing the dependencies and maven compiling the application is time`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Comparing source compatibility of opentelemetry-instrumentation-annotations-2.20.1.jar against opentelemetry-instrumentation-annotations-2.20.0.jar`
	`2`	`+No changes.`