Skip to content

Commit 133437b

Browse files
jaydelucajaydeluca
authored
Merge branch 'main' into breaking-automation
2 parents 1d8b83d + d49a0f5 commit 133437b

File tree

388 files changed

+9765
-2866
lines changed

Some content is hidden

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

388 files changed

+9765
-2866
lines changed

‎.fossa.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,12 @@ targets:
136136
- type: gradle
137137
path: ./
138138
target: ':instrumentation:gwt-2.0:javaagent'
139+
- type: gradle
140+
path: ./
141+
target: ':instrumentation:helidon-4.3:javaagent'
142+
- type: gradle
143+
path: ./
144+
target: ':instrumentation:helidon-4.3:library'
139145
- type: gradle
140146
path: ./
141147
target: ':instrumentation:hikaricp-3.0:javaagent'
@@ -709,6 +715,12 @@ targets:
709715
- type: gradle
710716
path: ./
711717
target: ':instrumentation:mongo:mongo-async-3.3:javaagent'
718+
- type: gradle
719+
path: ./
720+
target: ':instrumentation:nats:nats-2.17:javaagent'
721+
- type: gradle
722+
path: ./
723+
target: ':instrumentation:nats:nats-2.17:library'
712724
- type: gradle
713725
path: ./
714726
target: ':instrumentation:netty:netty-3.8:javaagent'
@@ -745,6 +757,9 @@ targets:
745757
- type: gradle
746758
path: ./
747759
target: ':instrumentation:openai:openai-java-1.1:library'
760+
- type: gradle
761+
path: ./
762+
target: ':instrumentation:opensearch:opensearch-java-3.0:javaagent'
748763
- type: gradle
749764
path: ./
750765
target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'

‎.lychee.toml‎ renamed to ‎.github/config/lychee.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ exclude = [
2121
'^http://code.google.com/p/concurrentlinkedhashmap$',
2222
'^https://softwareengineering.stackexchange.com/questions/29727.*',
2323
'^https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/opentelemetry/$',
24+
# new artifact, remove after 2.21.0 release
25+
'^https://central.sonatype.com/artifact/io.opentelemetry.instrumentation/opentelemetry-helidon-4.3$',
2426
]

