Skip to content

Commit 1284e2d

Browse files
jack-bergjack-berg
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-java into extend-prometheus-declarative-config
2 parents e5d9bbc + d9c9583 commit 1284e2d

File tree

862 files changed

+24419
-9513
lines changed

Some content is hidden

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

862 files changed

+24419
-9513
lines changed

‎.clomonitor.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# see https://github.com/cncf/clomonitor/blob/main/docs/checks.md#exemptions
2+
exemptions:
3+
- check: artifacthub_badge
4+
reason: "Artifact Hub doesn't support Java packages"
5+
- check: signed_releases
6+
reason: "Maven central releases are signed and there are no GitHub release artifacts"
7+
- check: openssf_badge
8+
reason: "ETOOMANYBADGES, but the work has been done: https://www.bestpractices.dev/projects/9991"

‎.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/config/markdown-link-check-config.json‎

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

‎.github/renovate.json5‎

Lines changed: 61 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,85 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"config:base"
2+
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
3+
extends: [
4+
'config:best-practices',
5+
'helpers:pinGitHubActionDigestsToSemver',
56
],
6-
"packageRules": [
7+
packageRules: [
78
{
8-
"matchPackageNames": [
9-
"io.opentelemetry.proto:opentelemetry-proto",
10-
"io.opentelemetry.semconv:opentelemetry-semconv-incubating"
9+
// this is to reduce the number of renovate PRs
10+
matchManagers: [
11+
'github-actions',
12+
'dockerfile',
13+
],
14+
extends: [
15+
'schedule:weekly',
16+
],
17+
groupName: 'weekly update',
18+
},
19+
{
20+
matchPackageNames: [
21+
'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
22+
'io.opentelemetry.proto:opentelemetry-proto',
23+
'io.opentelemetry.semconv:opentelemetry-semconv-incubating',
1124
],
1225
// Renovate's default behavior is only to update from unstable -> unstable if it's for the
1326
// major.minor.patch, under the assumption that you would want to update to the stable version
1427
// of that release instead of the unstable version for a future release
1528
// (TODO remove once the artifacts above release stable versions)
16-
"ignoreUnstable": false,
17-
"allowedVersions": "!/\\-SNAPSHOT$/"
29+
ignoreUnstable: false,
30+
allowedVersions: '!/\\-SNAPSHOT$/',
1831
},
1932
{
2033
// junit-pioneer 2+ requires Java 11+
21-
"matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
22-
"matchUpdateTypes": ["major"],
23-
"enabled": false
34+
matchPackageNames: [
35+
'org.junit-pioneer:junit-pioneer',
36+
],
37+
matchUpdateTypes: [
38+
'major',
39+
],
40+
enabled: false,
2441
},
2542
{
2643
// mockito 5+ requires Java 11+
27-
"matchPackagePrefixes": ["org.mockito:"],
28-
"matchUpdateTypes": ["major"],
29-
"enabled": false
44+
matchUpdateTypes: [
45+
'major',
46+
],
47+
enabled: false,
48+
matchPackageNames: [
49+
'org.mockito:{/,}**',
50+
],
3051
},
3152
{
3253
// jqf-fuzz version 1.8+ requires Java 11+
33-
"matchPackageNames": ["edu.berkeley.cs.jqf:jqf-fuzz"],
34-
"matchUpdateTypes": ["major", "minor"],
35-
"enabled": false
54+
matchPackageNames: [
55+
'edu.berkeley.cs.jqf:jqf-fuzz',
56+
],
57+
matchUpdateTypes: [
58+
'major',
59+
'minor',
60+
],
61+
enabled: false,
3662
},
3763
{
3864
// pinned version for compatibility
39-
"matchPackageNames": ["org.jetbrains.kotlinx:kotlinx-coroutines-core"],
40-
"matchCurrentVersion": "1.5.2",
41-
"enabled": false
65+
matchPackageNames: [
66+
'org.jetbrains.kotlinx:kotlinx-coroutines-core',
67+
],
68+
matchCurrentVersion: '1.5.2',
69+
enabled: false,
4270
},
4371
{
44-
"matchPackagePrefixes": ["com.diffplug.spotless"],
45-
"groupName": "spotless packages"
72+
groupName: 'spotless packages',
73+
matchPackageNames: [
74+
'com.diffplug.spotless{/,}**',
75+
],
76+
},
77+
{
78+
// equals verifier v4+ requires java 17+
79+
groupName: 'nl.jqno.equalsverifier',
80+
matchPackageNames: [ 'equalsverifier'],
81+
matchUpdateTypes: [ 'major' ],
82+
enabled: false
4683
}
47-
]
84+
],
4885
}

