Skip to content

Commit 589cbb2

Browse files
Merge branch 'main' into dependabot/gradle/io.netty-netty-codec-http-4.2.5.Final
2 parents ef1cd63 + a65647f commit 589cbb2

2,812 files changed

Lines changed: 213609 additions & 22835 deletions

File tree

Some content is hidden

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

.git-blame-ignore-revs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,21 @@ de95c481329aa8b821e6e71ac35c1b8bc67e3e86
99
78c44064f4ec15091bde7a2dc590aa2b3a99341d
1010
03665b75a1e1c3a3cf28df1dec52e91b308e4368
1111
7e25c796da25ae080a952936de535a1228fed448
12+
a0945d605699e8e7aca9448767ba1286b7ebb2c1
13+
7ceb871552e5d9cb0379fbba014690aa067061eb
14+
af9205fa592e4ae32ceca951c560a48b512b7744
15+
6154ba1d1461d9279a305b52d8dd4b842e848545
16+
0b5dd8bee320456962d94cb845e9d27469a34091
17+
f58dd73747791edcd45722a4903da44da1b9b2d3
18+
fcdaa3d6735d2382a44d066a6ce051a2c5e6469f
19+
9bbe16b7d1600fc96100f54cb25869cbdf425521
20+
3addaca346bcdfd555fca0340e40c7e5518c5185
21+
165a4da6a015267909adf7e7d5f3edc16a56dda6
22+
c4e2bf407aa0b7a3d34605134791013ba8a2d376
23+
9232c8f806b5eebeff35c09b1616b6598f3f5e73
24+
062fb57831db2e3e25afc1bd63cf8b09d46ffa67
25+
13fa17ad575aadf0ef823d63d86fbbdd4a37cd9b
26+
f00f4fe6ed5e22cdd2e3f68370c2da96e6bbc8e7
27+
899ed51a7b6607161fcda5c1000115a076cc4fe7
28+
53b9d9cc4fc4091b89f84effb6e526371d3bae68
29+
4822581aeff072b7649c7aec56a13a95bd58c249

.github/workflows/benchmark.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414

1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1818

19-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
19+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
2020

2121
- name: Setup Java
22-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
22+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
2323
with:
2424
distribution: 'temurin'
2525
java-version: '17'

.github/workflows/ci.yml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
# Get GitHub token via the CT SDKs App
2525
- name: Generate GitHub token (via CT SDKs App)
2626
id: generate_github_token
27-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
27+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
2828
with:
2929
app-id: ${{ secrets.CT_SDKS_APP_ID }}
3030
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -38,16 +38,16 @@ jobs:
3838
echo "email=${GH_APP_USER}+ct-sdks[bot]@users.noreply.github.com" >> "$GITHUB_OUTPUT"
3939
4040
- name: Checkout
41-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
41+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4242
with:
4343
# Pass a personal access token (using our CT SDKs App) to be able to trigger other workflows
4444
# https://help.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
4545
# https://github.community/t/action-does-not-trigger-another-on-push-tag-action/17148/8
4646
token: ${{ steps.generate_github_token.outputs.token }}
47-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
47+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
4848

4949
- name: Setup Java
50-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
50+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
5151
with:
5252
distribution: 'temurin'
5353
java-version: '17'
@@ -141,6 +141,20 @@ jobs:
141141
CTP_CLIENT_SECRET: ${{ secrets.CTP_CLIENT_SECRET }}
142142
CTP_PROJECT_KEY: ${{ secrets.CTP_PROJECT_KEY }}
143143

144+
- name: Setup Java 21 for Spring examples
145+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
146+
with:
147+
distribution: 'temurin'
148+
java-version: '21'
149+
- name: Test Spring examples
150+
run: |
151+
cd examples/spring && ./gradlew test
152+
cd ../spring-datadog && ./gradlew test
153+
cd ../spring-datadog-statsd && ./gradlew test
154+
cd ../spring-dynatrace-oneagent && ./gradlew test
155+
cd ../spring-newrelic && ./gradlew test
156+
cd ../spring-otel && ./gradlew test
157+
144158
- name: Collect code coverage
145159
run: ./gradlew codeCoverageReport
146160

@@ -157,20 +171,20 @@ jobs:
157171
# Get GitHub token via the CT SDKs App
158172
- name: Generate GitHub token (via CT SDKs App)
159173
id: generate_github_token
160-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
174+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
161175
with:
162176
app-id: ${{ secrets.CT_SDKS_APP_ID }}
163177
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
164178

165179
- name: Checkout
166-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
180+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
167181
with:
168182
token: ${{ steps.generate_github_token.outputs.token }}
169183

170-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
184+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
171185

172186
- name: Setup Java
173-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
187+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
174188
with:
175189
distribution: 'temurin'
176190
java-version: '17'
@@ -187,14 +201,14 @@ jobs:
187201
# Get GitHub token via the CT SDKs App
188202
- name: Generate GitHub token (via CT SDKs App)
189203
id: generate_github_token
190-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
204+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
191205
with:
192206
app-id: ${{ secrets.CT_SDKS_APP_ID }}
193207
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
194208
- name: Checkout sources
195-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
209+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
196210
- name: Generate and submit dependency graph
197211
if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' && github.ref == 'refs/heads/main'
198-
uses: gradle/actions/dependency-submission@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
212+
uses: gradle/actions/dependency-submission@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
199213
with:
200214
github-token: ${{ steps.generate_github_token.outputs.token }}

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ jobs:
4848

