Skip to content

Commit d63472e

Browse files
jj22eejj22ee
authored
Merge branch 'main' into xray-header-from-context-support-latest-adot
2 parents 3231900 + 727418d commit d63472e

13 files changed

+106
-16
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
5151
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
5252

53-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
53+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
5454

5555
- name: Manually build to avoid autobuild failures
5656
uses: gradle/gradle-build-action@v3

‎.github/workflows/docker-build-corretto-slim.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v5
23-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
23+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
2424
- name: Configure AWS Credentials
2525
uses: aws-actions/configure-aws-credentials@v4
2626
with:

‎.github/workflows/docker-build-smoke-tests-fake-backend.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
4040
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
41-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
41+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
4242
- name: Configure AWS Credentials
4343
uses: aws-actions/configure-aws-credentials@v4
4444
with:

‎.github/workflows/e2e-tests-app-with-java-agent.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
5252

5353
- name: Validate the checksums of Gradle Wrapper
54-
uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
54+
uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
5555

5656
- name: Configure AWS Credentials
5757
uses: aws-actions/configure-aws-credentials@v4

‎.github/workflows/main-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
path: ~/.pnpm-store
4141
key: ${{ runner.os }}-test-cache-pnpm-modules
42-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
42+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
4343
- uses: ./.github/actions/patch-dependencies
4444
with:
4545
run_tests: "true"
@@ -76,7 +76,7 @@ jobs:
7676
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
7777
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
7878

79-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
79+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
8080

8181
- name: Configure AWS Credentials
8282
uses: aws-actions/configure-aws-credentials@v4
@@ -196,7 +196,7 @@ jobs:
196196
with:
197197
java-version: 23
198198
distribution: 'temurin'
199-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
199+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
200200

201201
- name: Configure AWS Credentials
202202
uses: aws-actions/configure-aws-credentials@v4

‎.github/workflows/nightly-upstream-snapshot-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
4747
gpg_password: ${{ secrets.GPG_PASSPHRASE }}
4848

49-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
49+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
5050

5151
- name: Configure AWS Credentials
5252
uses: aws-actions/configure-aws-credentials@v4
@@ -136,7 +136,7 @@ jobs:
136136
with:
137137
java-version: 23
138138
distribution: 'temurin'
139-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
139+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
140140

141141
- name: Configure AWS Credentials
142142
uses: aws-actions/configure-aws-credentials@v4

‎.github/workflows/post-release-version-bump.yml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
version:
77
description: 'Version number (e.g., 1.0.1)'
88
required: true
9+
is_patch:
10+
description: 'Is this a patch? (true or false)'
11+
required: true
12+
default: 'false'
913

1014
env:
1115
AWS_DEFAULT_REGION: us-east-1
@@ -100,8 +104,20 @@ jobs:
100104
sed -i'' -e "s/val adotVersion = \".*\"/val adotVersion = \"${DEV_VERSION}\"/" version.gradle.kts
101105
VERSION="${{ github.event.inputs.version }}"
102106
sed -i'' -e 's/adot-autoinstrumentation-java:v2.*"/adot-autoinstrumentation-java:v'$VERSION'"/' .github/workflows/daily-scan.yml
107+
108+
# for patch releases, avoid merge conflict by manually resolving CHANGELOG with main
109+
if [[ "${{ github.event.inputs.is_patch }}" == "true" ]]; then
110+
# Copy the patch release entries
111+
sed -n "/^## v${VERSION}/,/^## v[0-9]/p" CHANGELOG.md | sed '$d' > /tmp/patch_release_section.txt
112+
git fetch origin main
113+
git show origin/main:CHANGELOG.md > CHANGELOG.md
114+
# Insert the patch release entries after Unreleased
115+
awk -i inplace '/^## v[0-9]/ && !inserted { system("cat /tmp/patch_release_section.txt"); inserted=1 } {print}' CHANGELOG.md
116+
fi
117+
103118
git add version.gradle.kts
104119
git add .github/workflows/daily-scan.yml
120+
git add CHANGELOG.md
105121
git commit -m "Prepare main for next development cycle: Update version to $DEV_VERSION"
106122
git push --set-upstream origin "prepare-main-for-next-dev-cycle-${VERSION}"
107123
@@ -117,4 +133,14 @@ jobs:
117133
118134
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice." \
119135
--head prepare-main-for-next-dev-cycle-${VERSION} \
120-
--base main
136+
--base main
137+
138+
- name: Force our CHANGELOG to override merge conflicts
139+
run: |
140+
git merge origin/main || true
141+
git checkout --ours CHANGELOG.md
142+
git add CHANGELOG.md
143+
if ! git diff --quiet --cached; then
144+
git commit -m "Force our CHANGELOG to override merge conflicts"
145+
git push origin "prepare-main-for-next-dev-cycle-${VERSION}"
146+
fi

