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

Author: SylvainJuge

.fossa.yml

@@ -100,6 +100,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:external-annotations:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:failsafe-3.0:library'
     - type: gradle
       path: ./
       target: ':instrumentation:finagle-http-23.11:javaagent'

.github/workflows/documentation-disable-list-audit.yml renamed to .github/workflows/documentation-synchronization-audit.yml

@@ -1,4 +1,4 @@
-name: opentelemetry.io documentation disable list audit
+name: Documentation Synchronization Audit (opentelemetry.io)
 
 on:
   schedule:
@@ -11,6 +11,8 @@ permissions:
 jobs:
   crawl:
     runs-on: ubuntu-latest
+    outputs:
+      audit-output: ${{ steps.audit.outputs.AUDIT_OUTPUT }}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -26,7 +28,20 @@ jobs:
         run: ./gradlew :instrumentation-docs:runAnalysis
 
       - name: Run doc site audit
-        run: ./gradlew :instrumentation-docs:docSiteAudit
+        id: audit
+        run: |
+          if ! output=$(./gradlew :instrumentation-docs:docSiteAudit 2>&1); then
+            echo "AUDIT_FAILED=true" >> $GITHUB_OUTPUT
+            echo "AUDIT_OUTPUT<<EOF" >> $GITHUB_OUTPUT
+            # Extract only the content between our custom markers
+            echo "$output" | sed -n '/=== AUDIT_FAILURE_START ===/,/=== AUDIT_FAILURE_END ===/p' | \
+              sed '/=== AUDIT_FAILURE_START ===/d' | \
+              sed '/=== AUDIT_FAILURE_END ===/d' >> $GITHUB_OUTPUT
+            echo "EOF" >> $GITHUB_OUTPUT
+            exit 1
+          else
+            echo "AUDIT_FAILED=false" >> $GITHUB_OUTPUT
+          fi
 
   workflow-notification:
     permissions:
@@ -38,3 +53,4 @@ jobs:
     uses: ./.github/workflows/reusable-workflow-notification.yml
     with:
       success: ${{ needs.crawl.result == 'success' }}
+      failure-details: ${{ needs.crawl.outputs.audit-output }}

.github/workflows/publish-smoke-test-fake-backend-images.yml

@@ -67,9 +67,9 @@ jobs:
           java-version-file: .java-version
 
       - name: Login to GitHub package registry
-        uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
-          login-server: ghcr.io
+          registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/release-update-cloudfoundry-index.yml

@@ -31,15 +31,10 @@ jobs:
       - name: create working branch
         run: git checkout -b otelbot/cloudfoundry-${{ github.run_number }}-${{ github.run_attempt }}
 
-      - name: install xq (which is part of yq)
-        run: |
-          sudo apt-get install jq python3-pip
-          pip install yq==3.4.3
-
       - name: update index.yml
         run: |
           wget https://repo1.maven.org/maven2/io/opentelemetry/javaagent/opentelemetry-javaagent/maven-metadata.xml
-          xq -r .metadata.versioning.versions.version[] maven-metadata.xml | sed -E 's/(.*)/\1: https:\/\/repo1.maven.org\/maven2\/io\/opentelemetry\/javaagent\/opentelemetry-javaagent\/\1\/opentelemetry-javaagent-\1.jar/' > index.yml
+          grep -oP '(?<=<version>)[^<]+' maven-metadata.xml | sed -E 's/(.*)/\1: https:\/\/repo1.maven.org\/maven2\/io\/opentelemetry\/javaagent\/opentelemetry-javaagent\/\1\/opentelemetry-javaagent-\1.jar/' > index.yml
 
       - name: display changes
         run: git diff

.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

.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 }}

.github/workflows/reusable-workflow-notification.yml

@@ -8,6 +8,9 @@ on:
       success:
         type: boolean
         required: true
+      failure-details:
+        type: string
+        required: false
 
 permissions:
   contents: read
@@ -31,14 +34,19 @@ jobs:
           echo $number
           echo ${{ inputs.success }}
 
+          # Prepare the issue body with failure details if available
+          if [[ -n "${{ inputs.failure-details }}" ]]; then
+            issue_body="See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."$'\n\n'"## Failure Details"$'\n\n'"${{ inputs.failure-details }}"
+          else
+            issue_body="See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
+          fi
+
           if [[ $number ]]; then
             if [[ "${{ inputs.success }}" == "true" ]]; then
               gh issue close $number
             else
-              gh issue comment $number \
-                               --body "See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
+              gh issue comment $number --body "$issue_body"
             fi
           elif [[ "${{ inputs.success }}" == "false" ]]; then
-            gh issue create --title "Workflow failed: $GITHUB_WORKFLOW (#$GITHUB_RUN_NUMBER)" \
-                            --body "See [$GITHUB_WORKFLOW #$GITHUB_RUN_NUMBER](https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID)."
+            gh issue create --title "Workflow failed: $GITHUB_WORKFLOW (#$GITHUB_RUN_NUMBER)" --body "$issue_body"
           fi

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-jmh/build.gradle.kts

@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.5")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.5.6")
 }
 
 tasks {

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
@@ -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