Skip to content

Commit 374b3ed

Browse files
schmikeischmikei
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-contrib into feat/add-uptime-and-openfd-jvm-target-metrics
2 parents 9bcbf44 + 9314975 commit 374b3ed

File tree

225 files changed

+4652
-4456
lines changed

Some content is hidden

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

225 files changed

+4652
-4456
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ body:
2828
- resource-providers
2929
- runtime-attach
3030
- samplers
31-
- static-instrumenter
3231
- type: textarea
3332
attributes:
3433
label: What happened?

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ body:
2828
- resource-providers
2929
- runtime-attach
3030
- samplers
31-
- static-instrumenter
3231
- type: textarea
3332
attributes:
3433
label: Is your feature request related to a problem? Please describe.

‎.github/component_owners.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ components:
2525
baggage-processor:
2626
- mikegoldsmith
2727
- zeitlinger
28+
cloudfoundry-resources:
29+
- KarstenSchnitter
2830
compressors:
2931
- jack-berg
3032
consistent-sampling:
@@ -74,8 +76,6 @@ components:
7476
samplers:
7577
- trask
7678
- jack-berg
77-
static-instrumenter:
78-
- anosek-an
7979
kafka-exporter:
8080
- spockz
8181
- vincentfree

‎.github/config/markdown-lint-config.yml‎ renamed to ‎.github/config/markdownlint.yml‎

File renamed without changes.

‎.github/renovate.json5‎

