From 13ec6d1e651bd2680b83e5310a0608f7723b0ad9 Mon Sep 17 00:00:00 2001 From: aws-application-signals-bot <167233089+aws-application-signals-bot@users.noreply.github.com> Date: Wed, 29 Oct 2025 13:42:44 -0700 Subject: [PATCH 1/5] Pre-release: Update version to 2.20.0 (#1252) This PR updates the version to 2.20.0. By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice. --------- Co-authored-by: github-actions --- CHANGELOG.md | 2 ++ version.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43bcd45194..946a611328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t ## Unreleased +## v2.20.0 - 2025-10-29 + ### Enhancements - Support X-Ray Trace Id extraction from Lambda Context object, and respect user-configured OTEL_PROPAGATORS in AWS Lamdba instrumentation diff --git a/version.gradle.kts b/version.gradle.kts index 02c4204c54..47653c919e 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -val adotVersion = "2.20.0-SNAPSHOT" +val adotVersion = "2.20.0" allprojects { version = if (project.hasProperty("release.version")) { From bd7967603d9ec4bb300dea4e78fe509eeb5c721d Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Thu, 30 Oct 2025 11:12:08 -0700 Subject: [PATCH 2/5] fix e2e test to work in release branches (#1253) (#1254) *Issue #, if available:* *Description of changes:* The workflow `application-signals-e2e-test.yml` assumes the version contains -SNAPSHOT. In release branches, we update `version.gradle.kts` to drop the -SNAPSHOT suffix to prepare for the release, so `upload-main-build` fails. See https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/18921541300/job/54022142576 This PR modifies the job to match any artifact with the name `aws-opentelemetry-agent-*.jar`, with or without the SNAPSHOT suffix. tested by manually triggering main build in this branch: 1. adotVersion = 2.20.0-SNAPSHOT: https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/18925772853/job/54034432606 `upload: ./aws-opentelemetry-agent-2.20.0-SNAPSHOT.jar to s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar` 2. adotVersion = 2.20.0: https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/18927001060 `upload: ./aws-opentelemetry-agent-2.20.0.jar to s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar` Both runs are successful. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. *Issue #, if available:* *Description of changes:* By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .github/workflows/application-signals-e2e-test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/application-signals-e2e-test.yml b/.github/workflows/application-signals-e2e-test.yml index ca152b37b0..cda50cd13c 100644 --- a/.github/workflows/application-signals-e2e-test.yml +++ b/.github/workflows/application-signals-e2e-test.yml @@ -25,6 +25,8 @@ jobs: upload-main-build: runs-on: ubuntu-latest steps: + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0 + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0 with: @@ -36,7 +38,10 @@ jobs: name: aws-opentelemetry-agent.jar - name: Upload main-build adot.jar to s3 - run: aws s3 cp ./aws-opentelemetry-agent-*-SNAPSHOT.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar + run: | + # Extract artifact suffix using version.gradle.kts + VERSION=$(awk -F'"' '/val adotVersion = / {print $2}' version.gradle.kts) + aws s3 cp ./aws-opentelemetry-agent-$VERSION.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar # # PACKAGED DISTRIBUTION LANGUAGE VERSION COVERAGE From 55526465c7f48e5e8093a87b851ca60fff52b4a5 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Fri, 31 Oct 2025 12:48:19 -0700 Subject: [PATCH 3/5] Release patch (#1255) *Issue #, if available:* *Description of changes:* The 2.20.0 release build failed with at the step "Build and Publish release with Gradle": ``` org.gradle.api.GradleException: version should not be set in build file when using nebula-release plugin. Instead use `-Prelease.version` parameter ``` The following PR fixes version.gradle.kts to not touch project.version at all if the `-Prelease.version` flag is passed in to an environment. It also creates a copy of the release build workflow that only re-runs the failed Sonatype step in publish-sdk (did 2PR with @jj22ee to confirm). By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .github/workflows/release-build.yml | 20 ++++++++++---------- version.gradle.kts | 6 ++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index e8d22a7364..6c55cf6901 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -205,16 +205,16 @@ jobs: shell: bash run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "$VERSION" - - name: Build and push image - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0 - with: - push: true - build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}" - context: . - platforms: linux/amd64,linux/arm64 - tags: | - ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }} - ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }} + # - name: Build and push image + # uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0 + # with: + # push: true + # build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}" + # context: . + # platforms: linux/amd64,linux/arm64 + # tags: | + # ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }} + # ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }} - name: Build and Publish release with Gradle uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 #v3.5.0 diff --git a/version.gradle.kts b/version.gradle.kts index 47653c919e..fee416c87f 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -16,9 +16,7 @@ val adotVersion = "2.20.0" allprojects { - version = if (project.hasProperty("release.version")) { - project.property("release.version") as String - } else { - adotVersion + if (!project.hasProperty("release.version")) { + version = adotVersion } } From 846ba45b82304ab66e8988f383b9aecede6b642f Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Tue, 4 Nov 2025 14:51:10 -0800 Subject: [PATCH 4/5] Revert commented out release step (#1257) *Issue #, if available:* *Description of changes:* In #1255, after making a fix to the version file, we re-ran the workflow with the already-successful "Build and push image" step commented out. This PR uncomments the step again for future patch releases on the v2.20.x branch. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --- .github/workflows/release-build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 6c55cf6901..e8d22a7364 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -205,16 +205,16 @@ jobs: shell: bash run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "$VERSION" - # - name: Build and push image - # uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0 - # with: - # push: true - # build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}" - # context: . - # platforms: linux/amd64,linux/arm64 - # tags: | - # ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }} - # ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }} + - name: Build and push image + uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0 + with: + push: true + build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}" + context: . + platforms: linux/amd64,linux/arm64 + tags: | + ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }} + ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }} - name: Build and Publish release with Gradle uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 #v3.5.0 From 658bbe9d54a45756de369eef5967498a9c415e7e Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 18 Nov 2025 18:55:32 +0000 Subject: [PATCH 5/5] Prepare main for next development cycle: Update version to 2.20.0-SNAPSHOT --- .github/workflows/daily-scan.yml | 4 ++-- version.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daily-scan.yml b/.github/workflows/daily-scan.yml index fc801cee62..1bf4655103 100644 --- a/.github/workflows/daily-scan.yml +++ b/.github/workflows/daily-scan.yml @@ -110,7 +110,7 @@ jobs: id: high_scan_v2 uses: ./.github/actions/image_scan with: - image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.5" + image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.20.0" severity: 'CRITICAL,HIGH' logout: 'false' @@ -119,7 +119,7 @@ jobs: id: low_scan_v2 uses: ./.github/actions/image_scan with: - image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.5" + image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.20.0" severity: 'MEDIUM,LOW,UNKNOWN' logout: 'false' diff --git a/version.gradle.kts b/version.gradle.kts index fee416c87f..5343f14063 100644 --- a/version.gradle.kts +++ b/version.gradle.kts @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -val adotVersion = "2.20.0" +val adotVersion = "2.20.0-SNAPSHOT" allprojects { if (!project.hasProperty("release.version")) {