‎.github/workflows/pr-build.yml‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,55 @@
11
name: PR Build
22
on:
33
pull_request:
4+
types:
5+
- opened
6+
- reopened
7+
- synchronize
8+
- labeled
9+
- unlabeled
410
branches:
511
- main
612
- "release/v*"
713
env:
814
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test-v2
915

1016
jobs:
17+
changelog-check:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
fetch-depth: 0
23+
24+
- name: Check CHANGELOG
25+
run: |
26+
# Check if PR is from workflows bot or dependabot
27+
if [[ "${{ github.event.pull_request.user.login }}" == "aws-application-signals-bot" ]]; then
28+
echo "Skipping check: PR from aws-application-signals-bot"
29+
exit 0
30+
fi
31+
32+
if [[ "${{ github.event.pull_request.user.login }}" == "dependabot[bot]" ]]; then
33+
echo "Skipping check: PR from dependabot"
34+
exit 0
35+
fi
36+
37+
# Check for skip changelog label
38+
if echo '${{ toJSON(github.event.pull_request.labels.*.name) }}' | jq -r '.[]' | grep -q "skip changelog"; then
39+
echo "Skipping check: skip changelog label found"
40+
exit 0
41+
fi
42+
43+
# Fetch base branch and check for CHANGELOG modifications
44+
git fetch origin ${{ github.base_ref }}
45+
if git diff --name-only origin/${{ github.base_ref }}..HEAD | grep -q "CHANGELOG.md"; then
46+
echo "CHANGELOG.md entry found - check passed"
47+
exit 0
48+
fi
49+
50+
echo "It looks like you didn't add an entry to CHANGELOG.md. If this change affects the SDK behavior, please update CHANGELOG.md and link this PR in your entry. If this PR does not need a CHANGELOG entry, you can add the 'Skip Changelog' label to this PR."
51+
exit 1
52+
1153
testpatch:
1254
name: Test patches applied to dependencies
1355
runs-on: aws-otel-java-instrumentation_ubuntu-latest_32-core
@@ -31,7 +73,7 @@ jobs:
3173
path: ~/.pnpm-store
3274
key: ${{ runner.os }}-test-cache-pnpm-modules
3375

34-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
76+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
3577

3678
- uses: ./.github/actions/patch-dependencies
3779
with:
@@ -61,7 +103,7 @@ jobs:
61103
java-version-file: .java-version
62104
distribution: temurin
63105

64-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
106+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
65107

66108
# Cleanup directories before proceeding with setup
67109
- name: Clean up old installations

‎.github/workflows/pre-release-prepare.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@ jobs:
9494
git commit -am "Update version to ${VERSION}"
9595
git push origin "v${VERSION}_release"
9696
97+
- name: Update CHANGELOG for release
98+
if: github.event.inputs.is_patch != 'true'
99+
run: |
100+
sed -i "s/## Unreleased/## Unreleased\n\n## v${VERSION} - $(date +%Y-%m-%d)/" CHANGELOG.md
101+
git add CHANGELOG.md
102+
git commit -m "Update CHANGELOG for version ${VERSION}"
103+
git push origin "v${VERSION}_release"
104+
97105
- name: Create pull request against the release branch
98106
env:
99107
GITHUB_TOKEN: ${{ env.BOT_TOKEN_GITHUB_RW_PATOKEN }}

‎.github/workflows/release-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
java-version-file: .java-version
4949
distribution: 'temurin'
50-
- uses: gradle/actions/wrapper-validation@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
50+
- uses: gradle/actions/wrapper-validation@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
5151

5252
- name: Publish patched dependencies to maven local
5353
uses: ./.github/actions/patch-dependencies

0 commit comments

Comments
 (0)