Skip to content

Commit d6859b4

Browse files
brendenehlersbrendenehlers
committed
Merge branch 'main' into exception-fix
2 parents 92f7649 + 1e763b2 commit d6859b4

File tree

531 files changed

+12056
-3049
lines changed

Some content is hidden

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

531 files changed

+12056
-3049
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ OS (if different from OS compiled on): (e.g., "Windows Server 2019")
3232

3333
**Additional context**
3434
Add any other context about the problem here.
35+
36+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ A clear and concise description of any alternative solutions or features you've
1818

1919
**Additional context**
2020
Add any other context or screenshots about the feature request here.
21+
22+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

‎.github/renovate.json5‎

Lines changed: 85 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,113 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"config:recommended",
5-
"docker:pinDigests",
6-
"helpers:pinGitHubActionDigests"
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
'config:best-practices',
5+
'helpers:pinGitHubActionDigestsToSemver',
76
],
8-
"packageRules": [
7+
ignorePaths: [], // overwrite default ignore which includes **/test/**
8+
// used to update docker image versions used in Java test files
9+
packageRules: [
910
{
1011
// this is to reduce the number of renovate PRs
11-
"matchManagers": [
12-
"github-actions",
13-
"dockerfile"
12+
matchManagers: [
13+
'github-actions',
14+
'dockerfile',
1415
],
15-
"extends": ["schedule:weekly"],
16-
"groupName": "weekly update"
16+
extends: [
17+
'schedule:weekly',
18+
],
19+
groupName: 'weekly update',
1720
},
1821
{
19-
"matchPackageNames": [
20-
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator",
21-
"io.opentelemetry.proto:opentelemetry-proto",
22-
"io.opentelemetry.semconv:opentelemetry-semconv-incubating"
22+
matchPackageNames: [
23+
'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
24+
'io.opentelemetry.proto:opentelemetry-proto',
25+
'io.opentelemetry.semconv:opentelemetry-semconv-incubating',
2326
],
2427
// Renovate's default behavior is only to update from unstable -> unstable if it's for the
2528
// major.minor.patch, under the assumption that you would want to update to the stable version
2629
// of that release instead of the unstable version for a future release
2730
// (TODO remove once the artifacts above release stable versions)
28-
"ignoreUnstable": false,
29-
"allowedVersions": "!/\\-SNAPSHOT$/"
31+
ignoreUnstable: false,
32+
allowedVersions: '!/\\-SNAPSHOT$/',
3033
},
3134
{
3235
// junit-pioneer 2+ requires Java 11+
33-
"matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
34-
"matchUpdateTypes": ["major"],
35-
"enabled": false
36+
matchPackageNames: [
37+
'org.junit-pioneer:junit-pioneer',
38+
],
39+
matchUpdateTypes: [
40+
'major',
41+
],
42+
enabled: false,
3643
},
3744
{
3845
// mockito 5+ requires Java 11+
39-
"matchPackagePrefixes": ["org.mockito:"],
40-
"matchUpdateTypes": ["major"],
41-
"enabled": false
46+
matchUpdateTypes: [
47+
'major',
48+
],
49+
enabled: false,
50+
matchPackageNames: [
51+
'org.mockito:{/,}**',
52+
],
4253
},
4354
{
4455
// jqf-fuzz version 1.8+ requires Java 11+
45-
"matchPackageNames": ["edu.berkeley.cs.jqf:jqf-fuzz"],
46-
"matchUpdateTypes": ["major", "minor"],
47-
"enabled": false
56+
matchPackageNames: [
57+
'edu.berkeley.cs.jqf:jqf-fuzz',
58+
],
59+
matchUpdateTypes: [
60+
'major',
61+
'minor',
62+
],
63+
enabled: false,
4864
},
4965
{
5066
// pinned version for compatibility
51-
"matchPackageNames": ["org.jetbrains.kotlinx:kotlinx-coroutines-core"],
52-
"matchCurrentVersion": "1.5.2",
53-
"enabled": false
67+
matchPackageNames: [
68+
'org.jetbrains.kotlinx:kotlinx-coroutines-core',
69+
],
70+
matchCurrentVersion: '1.5.2',
71+
enabled: false,
72+
},
73+
{
74+
groupName: 'spotless packages',
75+
matchPackageNames: [
76+
'com.diffplug.spotless{/,}**',
77+
],
5478
},
5579
{
56-
"matchPackagePrefixes": ["com.diffplug.spotless"],
57-
"groupName": "spotless packages"
80+
// equals verifier v4+ requires java 17+
81+
groupName: 'nl.jqno.equalsverifier',
82+
matchPackageNames: [ 'equalsverifier'],
83+
matchUpdateTypes: [ 'major' ],
84+
enabled: false
5885
}
59-
]
86+
],
87+
customManagers: [
88+
{
89+
customType: 'regex',
90+
datasourceTemplate: 'java-version',
91+
managerFilePatterns: [
92+
'.github/workflows/**'
93+
],
94+
matchStrings: [
95+
'(?<currentValue>\\d+) # renovate: datasource=java-version',
96+
],
97+
depNameTemplate: 'java',
98+
extractVersionTemplate: '^(?<version>\\d+)',
99+
},
100+
{
101+
customType: 'regex',
102+
datasourceTemplate: 'docker',
103+
managerFilePatterns: [
104+
'**/*.java'
105+
],
106+
matchStrings: [
107+
'"(?<depName>otel/opentelemetry-collector-contrib):(?<currentValue>[^@"]+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?"',
108+
],
109+
autoReplaceStringTemplate: '"{{depName}}:{{newValue}}{{#if newDigest}}@{{newDigest}}{{/if}}"',
110+
versioningTemplate: 'docker',
111+
},
112+
],
60113
}

‎.github/repository-settings.md‎

Lines changed: 3 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,8 @@
11
# Repository settings
22

3-
Repository settings in addition to what's documented already at
4-
<https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md>.
5-
6-
## General > Pull Requests
7-
8-
- Allow squash merging > Default to pull request title
9-
10-
- Allow auto-merge
11-
12-
## Actions > General
13-
14-
- Fork pull request workflows from outside collaborators:
15-
"Require approval for first-time contributors who are new to GitHub"
16-
17-
(To reduce friction for new contributors,
18-
as the default is "Require approval for first-time contributors")
19-
20-
- Workflow permissions
21-
- Default permissions granted to the `GITHUB_TOKEN` when running workflows in this repository:
22-
Read repository contents and packages permissions
23-
- Allow GitHub Actions to create and approve pull requests: UNCHECKED
24-
25-
## Rules > Rulesets
26-
27-
### `main` and release branches
28-
29-
- Targeted branches:
30-
- `main`
31-
- `release/*`
32-
- Branch rules
33-
- Restrict deletions: CHECKED
34-
- Require linear history: CHECKED
35-
- Require a pull request before merging: CHECKED
36-
- Required approvals: 1
37-
- Require review from Code Owners: CHECKED
38-
- Allowed merge methods: Squash
39-
- Require status checks to pass
40-
- Do not require status checks on creation: CHECKED
41-
- Status checks that are required
42-
- EasyCLA
43-
- `required-status-check`
44-
- `gradle-wrapper-validation`
45-
- Block force pushes: CHECKED
46-
- Require code scanning results: CHECKED
47-
- CodeQL
48-
- Security alerts: High or higher
49-
- Alerts: Errors
50-
51-
### `benchmarks` branch
52-
53-
- Targeted branches:
54-
- `benchmarks`
55-
- Branch rules
56-
- Restrict deletions: CHECKED
57-
- Require linear history: CHECKED
58-
- Block force pushes: CHECKED
59-
60-
### Old-style release branches
61-
62-
- Targeted branches:
63-
- `v0.*`
64-
- `v1.*`
65-
- Branch rules
66-
- Restrict creations: CHECKED
67-
- Restrict updates: CHECKED
68-
- Restrict deletions: CHECKED
69-
70-
### Restrict branch creation
71-
72-
- Targeted branches
73-
- Exclude:
74-
- `release/*`
75-
- `renovate/**/*`
76-
- `otelbot/**/*`
77-
- `revert-*/**/*` (these are created when using the GitHub UI to revert a PR)
78-
- Restrict creations: CHECKED
79-
80-
### Restrict updating tags
81-
82-
- Targeted tags
83-
- All tags
84-
- Restrict updates: CHECKED
85-
- Restrict deletions: CHECKED
86-
87-
## Branch protections
88-
89-
### `main`, `release/*`
90-
91-
- Restrict who can push to matching branches: CHECKED
92-
93-
## Code security and analysis
94-
95-
- Secret scanning: Enabled
3+
This document describes any changes that have been made to the
4+
settings in this repository outside the settings tracked in the
5+
private admin repo.
966

977
## Secrets and variables > Actions
988

‎.github/scripts/update-version.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash -e
2+
3+
version=$1
4+
versionWithSnapshot="$version-SNAPSHOT"
5+
6+
sed -Ei "s/[0-9]+\.[0-9]+\.[0-9]+/$version/" version.gradle.kts
7+
8+
sed -Ei "1 s/(Comparing source compatibility of [a-z-]+)-[0-9]+\.[0-9]+\.[0-9]+(-SNAPSHOT)?.jar/\1-$versionWithSnapshot.jar/" docs/apidiffs/current_vs_latest/*.txt

‎.github/workflows/backport.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
exit 1
2222
fi
2323
24-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525
with:
2626
# history is needed to run git cherry-pick below
2727
fetch-depth: 0
2828

2929
- name: Use CLA approved github bot
3030
run: .github/scripts/use-cla-approved-github-bot.sh
3131

32-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
32+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/benchmark-tags.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
permissions:
1212
contents: write # for git push to benchmarks branch
1313
name: Benchmark SDK
14-
runs-on: self-hosted
14+
runs-on: equinix-bare-metal
1515
timeout-minutes: 10
1616
strategy:
1717
fail-fast: false
@@ -44,19 +44,19 @@ jobs:
4444
- v1.30.0
4545
- v1.30.1
4646
steps:
47-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
47+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4848
with:
4949
ref: ${{ matrix.tag-version }}
5050

5151
- id: setup-java
5252
name: Set up Java for build
53-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
53+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
5454
with:
5555
distribution: temurin
5656
java-version: 17
5757

5858
- name: Set up gradle
59-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
59+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
6060
- name: Run jmh
6161
run: ./gradlew jmhJar
6262

@@ -66,7 +66,7 @@ jobs:
6666
java -jar libs/opentelemetry-sdk-trace-*-jmh.jar -rf json SpanBenchmark SpanPipelineBenchmark ExporterBenchmark
6767
6868
- name: Store benchmark results
69-
uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
69+
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
7070
with:
7171
tool: 'jmh'
7272
output-file-path: sdk/trace/build/jmh-result.json

‎.github/workflows/benchmark.yml‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,30 @@ jobs:
1313
permissions:
1414
contents: write # for git push to benchmarks branch
1515
name: Benchmark SDK
16-
runs-on: self-hosted
17-
timeout-minutes: 10
16+
runs-on: oracle-bare-metal-64cpu-512gb-x86-64
17+
container:
18+
image: ubuntu:24.04@sha256:353675e2a41babd526e2b837d7ec780c2a05bca0164f7ea5dbbd433d21d166fc
19+
timeout-minutes: 20 # since there is only a single bare metal runner across all repos
1820
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21+
- name: Install Git
22+
run: |
23+
apt-get update
24+
apt-get install -y git
25+
26+
- name: Configure Git safe directory
27+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
28+
29+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2030

2131
- id: setup-java
2232
name: Set up Java for build
23-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
33+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2434
with:
2535
distribution: temurin
2636
java-version: 17
2737

2838
- name: Set up gradle
29-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
39+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
3040
- name: Run jmh
3141
run: ./gradlew jmhJar
3242

@@ -35,8 +45,11 @@ jobs:
3545
cd sdk/trace/build
3646
java -jar libs/opentelemetry-sdk-trace-*-jmh.jar -rf json SpanBenchmark SpanPipelineBenchmark ExporterBenchmark
3747
48+
- name: Use CLA approved github bot
49+
run: .github/scripts/use-cla-approved-github-bot.sh
50+
3851
- name: Store benchmark results
39-
uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
52+
uses: benchmark-action/github-action-benchmark@4bdcce38c94cec68da58d012ac24b7b1155efe8b # v1.20.7
4053
with:
4154
tool: 'jmh'
4255
output-file-path: sdk/trace/build/jmh-result.json

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ jobs:
1919
packages: write
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323

2424
- name: Login to GitHub package registry
25-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
25+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.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@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
32+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
3333
with:
3434
context: integration-tests/tracecontext/docker
3535
push: true

0 commit comments

Comments
 (0)