Skip to content

Commit e08788a

Browse files
trasktrask
committed
Merge remote-tracking branch 'upstream/main' into renovate/otelinstrumentationversion
2 parents 17c5166 + 572575e commit e08788a

File tree

17 files changed

+478
-173
lines changed

17 files changed

+478
-173
lines changed

‎.github/renovate.json5‎

Lines changed: 112 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,163 @@
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:recommended',
5+
'docker:pinDigests',
6+
'helpers:pinGitHubActionDigests',
77
],
8-
"ignorePresets": [":ignoreModulesAndTests"], // needed to keep maven-extension test pom files up-to-date
9-
"packageRules": [
8+
ignorePresets: [
9+
':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
10+
],
11+
packageRules: [
1012
{
1113
// this is to reduce the number of renovate PRs
12-
"matchManagers": [
13-
"github-actions",
14-
"dockerfile"
14+
matchManagers: [
15+
'github-actions',
16+
'dockerfile',
17+
],
18+
extends: [
19+
'schedule:weekly',
1520
],
16-
"extends": ["schedule:weekly"],
17-
"groupName": "weekly update"
21+
groupName: 'weekly update',
1822
},
1923
{
20-
"matchPackageNames": [
21-
"io.opentelemetry:**",
22-
"io.opentelemetry.instrumentation:**",
23-
"io.opentelemetry.semconv:**",
24-
"io.opentelemetry.proto:**"
24+
matchPackageNames: [
25+
'io.opentelemetry:**',
26+
'io.opentelemetry.instrumentation:**',
27+
'io.opentelemetry.semconv:**',
28+
'io.opentelemetry.proto:**',
2529
],
2630
// Renovate's default behavior is only to update from unstable -> unstable if it's for the
2731
// major.minor.patch, under the assumption that you would want to update to the stable version
2832
// of that release instead of the unstable version for a future release
29-
"ignoreUnstable": false
33+
ignoreUnstable: false,
3034
},
3135
{
3236
// prevent 3.0.1u2 -> 3.0.1
33-
"matchPackageNames": ["com.google.code.findbugs:annotations"],
34-
"allowedVersions": "!/^3\\.0\\.1$/"
37+
matchPackageNames: [
38+
'com.google.code.findbugs:annotations',
39+
],
40+
allowedVersions: '!/^3\\.0\\.1$/',
3541
},
3642
{
3743
// disruptor 4+ requires Java 11+
38-
"matchPackageNames": ["com.lmax:disruptor"],
39-
"matchUpdateTypes": ["major"],
40-
"enabled": false
44+
matchPackageNames: [
45+
'com.lmax:disruptor',
46+
],
47+
matchUpdateTypes: [
48+
'major',
49+
],
50+
enabled: false,
4151
},
4252
{
4353
// junit-pioneer 2+ requires Java 11+
44-
"matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
45-
"matchUpdateTypes": ["major"],
46-
"enabled": false
54+
matchPackageNames: [
55+
'org.junit-pioneer:junit-pioneer',
56+
],
57+
matchUpdateTypes: [
58+
'major',
59+
],
60+
enabled: false,
4761
},
4862
{
4963
// mockito 5+ requires Java 11+
50-
"matchPackagePrefixes": ["org.mockito:"],
51-
"matchUpdateTypes": ["major"],
52-
"enabled": false
64+
matchUpdateTypes: [
65+
'major',
66+
],
67+
enabled: false,
68+
matchPackageNames: [
69+
'org.mockito:{/,}**',
70+
],
5371
},
5472
{
5573
// agrona 1.23+ requires Java 17+
56-
"matchPackageNames": ["org.agrona:agrona"],
57-
"matchUpdateTypes": ["major", "minor"],
58-
"enabled": false
74+
matchPackageNames: [
75+
'org.agrona:agrona',
76+
],
77+
matchUpdateTypes: [
78+
'major',
79+
'minor',
80+
],
81+
enabled: false,
5982
},
6083
{
6184
// system-stubs-jupiter 2.1+ requires Java 11+
62-
"matchPackageNames": ["uk.org.webcompere:system-stubs-jupiter"],
63-
"matchUpdateTypes": ["major", "minor"],
64-
"enabled": false
85+
matchPackageNames: [
86+
'uk.org.webcompere:system-stubs-jupiter',
87+
],
88+
matchUpdateTypes: [
89+
'major',
90+
'minor',
91+
],
92+
enabled: false,
6593
},
6694
{
6795
// pinned version for compatibility
68-
"matchPackageNames": ["io.micrometer:micrometer-core"],
69-
"matchCurrentVersion": "1.5.0",
70-
"enabled": false
96+
matchPackageNames: [
97+
'io.micrometer:micrometer-core',
98+
],
99+
matchCurrentVersion: '1.5.0',
100+
enabled: false,
71101
},
72102
{
73103
// pinned version for compatibility
74-
"matchPackagePrefixes": ["org.apache.maven:"],
75-
"matchCurrentVersion": "3.5.0",
76-
"enabled": false
104+
matchCurrentVersion: '3.5.0',
105+
enabled: false,
106+
matchPackageNames: [
107+
'org.apache.maven:{/,}**',
108+
],
77109
},
78110
{
79-
"matchPackagePrefixes": ["com.diffplug.spotless"],
80-
"groupName": "spotless packages"
111+
groupName: 'spotless packages',
112+
matchPackageNames: [
113+
'com.diffplug.spotless{/,}**',
114+
],
81115
},
82116
{
83117
// pinned version for compatibility with java 8 JFR parsing
84-
"matchPackagePrefixes": ["org.openjdk.jmc"],
85-
"matchUpdateTypes": ["major"],
86-
"enabled": false
118+
matchUpdateTypes: [
119+
'major',
120+
],
121+
enabled: false,
122+
matchPackageNames: [
123+
'org.openjdk.jmc{/,}**',
124+
],
87125
},
88126
{
89127
// pinned version for compatibility
90-
"matchFileNames": ["jmx-scraper/test-webapp/build.gradle.kts"],
91-
"matchPackagePrefixes": ["jakarta.servlet:"],
92-
"matchCurrentVersion": "5.0.0",
93-
"enabled": false
128+
matchFileNames: [
129+
'jmx-scraper/test-webapp/build.gradle.kts',
130+
],
131+
matchCurrentVersion: '5.0.0',
132+
enabled: false,
133+
matchPackageNames: [
134+
'jakarta.servlet:{/,}**',
135+
],
94136
},
95137
{
96138
// intentionally using Spring Boot 2 in gcp-auth-extension in order to test with Java 8+
97-
"matchFileNames": [
98-
"gcp-auth-extension/build.gradle.kts"
139+
matchFileNames: [
140+
'gcp-auth-extension/build.gradle.kts',
99141
],
100-
"matchPackagePrefixes": [
101-
"org.springframework.boot"
142+
matchUpdateTypes: [
143+
'major',
102144
],
103-
"matchUpdateTypes": ["major"],
104-
"enabled": false,
105-
}
145+
enabled: false,
146+
matchPackageNames: [
147+
'org.springframework.boot{/,}**',
148+
],
149+
},
106150
],
107-
"customManagers": [
151+
customManagers: [
108152
{
109-
"customType": "regex",
110-
"datasourceTemplate": "npm",
111-
"fileMatch": [
112-
"^.github/workflows/"
113-
],
114-
"matchStrings": [
115-
"npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)"
116-
]
117-
}
118-
]
153+
customType: 'regex',
154+
datasourceTemplate: 'npm',
155+
fileMatch: [
156+
'^.github/workflows/',
157+
],
158+
matchStrings: [
159+
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',
160+
],
161+
},
162+
],
119163
}

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

32-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
32+
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ jobs:
4343
- 8
4444
- 11
4545
- 17
46-
- 20
46+
- 21
47+
- 23
4748
fail-fast: false
4849
steps:
4950
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

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

50-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
50+
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
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
@@ -59,7 +59,7 @@ jobs:
5959
- name: Use CLA approved bot
6060
run: .github/scripts/use-cla-approved-bot.sh
6161

62-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
62+
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
6363
id: otelbot-token
6464
with:
6565
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -116,7 +116,7 @@ jobs:
116116
- name: Use CLA approved bot
117117
run: .github/scripts/use-cla-approved-bot.sh
118118

119-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
119+
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
120120
id: otelbot-token
121121
with:
122122
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ jobs:
221221
- name: Use CLA approved bot
222222
run: .github/scripts/use-cla-approved-bot.sh
223223

224-
- uses: actions/create-github-app-token@67e27a7eb7db372a1c61a7f9bdab8699e9ee57f7 # v1.11.3
224+
- uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
225225
id: otelbot-token
226226
with:
227227
app-id: ${{ vars.OTELBOT_APP_ID }}

0 commit comments

Comments
 (0)