Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/application-signals-e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/daily-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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'

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions version.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
val adotVersion = "2.20.0-SNAPSHOT"

allprojects {
version = if (project.hasProperty("release.version")) {
project.property("release.version") as String
} else {
adotVersion
if (!project.hasProperty("release.version")) {
version = adotVersion
}
}
Loading