From 527e6107af12c4dd973ec618668c6208e51be080 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 3 Aug 2026 10:24:30 +0000 Subject: [PATCH 1/4] feat: prepare release java v2.20.0 --- README.md | 2 +- changelog/java-v2.20.0.md | 9 +++++++++ java/README.md | 2 +- java/layer-data.sh | 4 ++-- java/sample-apps/template.yaml | 32 ++++++++++++++++---------------- java/version.txt | 4 ++-- opentelemetry-lambda | 2 +- 7 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 changelog/java-v2.20.0.md diff --git a/README.md b/README.md index a1c5da3..e3431bd 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ `sumologic-otel-lambda` publishes preconfigured [OpenTelemetry Lambda](https://github.com/open-telemetry/opentelemetry-lambda) layers which provide instrumentation for AWS Lambda functions. Released `sumologic-otel-lambda` layers are available: -- Java wrapper layer contains OpenTelemetry Java `v2.19.0` and OpenTelemetry Collector `v0.132.0`. Please see list of [lambda layers](https://github.com/SumoLogic/sumologic-otel-lambda/blob/release-java-v2.19.0/java/README.md). +- Java wrapper layer contains OpenTelemetry Java `v2.30.0` and OpenTelemetry Collector `v0.157.0`. Please see list of [lambda layers](https://github.com/SumoLogic/sumologic-otel-lambda/blob/release-java-v2.20.0/java/README.md). - NodeJS layer contains OpenTelemetry JavaScript SDK `v2.2.0` and OpenTelemetry Collector `v0.138.0`. Please see list of [lambda layers](https://github.com/SumoLogic/sumologic-otel-lambda/blob/release-nodejs-v2.0.2/nodejs/README.md). diff --git a/changelog/java-v2.20.0.md b/changelog/java-v2.20.0.md new file mode 100644 index 0000000..dd9cf8b --- /dev/null +++ b/changelog/java-v2.20.0.md @@ -0,0 +1,9 @@ +## [java-v2.20.0] + +### Released 2026-08-03 + +### Changed + +- TODO: fill in changelog + +[java-v2.20.0]: https://github.com/SumoLogic/sumologic-otel-lambda/releases/tag/java-v2.20.0 diff --git a/java/README.md b/java/README.md index 278dae8..0f359e7 100644 --- a/java/README.md +++ b/java/README.md @@ -1,4 +1,4 @@ -# Sumo Logic Distribution for OpenTelemetry Java Lambda Layer unreleased version +# Sumo Logic Distribution for OpenTelemetry Java Lambda Layer v2.20.0 Layers for running Java applications on AWS Lambda with OpenTelemetry. diff --git a/java/layer-data.sh b/java/layer-data.sh index c7dd820..00a4ee7 100755 --- a/java/layer-data.sh +++ b/java/layer-data.sh @@ -4,6 +4,6 @@ OFFICIAL_LAYER_NAME=sumologic-otel-lambda-java ARCHITECTURE_AMD=x86_64 ARCHITECTURE_ARM=arm64 RUNTIMES='java8.al2 java11 java17 java21' -DESCRIPTION='Sumo Logic OTEL Collector and Java Lambda Layer https://github.com/SumoLogic/sumologic-otel-lambda/tree/release-java-2.19.0/java' +DESCRIPTION='Sumo Logic OTEL Collector and Java Lambda Layer https://github.com/SumoLogic/sumologic-otel-lambda/tree/release-java-v2.20.0/java' LICENSE=Apache-2.0 -VERSION=v2-19-0 +VERSION=v2-20-0 diff --git a/java/sample-apps/template.yaml b/java/sample-apps/template.yaml index cb1a368..139cc03 100644 --- a/java/sample-apps/template.yaml +++ b/java/sample-apps/template.yaml @@ -49,34 +49,34 @@ Outputs: Mappings: RegionMap: ap-northeast-1: - layer: "arn:aws:lambda:ap-northeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:ap-northeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" ap-northeast-2: - layer: "arn:aws:lambda:ap-northeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:ap-northeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" ap-south-1: - layer: "arn:aws:lambda:ap-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:ap-south-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" ap-southeast-1: - layer: "arn:aws:lambda:ap-southeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:ap-southeast-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" ap-southeast-2: - layer: "arn:aws:lambda:ap-southeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:ap-southeast-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" ca-central-1: - layer: "arn:aws:lambda:ca-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:ca-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" eu-central-1: - layer: "arn:aws:lambda:eu-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:eu-central-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" eu-north-1: - layer: "arn:aws:lambda:eu-north-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:eu-north-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" eu-west-1: - layer: "arn:aws:lambda:eu-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:eu-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" eu-west-2: - layer: "arn:aws:lambda:eu-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:eu-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" eu-west-3: - layer: "arn:aws:lambda:eu-west-3:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:eu-west-3:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" sa-east-1: - layer: "arn:aws:lambda:sa-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:sa-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" us-east-1: - layer: "arn:aws:lambda:us-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:us-east-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" us-east-2: - layer: "arn:aws:lambda:us-east-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:us-east-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" us-west-1: - layer: "arn:aws:lambda:us-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:us-west-1:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" us-west-2: - layer: "arn:aws:lambda:us-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-19-0:1" + layer: "arn:aws:lambda:us-west-2:663229565520:layer:sumologic-otel-lambda-java-x86_64-v2-20-0:1" diff --git a/java/version.txt b/java/version.txt index 6939b30..26e81ab 100644 --- a/java/version.txt +++ b/java/version.txt @@ -1,2 +1,2 @@ -current_version=2.19.0 -upstream_release_tag=layer-javaagent/0.19.0 +current_version=2.20.0 +upstream_release_tag=layer-javaagent/0.21.0 diff --git a/opentelemetry-lambda b/opentelemetry-lambda index 247d46c..faa4ca4 160000 --- a/opentelemetry-lambda +++ b/opentelemetry-lambda @@ -1 +1 @@ -Subproject commit 247d46c7e19d38ef5ca5e126c828827cb77c55ed +Subproject commit faa4ca4671428134849ead9d395d9c0951a9ea00 From 2f67ab312fe125abf939731c3014845414a8505c Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Mon, 21 Sep 2026 19:12:04 +0530 Subject: [PATCH 2/4] docs: update changelog --- changelog/java-v2.20.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog/java-v2.20.0.md b/changelog/java-v2.20.0.md index dd9cf8b..6057d95 100644 --- a/changelog/java-v2.20.0.md +++ b/changelog/java-v2.20.0.md @@ -1,9 +1,9 @@ ## [java-v2.20.0] -### Released 2026-08-03 +### Released 2026-09-21 ### Changed -- TODO: fill in changelog +- Update collector and instrumentation to latest upstream version [java-v2.20.0]: https://github.com/SumoLogic/sumologic-otel-lambda/releases/tag/java-v2.20.0 From 68d1e1a2a3bee0429aaf9aa966a5e0b971a340b3 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Mon, 21 Sep 2026 19:27:03 +0530 Subject: [PATCH 3/4] ci: ignore release(not yet) links (cherry picked from commit 99792da98a0df93171f579f4536c13e9bfb543be) --- .markdown_link_check.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.markdown_link_check.json b/.markdown_link_check.json index 8c69d5d..e7e0ff0 100644 --- a/.markdown_link_check.json +++ b/.markdown_link_check.json @@ -14,6 +14,9 @@ }, { "pattern": "^https://github\\.com/SumoLogic/sumologic-otel-lambda/releases/tag/" + }, + { + "pattern": "^https://github\\.com/SumoLogic/sumologic-otel-lambda/blob/release-" } ] } From b372ae47671c7c626d43330564ce53d6977f1950 Mon Sep 17 00:00:00 2001 From: Shubham Gupta Date: Mon, 21 Sep 2026 19:45:44 +0530 Subject: [PATCH 4/4] ci: dispatch release branch creation --- .github/workflows/release-finalize.yml | 4 +++- .github/workflows/release-tag.yml | 13 ++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-finalize.yml b/.github/workflows/release-finalize.yml index 50b0d70..a582465 100644 --- a/.github/workflows/release-finalize.yml +++ b/.github/workflows/release-finalize.yml @@ -76,5 +76,7 @@ jobs: RELEASE_BRANCH: ${{ steps.parse.outputs.release_branch }} run: | git add "${LANGUAGE}/README.md" - git commit -m "docs: update ${LANGUAGE} README for ${TAG}" + if ! git diff --cached --quiet; then + git commit -m "docs: update ${LANGUAGE} README for ${TAG}" + fi git push origin "${RELEASE_BRANCH}" diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index ffbe968..24929b6 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -102,10 +102,9 @@ jobs: git tag -m "${TAG}" "${TAG}" git push --atomic origin main "${TAG}" -# - name: Dispatch release build -# if: steps.state.outputs.tag_exists != 'true' -# env: -# GH_TOKEN: ${{ github.token }} -# LANGUAGE: ${{ steps.parse.outputs.language }} -# TAG: ${{ steps.parse.outputs.tag }} -# run: gh workflow run "release-build-${LANGUAGE}.yml" --ref "${TAG}" + - name: Dispatch release finalize + if: steps.state.outputs.tag_exists != 'true' + env: + GH_TOKEN: ${{ github.token }} + TAG: ${{ steps.parse.outputs.tag }} + run: gh workflow run "release-finalize.yml" --ref "${TAG}" -f tag="${TAG}"