Skip to content

Commit ed6ed7a

Browse files
lauritlaurit
committed
merge
2 parents e482dd5 + 4be9801 commit ed6ed7a

File tree

629 files changed

+20646
-2587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

629 files changed

+20646
-2587
lines changed

‎.fossa.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,12 @@ targets:
346346
- type: gradle
347347
path: ./
348348
target: ':instrumentation:aws-lambda:aws-lambda-events-2.2:library'
349+
- type: gradle
350+
path: ./
351+
target: ':instrumentation:aws-lambda:aws-lambda-events-3.11:library'
352+
- type: gradle
353+
path: ./
354+
target: ':instrumentation:aws-lambda:aws-lambda-events-common-2.2:library'
349355
- type: gradle
350356
path: ./
351357
target: ':instrumentation:aws-sdk:aws-sdk-1.11:javaagent'

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,10 @@ body:
4848
attributes:
4949
label: Additional context
5050
description: Add any other context about the problem here.
51+
- type: dropdown
52+
attributes:
53+
label: Tip
54+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
55+
options:
56+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
57+
default: 0

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,10 @@ body:
2222
attributes:
2323
label: Additional context
2424
description: Add any other context or screenshots about the feature request here.
25+
- type: dropdown
26+
attributes:
27+
label: Tip
28+
description: This element is static, used to render a helpful sub-heading for end-users and community members to help prioritize issues. Please leave as is.
29+
options:
30+
- <sub>[React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
31+
default: 0

‎.github/renovate.json5‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,16 @@
143143
],
144144
enabled: false,
145145
},
146+
{
147+
// wiremock 3+ requires Java 11+
148+
matchUpdateTypes: [
149+
'major',
150+
],
151+
enabled: false,
152+
matchPackageNames: [
153+
'com.github.tomakehurst:wiremock-jre8'
154+
],
155+
},
146156
{
147157
// intentionally using Spring Boot 2 in this smoke tests
148158
// new versions of Spring Boot 3 are tested with

‎.github/workflows/auto-license-report.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616
check:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020

2121
- name: Free disk space
2222
run: .github/scripts/gha-free-disk-space.sh
2323

2424
- name: Set up JDK for running Gradle
25-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
25+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2626
with:
2727
distribution: temurin
2828
java-version-file: .java-version
2929

3030
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
31+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
3232
with:
3333
cache-read-only: true
3434

@@ -43,7 +43,7 @@ jobs:
4343
- id: create-patch
4444
name: Create patch file
4545
run: |
46-
git add -N licenses
46+
git add -N --ignore-removal licenses
4747
git diff > patch
4848
if [ -s patch ]; then
4949
echo "exists=true" >> "$GITHUB_OUTPUT"

‎.github/workflows/auto-spotless.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616
check:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020

2121
- name: Free disk space
2222
run: .github/scripts/gha-free-disk-space.sh
2323

2424
- name: Set up JDK for running Gradle
25-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
25+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2626
with:
2727
distribution: temurin
2828
java-version-file: .java-version
2929

3030
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
31+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
3232
with:
3333
cache-read-only: true
3434

‎.github/workflows/auto-update-otel-sdk.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
latest-version: ${{ steps.check-versions.outputs.latest-version }}
1818
already-opened: ${{ steps.check-versions.outputs.already-opened }}
1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121

2222
- id: check-versions
2323
name: Check versions
@@ -55,7 +55,7 @@ jobs:
5555
needs:
5656
- check-versions
5757
steps:
58-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
58+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5959

6060
- name: Update version
6161
env:
@@ -66,13 +66,13 @@ jobs:
6666
run: .github/scripts/gha-free-disk-space.sh
6767

6868
- name: Set up JDK for running Gradle
69-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
69+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
7070
with:
7171
distribution: temurin
7272
java-version-file: .java-version
7373

7474
- name: Setup Gradle
75-
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
75+
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
7676

7777
- name: Update license report
7878
run: ./gradlew generateLicenseReport
@@ -84,7 +84,7 @@ jobs:
8484
- name: Use CLA approved bot
8585
run: .github/scripts/use-cla-approved-bot.sh
8686

87-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
87+
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
8888
id: otelbot-token
8989
with:
9090
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/auto-update-pull-request.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
steps:
2020
- name: Download patch
21-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
21+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
2222
with:
2323
run-id: ${{ github.event.workflow_run.id }}
2424
path: ${{ runner.temp }}
@@ -33,14 +33,14 @@ jobs:
3333
echo "exists=true" >> $GITHUB_OUTPUT
3434
fi
3535
36-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
36+
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
3737
if: steps.unzip-patch.outputs.exists == 'true'
3838
id: otelbot-token
3939
with:
4040
app-id: 1295839
4141
private-key: ${{ secrets.OTELBOT_JAVA_INSTRUMENTATION_PRIVATE_KEY }}
4242

43-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
if: steps.unzip-patch.outputs.exists == 'true'
4545
with:
4646
repository: "${{ github.event.workflow_run.head_repository.full_name }}"

‎.github/workflows/backport.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
exit 1
2222
fi
2323
24-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525
with:
2626
# history is needed to run git cherry-pick below
2727
fetch-depth: 0
2828

2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
32+
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

0 commit comments

Comments
 (0)