Skip to content

Commit 4d1b409

Browse files
committed
Merge banch 'main' of https://github.com/open-telemetry/opentelemetry-java into declarative-config-0.4
2 parents 15bd160 + 768e789 commit 4d1b409

File tree

192 files changed

+2256
-2037
lines changed

Some content is hidden

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

192 files changed

+2256
-2037
lines changed

.clomonitor.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
exemptions:
2+
- check: artifacthub_badge
3+
reason: "Artifact Hub doesn't support Java packages"

.codecov.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ coverage:
1111
status:
1212
project:
1313
default:
14-
target: 90%
14+
target: 89%
1515
paths:
1616
- "!opencensus-shim/"
1717
- "!opentracing-shim/"

.fossa.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
version: 3
2+
3+
targets:
4+
only:
5+
- type: gradle
6+
exclude:
7+
# these modules are not published and so consumers will not be exposed to them
8+
- type: gradle
9+
path: ./
10+
target: ':api:testing-internal'
11+
- type: gradle
12+
path: ./
13+
target: ':exporters:otlp:testing-internal'
14+
- type: gradle
15+
path: ./
16+
target: ':integration-tests'
17+
- type: gradle
18+
path: ./
19+
target: ':integration-tests:graal'
20+
- type: gradle
21+
path: ./
22+
target: ':integration-tests:graal-incubating'
23+
- type: gradle
24+
path: ./
25+
target: ':integration-tests:otlp'
26+
- type: gradle
27+
path: ./
28+
target: ':integration-tests:tracecontext'
29+
- type: gradle
30+
path: ./
31+
target: ':perf-harness'
32+
- type: gradle
33+
path: ./
34+
target: ':testing-internal'
35+
36+
experimental:
37+
gradle:
38+
configurations-only:
39+
# consumer will only be exposed to these dependencies
40+
- runtimeClasspath