‎.github/renovate.json5‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
// junit 6+ requires Java 17+
117117
matchPackageNames: [
118118
'org.junit:**',
119+
'org.junit.jupiter:**',
119120
],
120121
matchUpdateTypes: [
121122
'major',
@@ -346,6 +347,20 @@
346347
},
347348
],
348349
customManagers: [
350+
{
351+
customType: 'regex',
352+
datasourceTemplate: 'java-version',
353+
managerFilePatterns: [
354+
'.github/workflows/**',
355+
'**/*.gradle.kts'
356+
],
357+
matchStrings: [
358+
'(?<currentValue>\\d+) # renovate: datasource=java-version',
359+
'"(?<currentValue>\\d+)" // renovate: datasource=java-version',
360+
],
361+
depNameTemplate: 'java',
362+
extractVersionTemplate: '^(?<version>\\d+)',
363+
},
349364
{
350365
customType: 'regex',
351366
datasourceTemplate: 'pypi',

‎.github/scripts/check-package-names.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ for dir in $(find instrumentation -name "*.java" | grep library/src/main/java |
2929
if [[ "$dir" == "instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/lettuce/core/protocol" ]]; then
3030
continue
3131
fi
32+
if [[ "$dir" == "instrumentation/nats/nats-2.17/library/src/main/java/io/nats/client/impl" ]]; then
33+
continue
34+
fi
3235

3336
# some common modules don't have any base version
3437
# - lettuce-common

‎.github/scripts/dependencies.dockerfile‎

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

‎.github/scripts/link-check.sh‎

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

‎.github/workflows/auto-license-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version-file: .java-version
2929

3030
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
31+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3232
with:
3333
cache-read-only: true
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version-file: .java-version
2929

3030
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
31+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3232
with:
3333
cache-read-only: true
3434

‎.github/workflows/auto-update-otel-sdk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
java-version-file: .java-version
7373

7474
- name: Setup Gradle
75-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
75+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
7676

7777
- name: Update license report
7878
run: ./gradlew generateLicenseReport

‎.github/workflows/build-common.yml‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
java-version-file: .java-version
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
41+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
4242
with:
4343
cache-read-only: ${{ inputs.cache-read-only }}
4444

@@ -60,7 +60,7 @@ jobs:
6060
java-version-file: .java-version
6161

6262
- name: Setup Gradle
63-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
63+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
6464
with:
6565
cache-read-only: ${{ inputs.cache-read-only }}
6666

@@ -99,7 +99,7 @@ jobs:
9999
java-version-file: .java-version
100100

101101
- name: Setup Gradle
102-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
102+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
103103
with:
104104
cache-read-only: ${{ inputs.cache-read-only }}
105105

@@ -187,7 +187,7 @@ jobs:
187187
sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
188188
189189
- name: Setup Gradle
190-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
190+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
191191
with:
192192
cache-read-only: ${{ inputs.cache-read-only }}
193193

@@ -238,9 +238,7 @@ jobs:
238238
- 11
239239
- 17
240240
- 21
241-
- 23
242-
- 24
243-
- 25-ea
241+
- 25 # renovate: datasource=java-version
244242
vm:
245243
- hotspot
246244
- openj9
@@ -254,12 +252,6 @@ jobs:
254252
- true
255253
exclude:
256254
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
257-
- test-java-version: 23
258-
vm: hotspot
259-
- test-java-version: 24
260-
vm: openj9
261-
- test-java-version: 25-ea
262-
vm: openj9
263255
fail-fast: false
264256
steps:
265257
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -298,7 +290,7 @@ jobs:
298290
run: .github/scripts/deadlock-detector.sh
299291

300292
- name: Setup Gradle
301-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
293+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
302294
with:
303295
# only push cache for one matrix option since github action cache space is limited
304296
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -342,22 +334,27 @@ jobs:
342334
with:
343335
result-encoding: string
344336
script: |
345-
const matrix = JSON.parse(process.env.matrix);
346-
const job_name = `common / test${ matrix['test-partition'] } (${ matrix['test-java-version'] }, ${ matrix.vm }, indy ${ matrix['test-indy'] })`;
347-
348-
const workflow_jobs_nested = await github.paginate(
349-
github.rest.actions.listJobsForWorkflowRun,
350-
{
351-
owner: context.repo.owner,
352-
repo: context.repo.repo,
353-
run_id: context.runId,
354-
per_page: 100
355-
},
356-
(response) => {
357-
return response.data;
358-
},
359-
);
360-
return workflow_jobs_nested.flat().find((job) => job.name === job_name).html_url;
337+
try {
338+
const matrix = JSON.parse(process.env.matrix);
339+
const job_name = `common / test${ matrix['test-partition'] } (${ matrix['test-java-version'] }, ${ matrix.vm }, indy ${ matrix['test-indy'] })`;
340+
const workflow_jobs_nested = await github.paginate(
341+
github.rest.actions.listJobsForWorkflowRun,
342+
{
343+
owner: context.repo.owner,
344+
repo: context.repo.repo,
345+
run_id: context.runId,
346+
per_page: 100
347+
},
348+
(response) => {
349+
return response.data;
350+
},
351+
);
352+
const job = workflow_jobs_nested.flat().find((job) => job.name === job_name);
353+
return job ? job.html_url : '';
354+
} catch (e) {
355+
core.warning(`Failed to get current job url: ${e}`);
356+
return '';
357+
}
361358
362359
- name: Flaky test report
363360
if: ${{ !cancelled() }}
@@ -429,7 +426,7 @@ jobs:
429426
java-version-file: .java-version
430427

431428
- name: Set up Gradle cache
432-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
429+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
433430
with:
434431
# only push cache for one matrix option per OS since github action cache space is limited
435432
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -481,7 +478,7 @@ jobs:
481478
java-version-file: .java-version
482479

483480
- name: Setup Gradle
484-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
481+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
485482
with:
486483
cache-read-only: ${{ inputs.cache-read-only }}
487484

@@ -504,7 +501,7 @@ jobs:
504501
java-version-file: .java-version
505502

506503
- name: Set up Gradle cache
507-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
504+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
508505
with:
509506
cache-read-only: ${{ inputs.cache-read-only }}
510507

0 commit comments

Comments
 (0)