Skip to content
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7d0bf85
modify lambda workflow to update SDK draft release
ezhang6811 Aug 19, 2025
5ddc95f
remove previous logic uploading most recent lambda layer to new relea…
ezhang6811 Aug 19, 2025
126fe08
create release notes skeleton for SDK release
ezhang6811 Aug 19, 2025
a197685
Merge remote-tracking branch 'origin/main' into zhaez/merge-releases
ezhang6811 Aug 25, 2025
f15db8b
migrate Lambda release workflow to SDK release
ezhang6811 Aug 25, 2025
6445cff
remove release environment from downstream job
ezhang6811 Aug 25, 2025
a1e4abb
Merge branch 'main' into zhaez/merge-releases
ezhang6811 Sep 5, 2025
6763f4f
Merge branch 'main' into zhaez/merge-releases
ezhang6811 Sep 8, 2025
d51c05f
Merge branch 'main' into zhaez/merge-releases
ezhang6811 Sep 8, 2025
d6c4098
Fix regions and add clarity in Lambda Layer release workflow
jj22ee Sep 8, 2025
b53c29e
Merge branch 'main' into zhaez/merge-releases
ezhang6811 Sep 8, 2025
c0443a8
Merge branch 'main' into zhaez/merge-releases
ezhang6811 Sep 9, 2025
4316e25
refactor releases to build all first
ezhang6811 Sep 11, 2025
31f65ac
Merge branch 'main' into zhaez/merge-releases
ezhang6811 Sep 11, 2025
6e91291
delete lambda workflow
ezhang6811 Sep 11, 2025
e92123b
log in to ECR before building release
ezhang6811 Sep 11, 2025
146dee4
rebuild artifact in publish job
ezhang6811 Sep 11, 2025
3d7bec8
Merge branch 'main' into zhaez/merge-releases
ezhang6811 Sep 29, 2025
4b67baf
bump wrapper validation job sha
ezhang6811 Sep 29, 2025
211ae0b
add CHANGELOG and enhance release notes
ezhang6811 Oct 7, 2025
8f791ab
mock changelog and modify workflow to test draft release
ezhang6811 Oct 7, 2025
ece9622
remove main build check
ezhang6811 Oct 7, 2025
f90435f
Revert "mock changelog and modify workflow to test draft release"
ezhang6811 Oct 7, 2025
07f1157
Revert "remove main build check"
ezhang6811 Oct 7, 2025
ac1686d
Merge branch 'main' into zhaez/update-release-notes
ezhang6811 Oct 23, 2025
db2a8b8
use environment variables for workflow inputs
ezhang6811 Oct 23, 2025
3da38df
Merge branch 'main' into zhaez/update-release-notes
ezhang6811 Oct 23, 2025
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
51 changes: 39 additions & 12 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,10 @@ jobs:
steps:
- name: Set up regions matrix
id: set-matrix
env:
AWS_REGIONS: ${{ github.event.inputs.aws_region }}
run: |
IFS=',' read -ra REGIONS <<< "${{ github.event.inputs.aws_region }}"
IFS=',' read -ra REGIONS <<< "$AWS_REGIONS"
MATRIX="["
for region in "${REGIONS[@]}"; do
trimmed_region=$(echo "$region" | xargs)
Expand Down Expand Up @@ -198,8 +200,10 @@ jobs:
load: true

- name: Test docker image
env:
VERSION: ${{ github.event.inputs.version }}
shell: bash
run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
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
Expand Down Expand Up @@ -398,34 +402,57 @@ jobs:
name: layer.zip

- name: Rename artifacts
env:
VERSION: ${{ github.event.inputs.version }}
run: |
cp "aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" ${{ env.ARTIFACT_NAME }}
cp "aws-opentelemetry-agent-$VERSION.jar" ${{ env.ARTIFACT_NAME }}
cp aws-opentelemetry-java-layer.zip layer.zip

# Publish to GitHub releases
- name: Create GH release
id: create_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${{ github.event.inputs.version }}
run: |
# Extract versions from dependency files
OTEL_INSTRUMENTATION_VERSION=$(grep "val otelVersion" dependencyManagement/build.gradle.kts | sed 's/.*= "\([^"]*\)".*/\1/')
OTEL_CONTRIB_VERSION=$(grep "io.opentelemetry.contrib:opentelemetry-aws-xray" dependencyManagement/build.gradle.kts | sed 's/.*:\([^"]*\)".*/\1/')

# Extract CHANGELOG entries for this version
CHANGELOG_ENTRIES=$(python3 -c "
import re, os
version = os.environ['VERSION']
with open('CHANGELOG.md', 'r') as f:
content = f.read()
version_pattern = rf'## v{re.escape(version)}.*?\n(.*?)(?=\n## |\Z)'
version_match = re.search(version_pattern, content, re.DOTALL)
if version_match:
entries = version_match.group(1).strip()
if entries:
print(entries)
")

# Create release notes
cat > release_notes.md << EOF
This release contains updates of the following upstream components:
$(if [ -n "$CHANGELOG_ENTRIES" ]; then echo "## What's Changed"; echo "$CHANGELOG_ENTRIES"; echo ""; fi)

OpenTelemetry Java Contrib - $OTEL_CONTRIB_VERSION
Opentelemetry Instrumentation for Java - $OTEL_INSTRUMENTATION_VERSION
## Upstream Components

This release also publishes to public ECR and Maven Central.
* See ADOT Java auto-instrumentation Docker image v${{ github.event.inputs.version }} in our public ECR repository:
- \`OpenTelemetry Java Contrib\` - $OTEL_CONTRIB_VERSION
- \`Opentelemetry Instrumentation for Java\` - $OTEL_INSTRUMENTATION_VERSION

## Release Artifacts

This release publishes to public ECR and Maven Central.
* See ADOT Java auto-instrumentation Docker image v$VERSION in our public ECR repository:
https://gallery.ecr.aws/aws-observability/adot-autoinstrumentation-java
* See version ${{ github.event.inputs.version }} in our Maven Central repository:
* See version $VERSION in our Maven Central repository:
https://central.sonatype.com/artifact/software.amazon.opentelemetry/aws-opentelemetry-agent

This release also includes the AWS OpenTelemetry Lambda Layer for Java version ${{ github.event.inputs.version }}-$(echo $GITHUB_SHA | cut -c1-7).
## Lambda Layer

This release includes the AWS OpenTelemetry Lambda Layer for Java version $VERSION-$(echo $GITHUB_SHA | cut -c1-7).

Lambda Layer ARNs:
${{ needs.generate-lambda-release-note.outputs.layer-note }}
Expand All @@ -435,10 +462,10 @@ jobs:
shasum -a 256 layer.zip > layer.zip.sha256

gh release create --target "$GITHUB_REF_NAME" \
--title "Release v${{ github.event.inputs.version }}" \
--title "Release v$VERSION" \
--notes-file release_notes.md \
--draft \
"v${{ github.event.inputs.version }}" \
"v$VERSION" \
${{ env.ARTIFACT_NAME }} \
${{ env.ARTIFACT_NAME }}.sha256 \
layer.zip \
Expand Down
Loading