Skip to content

Commit a2534ba

Browse files
jack-bergjack-berg
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java-instrumentation into support-declarative-config
2 parents 2fffe26 + f6f1d28 commit a2534ba

File tree

425 files changed

+16116
-12804
lines changed

Some content is hidden

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

425 files changed

+16116
-12804
lines changed

‎.github/renovate.json5‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"config:base"
55
],
66
"ignorePaths": ["instrumentation/**"],
7-
"baseBranches": ["main", "release/v1.33.x"],
87
// needed in order to get patch-only updates in package rules below
98
// unfortunately you can't combine updateTypes and separateMinorPatch in the same package rule
109
// so we have to apply it globally here, see
@@ -34,13 +33,6 @@
3433
"ignoreUnstable": false,
3534
"allowedVersions": "!/\\-SNAPSHOT$/"
3635
},
37-
{
38-
// we are not going to update the semconv in 1.x branch
39-
"matchPackageNames": ["io.opentelemetry.semconv:opentelemetry-semconv"],
40-
"matchUpdateTypes": ["minor"],
41-
"matchBaseBranches": ["release/v1.33.x"],
42-
"enabled": false
43-
},
4436
{
4537
"matchPackagePrefixes": ["ch.qos.logback:"],
4638
"groupName": "logback packages"
@@ -77,6 +69,10 @@
7769
"matchPackagePrefixes": ["com.fasterxml.jackson"],
7870
"groupName": "jackson packages"
7971
},
72+
{
73+
"matchPackagePrefixes": ["com.gradleup.shadow"],
74+
"groupName": "gradle shadow packages"
75+
},
8076
{
8177
// prevent update to 2.4-groovy-4.0-SNAPSHOT
8278
"matchPackageNames": ["org.spockframework:spock-bom"],

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
latest-version: ${{ steps.check-versions.outputs.latest-version }}
1515
already-opened: ${{ steps.check-versions.outputs.already-opened }}
1616
steps:
17-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
17+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1818

1919
- id: check-versions
2020
name: Check versions
@@ -52,7 +52,7 @@ jobs:
5252
needs:
5353
- check-versions
5454
steps:
55-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
55+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
5656

5757
- name: Update version
5858
env:
@@ -66,7 +66,7 @@ jobs:
6666
run: .github/scripts/gha-free-disk-space.sh
6767

6868
- name: Set up JDK for running Gradle
69-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
69+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
7070
with:
7171
distribution: temurin
7272
java-version-file: .java-version

‎.github/workflows/backport.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
exit 1
2222
fi
2323
24-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
24+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2525
with:
2626
# history is needed to run git cherry-pick below
2727
fetch-depth: 0

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
spotless:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
29+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3030

3131
- name: Free disk space
3232
run: .github/scripts/gha-free-disk-space.sh
3333

3434
- name: Set up JDK for running Gradle
35-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
35+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
3636
with:
3737
distribution: temurin
3838
java-version-file: .java-version
@@ -52,20 +52,20 @@ jobs:
5252
gradle-wrapper-validation:
5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
55+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
5656

5757
- uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
5858

5959
license-check:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
62+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
6363

6464
- name: Free disk space
6565
run: .github/scripts/gha-free-disk-space.sh
6666

6767
- name: Set up JDK for running Gradle
68-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
68+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
6969
with:
7070
distribution: temurin
7171
java-version-file: .java-version
@@ -105,7 +105,7 @@ jobs:
105105
extra-dependency-management-enforcement:
106106
runs-on: ubuntu-latest
107107
steps:
108-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
108+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
109109

110110
- name: Dependency check
111111
run: |
@@ -128,13 +128,13 @@ jobs:
128128
build:
129129
runs-on: ubuntu-latest
130130
steps:
131-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
131+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
132132

133133
- name: Free disk space
134134
run: .github/scripts/gha-free-disk-space.sh
135135

136136
- name: Set up JDK for running Gradle
137-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
137+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
138138
with:
139139
distribution: temurin
140140
java-version-file: .java-version
@@ -198,7 +198,7 @@ jobs:
198198
- 11
199199
- 17
200200
- 21
201-
- 22
201+
- 23
202202
vm:
203203
- hotspot
204204
- openj9
@@ -209,32 +209,32 @@ jobs:
209209
- 3
210210
exclude:
211211
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
212-
- test-java-version: 22
212+
- test-java-version: 23
213213
vm: openj9
214214
fail-fast: false
215215
steps:
216-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
216+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
217217

218218
- name: Free disk space
219219
run: .github/scripts/gha-free-disk-space.sh
220220

221221
- id: setup-test-java
222222
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
223-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
223+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
224224
with:
225225
# using zulu because new releases get published quickly
226226
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
227227
java-version: ${{ matrix.test-java-version }}
228228

229229
- name: Set up JDK for running Gradle
230-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
230+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
231231
with:
232232
distribution: temurin
233233
java-version-file: .java-version
234234

235235
# vaadin 14 tests fail with node 18
236236
- name: Set up Node
237-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
237+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
238238
with:
239239
node-version: 16
240240

@@ -336,13 +336,13 @@ jobs:
336336
run: git config --system core.longpaths true
337337
if: matrix.os == 'windows-latest'
338338

339-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
339+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
340340

341341
- name: Free disk space
342342
run: .github/scripts/gha-free-disk-space.sh
343343

344344
- name: Set up JDK for running Gradle
345-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
345+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
346346
with:
347347
distribution: temurin
348348
java-version-file: .java-version
@@ -389,13 +389,13 @@ jobs:
389389
gradle-plugins:
390390
runs-on: ubuntu-latest
391391
steps:
392-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
392+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
393393

394394
- name: Free disk space
395395
run: .github/scripts/gha-free-disk-space.sh
396396

397397
- name: Set up JDK for running Gradle
398-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
398+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
399399
with:
400400
distribution: temurin
401401
java-version-file: .java-version
@@ -412,13 +412,13 @@ jobs:
412412
examples:
413413
runs-on: ubuntu-latest
414414
steps:
415-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
415+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
416416

417417
- name: Free disk space
418418
run: .github/scripts/gha-free-disk-space.sh
419419

420420
- name: Set up JDK for running Gradle
421-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
421+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
422422
with:
423423
distribution: temurin
424424
java-version-file: .java-version

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ jobs:
6161
# skipping release branches because the versions in those branches are not snapshots
6262
if: github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-instrumentation'
6363
steps:
64-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
64+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
6565

6666
- name: Free disk space
6767
run: .github/scripts/gha-free-disk-space.sh
6868

6969
- name: Set up JDK for running Gradle
70-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
70+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
7171
with:
7272
distribution: temurin
7373
java-version-file: .java-version

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
21+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2222

2323
- name: Free disk space
2424
run: .github/scripts/gha-free-disk-space.sh
2525

2626
- name: Set up Java 17
27-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
27+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
2828
with:
2929
distribution: temurin
3030
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
33+
uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
3434
with:
3535
languages: java
3636
# using "latest" helps to keep up with the latest Kotlin support
@@ -45,7 +45,7 @@ jobs:
4545
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
4646

4747
- name: Perform CodeQL analysis
48-
uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
48+
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
4949

5050
workflow-notification:
5151
needs:

‎.github/workflows/issue-management-feedback-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
github.event.comment.user.login == github.event.issue.user.login
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
14+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1515

1616
- name: Remove labels
1717
env:

‎.github/workflows/overhead-benchmark-daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
run-overhead-tests:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
12+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1313

14-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
14+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1515
with:
1616
ref: gh-pages
1717
path: gh-pages

‎.github/workflows/owasp-dependency-check-daily.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1717

1818
- name: Free disk space
1919
run: .github/scripts/gha-free-disk-space.sh
2020

2121
- name: Set up JDK for running Gradle
22-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
22+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
2323
with:
2424
distribution: temurin
2525
java-version-file: .java-version

‎.github/workflows/pr-smoke-test-early-jdk8-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
build:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
16+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1717

1818
- name: Free disk space
1919
run: .github/scripts/gha-free-disk-space.sh
2020

2121
- name: Set up JDK for running Gradle
22-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
22+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
2323
with:
2424
distribution: temurin
2525
java-version-file: .java-version

0 commit comments

Comments
 (0)