Skip to content

Commit 94e1052

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into response-body-bounds
2 parents 441391d + d688fa6 commit 94e1052

134 files changed

Lines changed: 809 additions & 309 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.

.github/renovate.json5

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,22 @@
1010
ignorePaths: [], // overwrite default ignore which includes **/test/**
1111
// used to update docker image versions used in Java test files
1212
packageRules: [
13+
14+
// ── Scheduling & grouping ──────────────────────────────────────────
15+
1316
{
14-
// this is to reduce the number of renovate PRs
17+
// group all patch updates into a single weekly PR
18+
groupName: 'all patch versions',
19+
matchUpdateTypes: [
20+
'patch',
21+
],
22+
schedule: [
23+
'before 8am on Tuesday',
24+
],
25+
},
26+
{
27+
// group GitHub Actions and dockerfile updates into a single weekly PR
28+
// (must be after patch rule so that it wins for GH Action patches)
1529
matchManagers: [
1630
'github-actions',
1731
'dockerfile',
@@ -21,6 +35,9 @@
2135
],
2236
groupName: 'weekly update',
2337
},
38+
39+
// ── Version constraints ────────────────────────────────────────────
40+
2441
{
2542
matchPackageNames: [
2643
'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
@@ -34,6 +51,19 @@
3451
ignoreUnstable: false,
3552
allowedVersions: '!/\\-SNAPSHOT$/',
3653
},
54+
55+
// ── Package family groups ──────────────────────────────────────────
56+
57+
{
58+
groupName: 'spotless packages',
59+
matchPackageNames: [
60+
'com.diffplug.spotless',
61+
'com.diffplug.spotless:**',
62+
],
63+
},
64+
65+
// ── Disabled updates (Java version compatibility) ──────────────────
66+
3767
{
3868
// junit 6+ requires Java 17+
3969
matchPackageNames: [
@@ -94,20 +124,13 @@
94124
matchCurrentVersion: '1.5.2',
95125
enabled: false,
96126
},
97-
{
98-
groupName: 'spotless packages',
99-
matchPackageNames: [
100-
'com.diffplug.spotless',
101-
'com.diffplug.spotless:**',
102-
],
103-
},
104127
{
105128
// equals verifier v4+ requires java 17+
106129
groupName: 'nl.jqno.equalsverifier',
107130
matchPackageNames: [ 'equalsverifier'],
108131
matchUpdateTypes: [ 'major' ],
109132
enabled: false
110-
}
133+
},
111134
],
112135
customManagers: [
113136
{

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Use CLA approved github bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
32+
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/benchmark-tags.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
permissions:
1212
contents: write # for git push to benchmarks branch
1313
name: Benchmark SDK
14-
runs-on: oracle-bare-metal-64cpu-512gb-x86-64
14+
runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
1515
container:
16-
image: ubuntu:24.04@sha256:d1e2e92c075e5ca139d51a140fff46f84315c0fdce203eab2807c7e495eff4f9
16+
image: ubuntu:24.04@sha256:186072bba1b2f436cbb91ef2567abca677337cfc786c86e107d25b7072feef0c
1717
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
1818
strategy:
1919
fail-fast: false
@@ -46,7 +46,7 @@ jobs:
4646
java -jar libs/opentelemetry-sdk-trace-*-jmh.jar -rf json SpanBenchmark SpanPipelineBenchmark ExporterBenchmark
4747
4848
- name: Store benchmark results
49-
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
49+
uses: benchmark-action/github-action-benchmark@a7bc2366eda11037936ea57d811a43b3418d3073 # v1.21.0
5050
with:
5151
tool: 'jmh'
5252
output-file-path: sdk/trace/build/jmh-result.json

.github/workflows/benchmark.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
permissions:
1414
contents: write # for git push to benchmarks branch
1515
name: Benchmark SDK
16-
runs-on: oracle-bare-metal-64cpu-512gb-x86-64
16+
runs-on: oracle-bare-metal-64cpu-1024gb-x86-64-ubuntu-24
1717
container:
18-
image: ubuntu:24.04@sha256:d1e2e92c075e5ca139d51a140fff46f84315c0fdce203eab2807c7e495eff4f9
18+
image: ubuntu:24.04@sha256:186072bba1b2f436cbb91ef2567abca677337cfc786c86e107d25b7072feef0c
1919
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
2020
steps:
2121
- name: Install Git
@@ -56,7 +56,7 @@ jobs:
5656
run: .github/scripts/use-cla-approved-bot.sh
5757

5858
- name: Store benchmark results
59-
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
59+
uses: benchmark-action/github-action-benchmark@a7bc2366eda11037936ea57d811a43b3418d3073 # v1.21.0
6060
with:
6161
tool: 'jmh'
6262
output-file-path: sdk/all/build/jmh-result.json

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2323

2424
- name: Login to GitHub package registry
25-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
25+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
2626
with:
2727
registry: ghcr.io
2828
username: ${{ github.repository_owner }}
2929
password: ${{ secrets.GITHUB_TOKEN }}
3030

3131
- name: Build and push
32-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
32+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
3333
with:
3434
context: integration-tests/tracecontext/docker
3535
push: true

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
exit 1
8989
fi
9090
91-
- uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
91+
- uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
9292
if: ${{ matrix.coverage }}
9393
env:
9494
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -115,7 +115,7 @@ jobs:
115115
- 25 # renovate(java-version)
116116
steps:
117117
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
118-
- uses: graalvm/setup-graalvm@54b4f5a65c1a84b2fdfdc2078fe43df32819e4b1 # v1.4.5
118+
- uses: graalvm/setup-graalvm@f744c72a42b1995d7b0cbc314bde4bace7ac1fe1 # v1.5.0
119119
with:
120120
java-version: ${{ matrix.test-graal-version }}
121121
distribution: 'graalvm'

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
48+
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
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@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
65+
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
6666
with:
6767
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343
# Upload the results to GitHub's code scanning dashboard (optional).
4444
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
46+
uses: github/codeql-action/upload-sarif@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
4747
with:
4848
sarif_file: results.sarif

.github/workflows/prepare-patch-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Use CLA approved github bot
4848
run: .github/scripts/use-cla-approved-bot.sh
4949

50-
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
50+
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
5151
id: otelbot-token
5252
with:
5353
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/prepare-release-branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Use CLA approved github bot
6464
run: .github/scripts/use-cla-approved-bot.sh
6565

66-
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
66+
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
6767
id: otelbot-token
6868
with:
6969
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -119,7 +119,7 @@ jobs:
119119
- name: Use CLA approved github bot
120120
run: .github/scripts/use-cla-approved-bot.sh
121121

122-
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
122+
- uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
123123
id: otelbot-token
124124
with:
125125
app-id: ${{ vars.OTELBOT_APP_ID }}

0 commit comments

Comments
 (0)