‎.github/repository-settings.md‎

Lines changed: 16 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,24 @@
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>.
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.
56

6-
## General > Pull Requests
7-
8-
* Allow squash merging > Default to pull request title
9-
10-
## Actions > General
11-
12-
* Fork pull request workflows from outside collaborators:
13-
"Require approval for first-time contributors who are new to GitHub"
14-
15-
(To reduce friction for new contributors,
16-
as the default is "Require approval for first-time contributors")
17-
18-
## Branch protections
19-
20-
The order of branch protection rules
21-
[can be important](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule#about-branch-protection-rules).
22-
The branch protection rules below should be added before the `**/**` branch protection rule
23-
(this may require deleting the `**/**` rule and recreating it at the end).
24-
25-
### `main`
26-
27-
* Require branches to be up to date before merging: UNCHECKED
28-
29-
(PR jobs take too long, and leaving this unchecked has not been a significant problem)
30-
31-
* Status checks that are required:
32-
33-
* EasyCLA
34-
* required-status-check
35-
36-
### `release/*`
37-
38-
Same settings as above for `main`, except:
39-
40-
* Restrict pushes that create matching branches: UNCHECKED
41-
42-
(So that opentelemetrybot can create release branches)
43-
44-
### `renovate/**/**`, and `opentelemetrybot/*`
45-
46-
* Require status checks to pass before merging: UNCHECKED
47-
48-
(So that renovate PRs can be rebased)
49-
50-
* Restrict who can push to matching branches: UNCHECKED
51-
52-
(So that bots can create PR branches in this repository)
53-
54-
* Allow force pushes > Everyone
55-
56-
(So that renovate PRs can be rebased)
57-
58-
* Allow deletions: CHECKED
59-
60-
(So that bot PR branches can be deleted)
7+
## Secrets and variables > Actions
618

62-
### `benchmarks`
9+
- `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
10+
- `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
11+
- `NVD_API_KEY` - stored in OpenTelemetry-Java 1Password
12+
- Generated at https://nvd.nist.gov/developers/request-an-api-key
13+
- Key is associated with [@trask](https://github.com/trask)'s gmail address
14+
- `SONATYPE_KEY` - owned by [@jack-berg](https://github.com/jack-berg)
15+
- `SONATYPE_USER` - owned by [@jack-berg](https://github.com/jack-berg)
6316

64-
- Everything UNCHECKED
17+
### Organization secrets
6518

66-
(This branch is currently only used for directly pushing benchmarking results from the
67-
[overhead benchmark](https://github.com/open-telemetry/opentelemetry-java/actions/workflows/benchmark.yml)
68-
job)
19+
- `FOSSA_API_KEY`
20+
- `OTELBOT_PRIVATE_KEY`
6921

70-
## Secrets and variables > Actions
22+
### Organization variables
7123

72-
* `GPG_PASSWORD` - stored in OpenTelemetry-Java 1Password
73-
* `GPG_PRIVATE_KEY` - stored in OpenTelemetry-Java 1Password
74-
* `DEVELOCITY_ACCESS_KEY` - owned by [@jack-berg](https://github.com/jack-berg)
75-
* Generated at https://ge.opentelemetry.io > My settings > Access keys
76-
* format of env var is `ge.opentelemetry.io=<access key>`,
77-
see [docs](https://docs.gradle.com/enterprise/gradle-plugin/#via_environment_variable)
78-
* `SONATYPE_KEY` - owned by [@jack-berg](https://github.com/jack-berg)
79-
* `SONATYPE_USER` - owned by [@jack-berg](https://github.com/jack-berg)
24+
- `OTELBOT_APP_ID`

‎.github/scripts/generate-release-contributors.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ echo $contributors1 $contributors2 \
8686
| grep -v github-actions \
8787
| grep -v renovate \
8888
| grep -v codecov \
89-
| grep -v opentelemetrybot \
89+
| grep -v otelbot \
9090
| sed 's/^/@/'

‎.github/scripts/markdown-link-check-with-retry.sh‎

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

‎.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/scripts/use-cla-approved-github-bot.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash -e
22

3-
git config user.name opentelemetrybot
4-
git config user.email 107717825+opentelemetrybot@users.noreply.github.com
3+
git config user.name otelbot
4+
git config user.email 197425009+otelbot@users.noreply.github.com

0 commit comments

Comments
 (0)