Skip to content

Commit cd6143e

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-contrib into stable-service-id
2 parents f46cf5c + eb34677 commit cd6143e

File tree

255 files changed

+1812
-1206
lines changed

Some content is hidden

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

255 files changed

+1812
-1206
lines changed
File renamed without changes.

.github/copilot-instructions.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,33 @@ This repository provides observability instrumentation for Java applications.
2929
- Resource cleanup and lifecycle management
3030
- Comprehensive unit tests for new functionality
3131

32+
### Test suites
33+
34+
This project uses gradle 9 which requires specifying test classes and paths explicitly.
35+
36+
For example, this will NOT work because it registers a `Test` without specifying the test classes or paths:
37+
38+
```kotlin
39+
tasks.register<Test>("IntegrationTestUserCreds") {
40+
dependsOn(tasks.shadowJar)
41+
dependsOn(tasks.named("copyAgent"))
42+
...
43+
}
44+
```
45+
46+
This is fixed by specifying the test classes and classpath explicitly:
47+
48+
```kotlin
49+
tasks.register<Test>("IntegrationTestUserCreds") {
50+
testClassesDirs = sourceSets.test.get().output.classesDirs
51+
classpath = sourceSets.test.get().runtimeClasspath
52+
53+
dependsOn(tasks.shadowJar)
54+
dependsOn(tasks.named("copyAgent"))
55+
...
56+
}
57+
```
58+
3259
## Coding Agent Instructions
3360

3461
When implementing changes or new features:

.github/renovate.json5

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
],
8686
enabled: false,
8787
matchPackageNames: [
88-
'org.mockito:{/,}**',
88+
'org.mockito:**',
8989
],
9090
},
9191
{
@@ -123,25 +123,33 @@
123123
matchCurrentVersion: '3.5.0',
124124
enabled: false,
125125
matchPackageNames: [
126-
'org.apache.maven:{/,}**',
126+
'org.apache.maven:**',
127127
],
128128
},
129129
{
130130
groupName: 'spotless packages',
131131
matchPackageNames: [
132-
'com.diffplug.spotless{/,}**',
132+
'com.diffplug.spotless',
133+
'com.diffplug.spotless:**',
133134
],
134135
},
135136
{
136137
groupName: 'hipparchus packages',
137138
matchPackageNames: [
138-
'org.hipparchus{/,}**',
139+
'org.hipparchus:**',
139140
],
140141
},
141142
{
142143
groupName: 'errorprone packages',
143144
matchPackageNames: [
144-
'com.google.errorprone{/,}**',
145+
'com.google.errorprone:**',
146+
],
147+
},
148+
{
149+
groupName: 'jackson packages',
150+
matchPackageNames: [
151+
'com.fasterxml.jackson:**',
152+
'com.fasterxml.jackson.core:**',
145153
],
146154
},
147155
{
@@ -151,7 +159,7 @@
151159
],
152160
enabled: false,
153161
matchPackageNames: [
154-
'org.openjdk.jmc{/,}**',
162+
'org.openjdk.jmc:**',
155163
],
156164
},
157165
{
@@ -162,7 +170,7 @@
162170
matchCurrentVersion: '5.0.0',
163171
enabled: false,
164172
matchPackageNames: [
165-
'jakarta.servlet:{/,}**',
173+
'jakarta.servlet:**',
166174
],
167175
},
168176
{
@@ -175,7 +183,7 @@
175183
],
176184
enabled: false,
177185
matchPackageNames: [
178-
'org.springframework.boot{/,}**',
186+
'org.springframework.boot:**',
179187
],
180188
},
181189
],
@@ -202,5 +210,15 @@
202210
depNameTemplate: 'java',
203211
extractVersionTemplate: '^(?<version>\\d+)',
204212
},
213+
{
214+
customType: 'regex',
215+
datasourceTemplate: 'github-releases',
216+
managerFilePatterns: [
217+
'**/build.gradle.kts',
218+
],
219+
matchStrings: [
220+
'"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
221+
],
222+
},
205223
],
206224
}

.github/scripts/dependencies.Dockerfile

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

.github/scripts/link-check.sh

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

.github/scripts/package-lock.json

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/scripts/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"//": "Dependencies for GitHub Actions workflows that use actions/github-script",
3+
"name": "github-scripts",
4+
"version": "1.0.0",
5+
"private": true,
6+
"dependencies": {
7+
"yaml": "2.8.1"
8+
}
9+
}

.github/workflows/assign-issue-owners.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
- name: Checkout repository
2020
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121

22-
- name: Install js-yaml
23-
run: npm install js-yaml
22+
- name: Install yaml dependency used below
23+
run: npm install .github/scripts
2424

2525
- name: Parse component label and assign owners
26-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
26+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
2727
with:
2828
script: |
2929
const fs = require('fs');
30-
const yaml = require('js-yaml');
30+
const { parse } = require('yaml');
3131
3232
// Extract component name from label
3333
const labelName = context.payload.label.name;
@@ -42,7 +42,7 @@ jobs:
4242
4343
// Read and parse component_owners.yml
4444
const yamlContent = fs.readFileSync('.github/component_owners.yml', 'utf8');
45-
const data = yaml.load(yamlContent);
45+
const data = parse(yamlContent);
4646
4747
if (!data || !data.components) {
4848
core.setFailed('Invalid component_owners.yml structure');

.github/workflows/assign-reviewers.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
pull-requests: write # for assigning reviewers
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: open-telemetry/assign-reviewers-action@2f4f06ccc561740d5094d9ca5e66dc2392d13e8f # main
21+
- uses: dyladan/component-owners@58bd86e9814d23f1525d0a970682cead459fa783 # v0.1.0
2222
with:
2323
config-file: .github/component_owners.yml
24+
assign-owners: false

.github/workflows/auto-spotless-apply.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo "exists=true" >> $GITHUB_OUTPUT
3333
fi
3434
35-
- uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
35+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
3636
if: steps.unzip-patch.outputs.exists == 'true'
3737
id: otelbot-token
3838
with:

0 commit comments

Comments
 (0)