Skip to content

Commit 820bc03

Browse files
committed
Merge remote-tracking branch 'upstream/main' into cf-resource
2 parents fde0169 + 539e0ef commit 820bc03

File tree

254 files changed

+7237
-4618
lines changed

Some content is hidden

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

254 files changed

+7237
-4618
lines changed

.clomonitor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
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: openssf_badge
6+
reason: "ETOOMANYBADGES, but the work has been done: https://www.bestpractices.dev/projects/9992"

.fossa.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 3
2+
3+
targets:
4+
only:
5+
- type: gradle
6+
7+
experimental:
8+
gradle:
9+
configurations-only:
10+
# consumer will only be exposed to these dependencies
11+
- runtimeClasspath

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ body:
1414
- aws-xray-propagator
1515
- consistent-sampling
1616
- disk-buffering
17+
- gcp-auth-extension
18+
- gcp-resources
1719
- jfr-connection
1820
- jfr-events
1921
- jmx-metrics
@@ -26,7 +28,6 @@ body:
2628
- resource-providers
2729
- runtime-attach
2830
- samplers
29-
- static-instrumenter
3031
- type: textarea
3132
attributes:
3233
label: What happened?

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ body:
1414
- aws-xray-propagator
1515
- consistent-sampling
1616
- disk-buffering
17+
- gcp-auth-extension
18+
- gcp-resources
1719
- jfr-connection
1820
- jfr-events
1921
- jmx-metrics
@@ -26,7 +28,6 @@ body:
2628
- resource-providers
2729
- runtime-attach
2830
- samplers
29-
- static-instrumenter
3031
- type: textarea
3132
attributes:
3233
label: Is your feature request related to a problem? Please describe.

.github/component_owners.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ components:
1919
aws-xray-propagator:
2020
- wangzlei
2121
- srprash
22-
baggage-procesor:
22+
azure-resources:
23+
- trask
24+
- zeitlinger
25+
baggage-processor:
2326
- mikegoldsmith
2427
- zeitlinger
2528
cloudfoundry-resources:
@@ -35,6 +38,9 @@ components:
3538
gcp-resources:
3639
- jsuereth
3740
- psx95
41+
gcp-auth-extension:
42+
- jsuereth
43+
- psx95
3844
jfr-connection:
3945
- breedx-splk
4046
- jeanbisutti
@@ -70,8 +76,6 @@ components:
7076
samplers:
7177
- trask
7278
- jack-berg
73-
static-instrumenter:
74-
- anosek-an
7579
kafka-exporter:
7680
- spockz
7781
- vincentfree

.github/config/markdown-link-check-config.json

Lines changed: 0 additions & 15 deletions
This file was deleted.
File renamed without changes.

.github/renovate.json5