4949
steps:
5050
- name: Checkout repository
51-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
51+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
5252

53-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
53+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
5454

5555
# Initializes the CodeQL tools for scanning.
5656
- name: Initialize CodeQL

.github/workflows/create-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# Get GitHub token via the CT SDKs App
1919
- name: Generate GitHub token (via CT SDKs App)
2020
id: generate_github_token
21-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
21+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
2222
with:
2323
app-id: ${{ secrets.CT_SDKS_APP_ID }}
2424
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -32,11 +32,11 @@ jobs:
3232
echo "email=${GH_APP_USER}+ct-sdks[bot]@users.noreply.github.com" >> "$GITHUB_OUTPUT"
3333
3434
- name: Checkout
35-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
35+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3636
with:
3737
token: ${{ steps.generate_github_token.outputs.token }}
3838

39-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
39+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
4040

4141
- uses: jenschude/auto-create-pr-action@a5369414c74963e6ec065dab49066d3711b8c1db # v0.3.2
4242
if: github.ref_name == 'gen-sdk-updates'

.github/workflows/docs.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# Get GitHub token via the CT SDKs App
2323
- name: Generate GitHub token (via CT SDKs App)
2424
id: generate_github_token
25-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
25+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
2626
with:
2727
app-id: ${{ secrets.CT_SDKS_APP_ID }}
2828
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -36,25 +36,25 @@ jobs:
3636
echo "email=${GH_APP_USER}+ct-sdks[bot]@users.noreply.github.com" >> "$GITHUB_OUTPUT"
3737
3838
- name: Checkout
39-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4040
with:
4141
path: sdk
4242
token: ${{ steps.generate_github_token.outputs.token }}
4343

4444
- name: Checkout
45-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
45+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
4646
with:
4747
path: doc
4848
ref: gh-pages
4949
token: ${{ steps.generate_github_token.outputs.token }}
5050

5151
- name: Setup Java
52-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
52+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
5353
with:
5454
distribution: 'temurin'
5555
java-version: '17'
5656

57-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
57+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
5858

5959
- name: Setup Graphviz
6060
uses: ts-graphviz/setup-graphviz@b1de5da23ed0a6d14e0aeee8ed52fdd87af2363c # v2.0.2

.github/workflows/release-snapshot.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ jobs:
1616
# Get GitHub token via the CT SDKs App
1717
- name: Generate GitHub token (via CT SDKs App)
1818
id: generate_github_token
19-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
19+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
2020
with:
2121
app-id: ${{ secrets.CT_SDKS_APP_ID }}
2222
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
2323

2424
- name: Checkout
25-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2626
with:
2727
token: ${{ steps.generate_github_token.outputs.token }}
2828

29-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
29+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
3030

3131
- name: Setup Java
32-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
32+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
3333
with:
3434
distribution: 'temurin'
3535
java-version: '17'

.github/workflows/release.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
if: startsWith( github.ref, 'refs/tags/')
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
20+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2121

22-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
22+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
2323

2424
- name: Setup Java
25-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
25+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
2626
with:
2727
distribution: 'temurin'
2828
java-version: '17'
@@ -56,7 +56,7 @@ jobs:
5656
# Get GitHub token via the CT SDKs App
5757
- name: Generate GitHub token (via CT SDKs App)
5858
id: generate_github_token
59-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
59+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
6060
with:
6161
app-id: ${{ secrets.CT_SDKS_APP_ID }}
6262
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -70,12 +70,12 @@ jobs:
7070
echo "email=${GH_APP_USER}+ct-sdks[bot]@users.noreply.github.com" >> "$GITHUB_OUTPUT"
7171
7272
- name: Checkout
73-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
73+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
7474
with:
7575
ref: main
7676
token: ${{ steps.generate_github_token.outputs.token }}
7777

78-
- uses: gradle/actions/wrapper-validation@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
78+
- uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
7979

8080
- run: ./gradlew -Pversion=$REF_NAME writeVersionToExamples writeVersionToReadme setVersion nextMinorVersion snapshotVersion
8181
env:
@@ -118,7 +118,7 @@ jobs:
118118
# Get GitHub token via the CT SDKs App
119119
- name: Generate GitHub token (via CT SDKs App)
120120
id: generate_github_token
121-
uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2
121+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
122122
with:
123123
app-id: ${{ secrets.CT_SDKS_APP_ID }}
124124
private-key: ${{ secrets.CT_SDKS_APP_PEM }}
@@ -132,20 +132,20 @@ jobs:
132132
echo "email=${GH_APP_USER}+ct-sdks[bot]@users.noreply.github.com" >> "$GITHUB_OUTPUT"
133133
134134
- name: Checkout
135-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
135+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
136136
with:
137137
path: sdk
138138
token: ${{ steps.generate_github_token.outputs.token }}
139139

140140
- name: Checkout
141-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
141+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
142142
with:
143143
path: doc
144144
ref: gh-pages
145145
token: ${{ steps.generate_github_token.outputs.token }}
146146

147147
- name: Setup Java
148-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
148+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
149149
with:
150150
distribution: 'temurin'
151151
java-version: '17'

.github/workflows/semgrep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout
32-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
32+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:
3434
persist-credentials: false
3535

0 commit comments

Comments
 (0)