Skip to content

Commit 5da5b5b

Browse files
Abhishekkr3003Abhishekkr3003
committed
Merge branch 'main' into aerospike-client-instrumentation
2 parents 7c17dfc + 6c2a4a9 commit 5da5b5b

File tree

1,145 files changed

+11778
-15041
lines changed

Some content is hidden

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

1,145 files changed

+11778
-15041
lines changed

‎.github/repository-settings.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ for [`dependabot/**/**`](https://github.com/open-telemetry/community/blob/main/d
6969
see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
7070
- `GRADLE_PUBLISH_KEY`
7171
- `GRADLE_PUBLISH_SECRET`
72+
- `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
7273
- `OPENTELEMETRYBOT_GITHUB_TOKEN` - owned by [@trask](https://github.com/trask)
7374
- `SONATYPE_KEY` - owned by [@trask](https://github.com/trask)
7475
- `SONATYPE_USER` - owned by [@trask](https://github.com/trask)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
run: .github/scripts/gha-free-disk-space.sh
6565

6666
- name: Set up JDK for running Gradle
67-
uses: actions/setup-java@v3
67+
uses: actions/setup-java@v4
6868
with:
6969
distribution: temurin
7070
java-version: 17.0.6

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: .github/scripts/gha-free-disk-space.sh
3434

3535
- name: Set up JDK for running Gradle
36-
uses: actions/setup-java@v3
36+
uses: actions/setup-java@v4
3737
with:
3838
distribution: temurin
3939
java-version: 17.0.6
@@ -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@v3
69+
uses: actions/setup-java@v4
7070
with:
7171
distribution: temurin
7272
java-version: 17.0.6
@@ -136,7 +136,7 @@ jobs:
136136
run: .github/scripts/gha-free-disk-space.sh
137137

138138
- name: Set up JDK for running Gradle
139-
uses: actions/setup-java@v3
139+
uses: actions/setup-java@v4
140140
with:
141141
distribution: temurin
142142
java-version: 17.0.6
@@ -173,7 +173,7 @@ jobs:
173173
fi
174174
175175
- name: Upload agent jar
176-
uses: actions/upload-artifact@v3
176+
uses: actions/upload-artifact@v4
177177
with:
178178
path: javaagent/build/libs/opentelemetry-javaagent-*-SNAPSHOT.jar
179179

@@ -208,14 +208,14 @@ jobs:
208208

209209
- id: setup-test-java
210210
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
211-
uses: actions/setup-java@v3
211+
uses: actions/setup-java@v4
212212
with:
213213
# using zulu because new releases get published quickly
214214
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
215215
java-version: ${{ matrix.test-java-version }}
216216

217217
- name: Set up JDK for running Gradle
218-
uses: actions/setup-java@v3
218+
uses: actions/setup-java@v4
219219
with:
220220
distribution: temurin
221221
java-version: 17.0.6
@@ -278,15 +278,15 @@ jobs:
278278

279279
- name: Upload deadlock detector artifacts if any
280280
if: failure()
281-
uses: actions/upload-artifact@v3
281+
uses: actions/upload-artifact@v4
282282
with:
283283
name: deadlock-detector-test-${{ matrix.test-java-version }}-${{ matrix.vm }}-${{ matrix.test-partition }}
284284
path: /tmp/deadlock-detector-*
285285
if-no-files-found: ignore
286286

287287
- name: Upload jvm crash dump files if any
288288
if: failure()
289-
uses: actions/upload-artifact@v3
289+
uses: actions/upload-artifact@v4
290290
with:
291291
name: javacore-test-${{ matrix.test-java-version }}-${{ matrix.test-partition }}
292292
path: |
@@ -329,7 +329,7 @@ jobs:
329329
run: .github/scripts/gha-free-disk-space.sh
330330

331331
- name: Set up JDK for running Gradle
332-
uses: actions/setup-java@v3
332+
uses: actions/setup-java@v4
333333
with:
334334
distribution: temurin
335335
java-version: 17.0.6
@@ -359,7 +359,7 @@ jobs:
359359

360360
- name: Upload jvm crash dump files if any
361361
if: failure()
362-
uses: actions/upload-artifact@v3
362+
uses: actions/upload-artifact@v4
363363
with:
364364
name: javacore-smoke-test-${{ matrix.smoke-test-suite }}-${{ matrix.os }}
365365
# we expect crash dumps either in root director or in smoke-tests
@@ -386,7 +386,7 @@ jobs:
386386
run: .github/scripts/gha-free-disk-space.sh
387387

388388
- name: Set up JDK for running Gradle
389-
uses: actions/setup-java@v3
389+
uses: actions/setup-java@v4
390390
with:
391391
distribution: temurin
392392
java-version: 17.0.6
@@ -407,7 +407,7 @@ jobs:
407407
run: .github/scripts/gha-free-disk-space.sh
408408

409409
- name: Set up JDK for running Gradle
410-
uses: actions/setup-java@v3
410+
uses: actions/setup-java@v4
411411
with:
412412
distribution: temurin
413413
java-version: 17.0.6

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: .github/scripts/gha-free-disk-space.sh
7272

7373
- name: Set up JDK for running Gradle
74-
uses: actions/setup-java@v3
74+
uses: actions/setup-java@v4
7575
with:
7676
distribution: temurin
7777
java-version: 17.0.6

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
run: .github/scripts/gha-free-disk-space.sh
1818

1919
- name: Set up Java 17
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
2222
distribution: temurin
2323
java-version: 17.0.6
2424

2525
- name: Initialize CodeQL
26-
uses: github/codeql-action/init@v2
26+
uses: github/codeql-action/init@v3
2727
with:
2828
languages: java
2929
# using "latest" helps to keep up with the latest Kotlin support
@@ -36,7 +36,7 @@ jobs:
3636
arguments: assemble -x javadoc --no-build-cache --no-daemon
3737

3838
- name: Perform CodeQL analysis
39-
uses: github/codeql-action/analyze@v2
39+
uses: github/codeql-action/analyze@v3
4040

4141
workflow-notification:
4242
needs:

‎.github/workflows/issue-management-stale-action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
stale:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/stale@v8
12+
- uses: actions/stale@v9
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
days-before-stale: 7

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,20 @@ jobs:
1919
run: .github/scripts/gha-free-disk-space.sh
2020

2121
- name: Set up JDK for running Gradle
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
distribution: temurin
2525
java-version: 17.0.6
2626

2727
- uses: gradle/gradle-build-action@v2
2828
with:
2929
arguments: ":javaagent:dependencyCheckAnalyze"
30+
env:
31+
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
3032

3133
- name: Upload report
3234
if: always()
33-
uses: actions/upload-artifact@v3
35+
uses: actions/upload-artifact@v4
3436
with:
3537
path: javaagent/build/reports
3638

‎.github/workflows/pr-smoke-test-fake-backend-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
run: .github/scripts/gha-free-disk-space.sh
1717

1818
- name: Set up JDK for running Gradle
19-
uses: actions/setup-java@v3
19+
uses: actions/setup-java@v4
2020
with:
2121
distribution: temurin
2222
java-version: 17.0.6
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@v4
4242

4343
- name: Set up JDK for running Gradle
44-
uses: actions/setup-java@v3
44+
uses: actions/setup-java@v4
4545
with:
4646
distribution: temurin
4747
java-version: 17.0.6

‎.github/workflows/pr-smoke-test-servlet-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: .github/scripts/gha-free-disk-space.sh
3838

3939
- name: Set up JDK for running Gradle
40-
uses: actions/setup-java@v3
40+
uses: actions/setup-java@v4
4141
with:
4242
distribution: temurin
4343
java-version: 17.0.6

‎.github/workflows/publish-smoke-test-fake-backend-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: .github/scripts/gha-free-disk-space.sh
2020

2121
- name: Set up JDK for running Gradle
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
distribution: temurin
2525
java-version: 17.0.6
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@v4
5252

5353
- name: Set up JDK for running Gradle
54-
uses: actions/setup-java@v3
54+
uses: actions/setup-java@v4
5555
with:
5656
distribution: temurin
5757
java-version: 17.0.6

0 commit comments

Comments
 (0)