Lines changed: 123 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,163 @@
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:recommended',
5+
'docker:pinDigests',
6+
'helpers:pinGitHubActionDigests',
57
],
6-
"packageRules": [
8+
ignorePresets: [
9+
':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
10+
],
11+
packageRules: [
12+
{
13+
// this is to reduce the number of renovate PRs
14+
matchManagers: [
15+
'github-actions',
16+
'dockerfile',
17+
],
18+
extends: [
19+
'schedule:weekly',
20+
],
21+
groupName: 'weekly update',
22+
},
723
{
8-
"matchPackageNames": [
9-
"io.opentelemetry:**",
10-
"io.opentelemetry.instrumentation:**",
11-
"io.opentelemetry.semconv:**",
12-
"io.opentelemetry.proto:**"
24+
matchPackageNames: [
25+
'io.opentelemetry:**',
26+
'io.opentelemetry.instrumentation:**',
27+
'io.opentelemetry.semconv:**',
28+
'io.opentelemetry.proto:**',
1329
],
1430
// Renovate's default behavior is only to update from unstable -> unstable if it's for the
1531
// major.minor.patch, under the assumption that you would want to update to the stable version
1632
// of that release instead of the unstable version for a future release
17-
"ignoreUnstable": false
18-
},
19-
{
20-
"matchPackagePrefixes": ["ch.qos.logback:"],
21-
"groupName": "logback packages"
22-
},
23-
{
24-
"matchPackagePrefixes": ["io.micrometer:"],
25-
"groupName": "micrometer packages"
33+
ignoreUnstable: false,
2634
},
2735
{
2836
// prevent 3.0.1u2 -> 3.0.1
29-
"matchPackageNames": ["com.google.code.findbugs:annotations"],
30-
"allowedVersions": "!/^3\\.0\\.1$/"
37+
matchPackageNames: [
38+
'com.google.code.findbugs:annotations',
39+
],
40+
allowedVersions: '!/^3\\.0\\.1$/',
3141
},
3242
{
3343
// disruptor 4+ requires Java 11+
34-
"matchPackageNames": ["com.lmax:disruptor"],
35-
"matchUpdateTypes": ["major"],
36-
"enabled": false
44+
matchPackageNames: [
45+
'com.lmax:disruptor',
46+
],
47+
matchUpdateTypes: [
48+
'major',
49+
],
50+
enabled: false,
3751
},
3852
{
3953
// junit-pioneer 2+ requires Java 11+
40-
"matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
41-
"matchUpdateTypes": ["major"],
42-
"enabled": false
54+
matchPackageNames: [
55+
'org.junit-pioneer:junit-pioneer',
56+
],
57+
matchUpdateTypes: [
58+
'major',
59+
],
60+
enabled: false,
4361
},
4462
{
4563
// mockito 5+ requires Java 11+
46-
"matchPackagePrefixes": ["org.mockito:"],
47-
"matchUpdateTypes": ["major"],
48-
"enabled": false
64+
matchUpdateTypes: [
65+
'major',
66+
],
67+
enabled: false,
68+
matchPackageNames: [
69+
'org.mockito:{/,}**',
70+
],
4971
},
5072
{
5173
// agrona 1.23+ requires Java 17+
52-
"matchPackageNames": ["org.agrona:agrona"],
53-
"matchUpdateTypes": ["major", "minor"],
54-
"enabled": false
74+
matchPackageNames: [
75+
'org.agrona:agrona',
76+
],
77+
matchUpdateTypes: [
78+
'major',
79+
'minor',
80+
],
81+
enabled: false,
5582
},
5683
{
5784
// system-stubs-jupiter 2.1+ requires Java 11+
58-
"matchPackageNames": ["uk.org.webcompere:system-stubs-jupiter"],
59-
"matchUpdateTypes": ["major", "minor"],
60-
"enabled": false
85+
matchPackageNames: [
86+
'uk.org.webcompere:system-stubs-jupiter',
87+
],
88+
matchUpdateTypes: [
89+
'major',
90+
'minor',
91+
],
92+
enabled: false,
6193
},
6294
{
6395
// pinned version for compatibility
64-
"matchPackageNames": ["io.micrometer:micrometer-core"],
65-
"matchCurrentVersion": "1.5.0",
66-
"enabled": false
96+
matchPackageNames: [
97+
'io.micrometer:micrometer-core',
98+
],
99+
matchCurrentVersion: '1.5.0',
100+
enabled: false,
67101
},
68102
{
69103
// pinned version for compatibility
70-
"matchPackagePrefixes": ["org.apache.maven:"],
71-
"matchCurrentVersion": "3.5.0",
72-
"enabled": false
104+
matchCurrentVersion: '3.5.0',
105+
enabled: false,
106+
matchPackageNames: [
107+
'org.apache.maven:{/,}**',
108+
],
73109
},
74110
{
75-
"matchPackagePrefixes": ["com.diffplug.spotless"],
76-
"groupName": "spotless packages"
111+
groupName: 'spotless packages',
112+
matchPackageNames: [
113+
'com.diffplug.spotless{/,}**',
114+
],
77115
},
78116
{
79117
// pinned version for compatibility with java 8 JFR parsing
80-
"matchPackagePrefixes": ["org.openjdk.jmc"],
81-
"matchUpdateTypes": ["major"],
82-
"enabled": false
118+
matchUpdateTypes: [
119+
'major',
120+
],
121+
enabled: false,
122+
matchPackageNames: [
123+
'org.openjdk.jmc{/,}**',
124+
],
83125
},
84126
{
85127
// pinned version for compatibility
86-
"matchFileNames": ["jmx-scraper/test-webapp/build.gradle.kts"],
87-
"matchPackagePrefixes": ["jakarta.servlet:"],
88-
"matchCurrentVersion": "5.0.0",
89-
"enabled": false
90-
}
91-
]
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+
],
136+
},
137+
{
138+
// intentionally using Spring Boot 2 in gcp-auth-extension in order to test with Java 8+
139+
matchFileNames: [
140+
'gcp-auth-extension/build.gradle.kts',
141+
],
142+
matchUpdateTypes: [
143+
'major',
144+
],
145+
enabled: false,
146+
matchPackageNames: [
147+
'org.springframework.boot{/,}**',
148+
],
149+
},
150+
],
151+
customManagers: [
152+
{
153+
customType: 'regex',
154+
datasourceTemplate: 'npm',
155+
fileMatch: [
156+
'^.github/workflows/',
157+
],
158+
matchStrings: [
159+
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',
160+
],
161+
},
162+
],
92163
}

.github/repository-settings.md

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

33
Same
4-
as [opentelemetry-java-instrumentation repository settings](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/.github/repository-settings.md#repository-settings)
5-
,
6-
except that the branch protection rules for `v*` and `gh-pages` are not needed in this repository.
4+
as [opentelemetry-java-instrumentation repository settings](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/.github/repository-settings.md#repository-settings),
5+
except that the rules for `gh-pages` and `cloudfoundry` branches are not relevant in this
6+
repository.

.github/scripts/draft-change-log-entries.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,18 @@ declare -A component_names=()
2727
component_names["aws-resources/"]="AWS resources"
2828
component_names["aws-xray/"]="AWS X-Ray SDK support"
2929
component_names["aws-xray-propagator/"]="AWS X-Ray propagator"
30+
component_names["azure-resources/"]="Azure resources"
3031
component_names["baggage-processor/"]="Baggage processor"
3132
component_names["compressors/"]="Compressors"
3233
component_names["consistent-sampling/"]="Consistent sampling"
3334
component_names["disk-buffering/"]="Disk buffering"
34-
component_names["gcp-resources/"]="GCP Resources"
35+
component_names["gcp-resources/"]="GCP resources"
36+
component_names["gcp-auth-extension/"]="GCP authentication extension"
3537
component_names["inferred-spans/"]="Inferred spans"
3638
component_names["jfr-connection/"]="JFR connection"
3739
component_names["jfr-events/"]="JFR events"
3840
component_names["jmx-metrics/"]="JMX metrics"
41+
component_names["jmx-scraper/"]="JMX scraper"
3942
component_names["kafka-exporter/"]="Kafka exporter"
4043
component_names["maven-extension/"]="Maven extension"
4144
component_names["micrometer-meter-provider/"]="Micrometer MeterProvider"

0 commit comments

Comments
 (0)