Skip to content

Commit 7cc8ddf

Browse files
authored
Merge branch 'open-telemetry:main' into main
2 parents 6ca3912 + c8ba093 commit 7cc8ddf

File tree

218 files changed

+1407
-1634
lines changed

Some content is hidden

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

218 files changed

+1407
-1634
lines changed

.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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
24+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2525
with:
2626
# history is needed to run git cherry-pick below
2727
fetch-depth: 0

.github/workflows/benchmark-tags.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
- v1.29.0
2323
- v1.30.0
2424
steps:
25-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
ref: ${{ matrix.tag-version }}
2828

2929
- id: setup-java
3030
name: Set up Java for build
31-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
31+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3232
with:
3333
distribution: temurin
3434
java-version: 21

.github/workflows/benchmark.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
- name: Configure Git safe directory
2727
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
2828

29-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
29+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3030

3131
- id: setup-java
3232
name: Set up Java for build
33-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
33+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3434
with:
3535
distribution: temurin
3636
java-version: 21
@@ -42,10 +42,15 @@ jobs:
4242
env:
4343
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4444

45+
# TODO (jack-berg): Select or build appropriate benchmarks for other key areas:
46+
# - Log SDK record & export
47+
# - Trace SDK record & export
48+
# - Metric SDK export
49+
# - Noop implementation
4550
- name: Run Benchmark
4651
run: |
47-
cd sdk/trace/build
48-
java -jar libs/opentelemetry-sdk-trace-*-jmh.jar -rf json SpanBenchmark SpanPipelineBenchmark ExporterBenchmark
52+
cd sdk/all/build
53+
java -jar libs/opentelemetry-sdk-*-jmh.jar -rf json MetricRecordBenchmark
4954
5055
- name: Use CLA approved github bot
5156
run: .github/scripts/use-cla-approved-bot.sh
@@ -54,7 +59,7 @@ jobs:
5459
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
5560
with:
5661
tool: 'jmh'
57-
output-file-path: sdk/trace/build/jmh-result.json
62+
output-file-path: sdk/all/build/jmh-result.json
5863
gh-pages-branch: benchmarks
5964
github-token: ${{ secrets.GITHUB_TOKEN }}
6065
benchmark-data-dir-path: "benchmarks"

.github/workflows/build-daily.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
publish-snapshots:
1717
runs-on: ubuntu-24.04
1818
steps:
19-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
19+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020

2121
- name: Set up Java
22-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
22+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2323
with:
2424
distribution: temurin
2525
java-version: 21

.github/workflows/build-tracecontext-testsuite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
packages: write
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323

2424
- name: Login to GitHub package registry
2525
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ jobs:
3939
coverage: true
4040
jmh-based-tests: true
4141
steps:
42-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
42+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4343

4444
- id: setup-java-test
4545
name: Set up Java ${{ matrix.test-java-version }} for tests
46-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
46+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4747
with:
4848
# use corretto for testing, since it supports java 8 on more OS versions, including macos-latest
4949
distribution: corretto
5050
java-version: ${{ matrix.test-java-version }}
5151

5252
- id: setup-java
5353
name: Set up Java for build
54-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
54+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
5555
with:
5656
distribution: temurin
5757
java-version: 21
@@ -114,7 +114,7 @@ jobs:
114114
- 21
115115
- 25 # renovate(java-version)
116116
steps:
117-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
117+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
118118
- uses: graalvm/setup-graalvm@54b4f5a65c1a84b2fdfdc2078fe43df32819e4b1 # v1.4.5
119119
with:
120120
java-version: ${{ matrix.test-graal-version }}

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
- language: java
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
34+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3535

3636
- name: Set up Java 21
3737
if: matrix.language == 'java'
38-
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
38+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3939
with:
4040
distribution: temurin
4141
java-version: 21
@@ -45,7 +45,7 @@ jobs:
4545
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
48+
uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
4949
with:
5050
languages: ${{ matrix.language }}
5151
# using "linked" helps to keep up with the latest Kotlin support
@@ -62,6 +62,6 @@ jobs:
6262
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
6363

6464
- name: Perform CodeQL analysis
65-
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
65+
uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
6666
with:
6767
category: "/language:${{matrix.language}}"

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fossa:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
15+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616

1717
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
1818
with:

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
gradle-wrapper-validation:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
14+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1515

1616
# this needs to be in its own workflow in order to make OSSF scorecard happy
1717
- uses: gradle/actions/wrapper-validation@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
github.event.comment.user.login == github.event.issue.user.login
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2222

2323
- name: Remove labels
2424
env:

0 commit comments

Comments
 (0)