Lines changed: 119 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,164 @@
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+
prHourlyLimit: 5,
12+
packageRules: [
13+
{
14+
// this is to reduce the number of renovate PRs
15+
matchManagers: [
16+
'github-actions',
17+
'dockerfile',
18+
],
19+
extends: [
20+
'schedule:weekly',
21+
],
22+
groupName: 'weekly update',
23+
},
724
{
8-
"matchPackageNames": [
9-
"io.opentelemetry:**",
10-
"io.opentelemetry.instrumentation:**",
11-
"io.opentelemetry.semconv:**",
12-
"io.opentelemetry.proto:**"
25+
matchPackageNames: [
26+
'io.opentelemetry:**',
27+
'io.opentelemetry.instrumentation:**',
28+
'io.opentelemetry.semconv:**',
29+
'io.opentelemetry.proto:**',
1330
],
1431
// Renovate's default behavior is only to update from unstable -> unstable if it's for the
1532
// major.minor.patch, under the assumption that you would want to update to the stable version
1633
// 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"
34+
ignoreUnstable: false,
2635
},
2736
{
2837
// prevent 3.0.1u2 -> 3.0.1
29-
"matchPackageNames": ["com.google.code.findbugs:annotations"],
30-
"allowedVersions": "!/^3\\.0\\.1$/"
38+
matchPackageNames: [
39+
'com.google.code.findbugs:annotations',
40+
],
41+
allowedVersions: '!/^3\\.0\\.1$/',
3142
},
3243
{
3344
// disruptor 4+ requires Java 11+
34-
"matchPackageNames": ["com.lmax:disruptor"],
35-
"matchUpdateTypes": ["major"],
36-
"enabled": false
45+
matchPackageNames: [
46+
'com.lmax:disruptor',
47+
],
48+
matchUpdateTypes: [
49+
'major',
50+
],
51+
enabled: false,
3752
},
3853
{
3954
// junit-pioneer 2+ requires Java 11+
40-
"matchPackageNames": ["org.junit-pioneer:junit-pioneer"],
41-
"matchUpdateTypes": ["major"],
42-
"enabled": false
55+
matchPackageNames: [
56+
'org.junit-pioneer:junit-pioneer',
57+
],
58+
matchUpdateTypes: [
59+
'major',
60+
],
61+
enabled: false,
4362
},
4463
{
4564
// mockito 5+ requires Java 11+
46-
"matchPackagePrefixes": ["org.mockito:"],
47-
"matchUpdateTypes": ["major"],
48-
"enabled": false
65+
matchUpdateTypes: [
66+
'major',
67+
],
68+
enabled: false,
69+
matchPackageNames: [
70+
'org.mockito:{/,}**',
71+
],
4972
},
5073
{
5174
// agrona 1.23+ requires Java 17+
52-
"matchPackageNames": ["org.agrona:agrona"],
53-
"matchUpdateTypes": ["major", "minor"],
54-
"enabled": false
75+
matchPackageNames: [
76+
'org.agrona:agrona',
77+
],
78+
matchUpdateTypes: [
79+
'major',
80+
'minor',
81+
],
82+
enabled: false,
5583
},
5684
{
5785
// system-stubs-jupiter 2.1+ requires Java 11+
58-
"matchPackageNames": ["uk.org.webcompere:system-stubs-jupiter"],
59-
"matchUpdateTypes": ["major", "minor"],
60-
"enabled": false
86+
matchPackageNames: [
87+
'uk.org.webcompere:system-stubs-jupiter',
88+
],
89+
matchUpdateTypes: [
90+
'major',
91+
'minor',
92+
],
93+
enabled: false,
6194
},
6295
{
6396
// pinned version for compatibility
64-
"matchPackageNames": ["io.micrometer:micrometer-core"],
65-
"matchCurrentVersion": "1.5.0",
66-
"enabled": false
97+
matchPackageNames: [
98+
'io.micrometer:micrometer-core',
99+
],
100+
matchCurrentVersion: '1.5.0',
101+
enabled: false,
67102
},
68103
{
69104
// pinned version for compatibility
70-
"matchPackagePrefixes": ["org.apache.maven:"],
71-
"matchCurrentVersion": "3.5.0",
72-
"enabled": false
105+
matchCurrentVersion: '3.5.0',
106+
enabled: false,
107+
matchPackageNames: [
108+
'org.apache.maven:{/,}**',
109+
],
73110
},
74111
{
75-
"matchPackagePrefixes": ["com.diffplug.spotless"],
76-
"groupName": "spotless packages"
112+
groupName: 'spotless packages',
113+
matchPackageNames: [
114+
'com.diffplug.spotless{/,}**',
115+
],
77116
},
78117
{
79118
// pinned version for compatibility with java 8 JFR parsing
80-
"matchPackagePrefixes": ["org.openjdk.jmc"],
81-
"matchUpdateTypes": ["major"],
82-
"enabled": false
119+
matchUpdateTypes: [
120+
'major',
121+
],
122+
enabled: false,
123+
matchPackageNames: [
124+
'org.openjdk.jmc{/,}**',
125+
],
83126
},
84127
{
85128
// 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
129+
matchFileNames: [
130+
'jmx-scraper/test-webapp/build.gradle.kts',
131+
],
132+
matchCurrentVersion: '5.0.0',
133+
enabled: false,
134+
matchPackageNames: [
135+
'jakarta.servlet:{/,}**',
136+
],
90137
},
91138
{
92139
// intentionally using Spring Boot 2 in gcp-auth-extension in order to test with Java 8+
93-
"matchFileNames": [
94-
"gcp-auth-extension/build.gradle.kts"
140+
matchFileNames: [
141+
'gcp-auth-extension/build.gradle.kts',
95142
],
96-
"matchPackagePrefixes": [
97-
"org.springframework.boot"
143+
matchUpdateTypes: [
144+
'major',
98145
],
99-
"matchUpdateTypes": ["major"],
100-
"enabled": false,
101-
}
102-
]
146+
enabled: false,
147+
matchPackageNames: [
148+
'org.springframework.boot{/,}**',
149+
],
150+
},
151+
],
152+
customManagers: [
153+
{
154+
customType: 'regex',
155+
datasourceTemplate: 'npm',
156+
fileMatch: [
157+
'^.github/workflows/',
158+
],
159+
matchStrings: [
160+
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',
161+
],
162+
},
163+
],
103164
}

‎.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ component_names["aws-xray/"]="AWS X-Ray SDK support"
2929
component_names["aws-xray-propagator/"]="AWS X-Ray propagator"
3030
component_names["azure-resources/"]="Azure resources"
3131
component_names["baggage-processor/"]="Baggage processor"
32+
component_names["cloudfoundry-resources/"]="CloudFoundry resources"
3233
component_names["compressors/"]="Compressors"
3334
component_names["consistent-sampling/"]="Consistent sampling"
3435
component_names["disk-buffering/"]="Disk buffering"
@@ -49,7 +50,6 @@ component_names["runtime-attach/"]="Runtime attach"
4950
component_names["resource-providers/"]="Resource providers"
5051
component_names["samplers/"]="Samplers"
5152
component_names["span-stacktrace/"]="Span stack traces"
52-
component_names["static-instrumenter/"]="Static instrumenter"
5353

5454
echo "## Unreleased"
5555
echo

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,5 @@ echo $contributors1 $contributors2 \
8888
| grep -v dependabot \
8989
| grep -v renovate \
9090
| grep -v opentelemetrybot \
91+
| grep -v otelbot \
9192
| sed 's/^/@/'

0 commit comments

Comments
 (0)