.github/renovate.json5

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:base"
4+
"config:recommended",
5+
"docker:pinDigests",
6+
"helpers:pinGitHubActionDigests"
57
],
68
"packageRules": [
9+
{
10+
// this is to reduce the number of renovate PRs by consolidating them into a weekly batch
11+
"matchManagers": ["github-actions"],
12+
"extends": ["schedule:weekly"],
13+
"groupName": "github actions",
14+
},
715
{
816
"matchPackageNames": [
917
"io.opentelemetry.proto:opentelemetry-proto",

.github/workflows/backport.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ on:
66
description: "The pull request # to backport"
77
required: true
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
backport:
14+
permissions:
15+
contents: write # for git push to PR branch
1116
runs-on: ubuntu-latest
1217
steps:
1318
- run: |
@@ -16,7 +21,7 @@ jobs:
1621
exit 1
1722
fi
1823
19-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2025
with:
2126
# history is needed to run git cherry-pick below
2227
fetch-depth: 0

.github/workflows/benchmark-tags.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@ name: Benchmark Tags
33
on:
44
workflow_dispatch:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
sdk-benchmark:
11+
permissions:
12+
contents: write # for git push to benchmarks branch
813
name: Benchmark SDK
914
runs-on: self-hosted
1015
timeout-minutes: 10
@@ -39,19 +44,19 @@ jobs:
3944
- v1.30.0
4045
- v1.30.1
4146
steps:
42-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4348
with:
4449
ref: ${{ matrix.tag-version }}
4550

4651
- id: setup-java
4752
name: Set up Java for build
48-
uses: actions/setup-java@v4
53+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
4954
with:
5055
distribution: temurin
5156
java-version: 17
5257

5358
- name: Set up gradle
54-
uses: gradle/actions/setup-gradle@v4
59+
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
5560
- name: Run jmh
5661
run: ./gradlew jmhJar
5762

@@ -61,7 +66,7 @@ jobs:
6166
java -jar libs/opentelemetry-sdk-trace-*-jmh.jar -rf json SpanBenchmark SpanPipelineBenchmark ExporterBenchmark
6267
6368
- name: Store benchmark results
64-
uses: benchmark-action/github-action-benchmark@v1
69+
uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
6570
with:
6671
tool: 'jmh'
6772
output-file-path: sdk/trace/build/jmh-result.json

.github/workflows/benchmark.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,28 @@ on:
55
branches: [ main ]
66
workflow_dispatch:
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
sdk-benchmark:
13+
permissions:
14+
contents: write # for git push to benchmarks branch
1015
name: Benchmark SDK
1116
runs-on: self-hosted
1217
timeout-minutes: 10
1318
steps:
14-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1520

1621
- id: setup-java
1722
name: Set up Java for build
18-
uses: actions/setup-java@v4
23+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
1924
with:
2025
distribution: temurin
2126
java-version: 17
2227

2328
- name: Set up gradle
24-
uses: gradle/actions/setup-gradle@v4
29+
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
2530
- name: Run jmh
2631
run: ./gradlew jmhJar
2732

@@ -31,7 +36,7 @@ jobs:
3136
java -jar libs/opentelemetry-sdk-trace-*-jmh.jar -rf json SpanBenchmark SpanPipelineBenchmark ExporterBenchmark
3237
3338
- name: Store benchmark results
34-
uses: benchmark-action/github-action-benchmark@v1
39+
uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
3540
with:
3641
tool: 'jmh'
3742
output-file-path: sdk/trace/build/jmh-result.json

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,27 @@ on:
99
- main
1010
workflow_dispatch:
1111

12+
permissions:
13+
contents: read
14+
1215
jobs:
1316
publish:
17+
permissions:
18+
contents: read
19+
packages: write
1420
runs-on: ubuntu-latest
1521
steps:
16-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1723

1824
- name: Login to GitHub package registry
19-
uses: docker/login-action@v3
25+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
2026
with:
2127
registry: ghcr.io
2228
username: ${{ github.repository_owner }}
2329
password: ${{ secrets.GITHUB_TOKEN }}
2430

2531
- name: Build and push
26-
uses: docker/build-push-action@v6
32+
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
2733
with:
2834
context: integration-tests/tracecontext/docker
2935
push: true

.github/workflows/build.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ concurrency:
1212
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
1313
cancel-in-progress: true
1414

15+
permissions:
16+
contents: read
17+
1518
jobs:
1619
build:
1720
name: Build
@@ -49,24 +52,24 @@ jobs:
4952
- os: macos-13
5053
test-java-version: 23
5154
steps:
52-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5356

5457
- id: setup-java-test
5558
name: Set up Java ${{ matrix.test-java-version }} for tests
56-
uses: actions/setup-java@v4
59+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
5760
with:
5861
distribution: temurin
5962
java-version: ${{ matrix.test-java-version }}
6063

6164
- id: setup-java
6265
name: Set up Java for build
63-
uses: actions/setup-java@v4
66+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
6467
with:
6568
distribution: temurin
6669
java-version: 17
6770

6871
- name: Set up gradle
69-
uses: gradle/actions/setup-gradle@v4
72+
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
7073
- name: Build
7174
run: >
7275
./gradlew build
@@ -96,12 +99,12 @@ jobs:
9699
exit 1
97100
fi
98101
99-
- uses: codecov/codecov-action@v5
102+
- uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
100103
if: ${{ matrix.coverage }}
101104
env:
102105
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
103106

104-
- uses: actions/upload-artifact@v4
107+
- uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
105108
if: ${{ matrix.coverage }}
106109
with:
107110
name: coverage-report
@@ -132,17 +135,17 @@ jobs:
132135
needs: build
133136
runs-on: ubuntu-24.04
134137
steps:
135-
- uses: actions/checkout@v4
138+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
136139

137140
- id: setup-java
138141
name: Set up Java
139-
uses: actions/setup-java@v4
142+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
140143
with:
141144
distribution: temurin
142145
java-version: 17
143146

144147
- name: Set up gradle
145-
uses: gradle/actions/setup-gradle@v4
148+
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
146149
# skipping release branches because the versions in those branches are not snapshots
147150
# (also this skips pull requests)
148151
if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java' }}
@@ -160,8 +163,8 @@ jobs:
160163
build-graal:
161164
runs-on: ubuntu-latest
162165
steps:
163-
- uses: actions/checkout@v4
164-
- uses: graalvm/setup-graalvm@v1
166+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
167+
- uses: graalvm/setup-graalvm@aafbedb8d382ed0ca6167d3a051415f20c859274 # v1.2.8
165168
with:
166169
# TODO(jack-berg): Which versions do we need to test? Should we use a matrix scheme?
167170
java-version: '21'

.github/workflows/codeql-daily.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)