Skip to content

Commit b596801

Browse files
jaydelucajaydeluca
authored
Merge branch 'main' into copilot/fix-14769
2 parents b2e326d + c48dfea commit b596801

File tree

506 files changed

+12002
-5726
lines changed

Some content is hidden

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

506 files changed

+12002
-5726
lines changed

‎.fossa.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,12 @@ targets:
709709
- type: gradle
710710
path: ./
711711
target: ':instrumentation:mongo:mongo-async-3.3:javaagent'
712+
- type: gradle
713+
path: ./
714+
target: ':instrumentation:nats:nats-2.17:javaagent'
715+
- type: gradle
716+
path: ./
717+
target: ':instrumentation:nats:nats-2.17:library'
712718
- type: gradle
713719
path: ./
714720
target: ':instrumentation:netty:netty-3.8:javaagent'

‎.github/renovate.json5‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,17 @@
112112
'io.opentelemetry:{/,}**',
113113
],
114114
},
115+
{
116+
// junit 6+ requires Java 17+
117+
matchPackageNames: [
118+
'org.junit:**',
119+
'org.junit.jupiter:**',
120+
],
121+
matchUpdateTypes: [
122+
'major',
123+
],
124+
enabled: false,
125+
},
115126
{
116127
// junit-pioneer 2+ requires Java 11+
117128
matchPackageNames: [
@@ -336,6 +347,18 @@
336347
},
337348
],
338349
customManagers: [
350+
{
351+
customType: 'regex',
352+
datasourceTemplate: 'java-version',
353+
managerFilePatterns: [
354+
'.github/workflows/**'
355+
],
356+
matchStrings: [
357+
'(?<currentValue>\\d+) # renovate: datasource=java-version',
358+
],
359+
depNameTemplate: 'java',
360+
extractVersionTemplate: '^(?<version>\\d+)',
361+
},
339362
{
340363
customType: 'regex',
341364
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# this file exists so that Renovate can auto-update docker image versions that are then used elsewhere
22

3-
FROM lycheeverse/lychee:sha-2aa22f8@sha256:2e3786630482c41f9f2dd081e06d7da1c36d66996e8cf6573409b8bc418d48c4 AS lychee
3+
FROM lycheeverse/lychee:sha-8222559@sha256:6f49010cc46543af3b765f19d5319c0cdd4e8415d7596e1b401d5b4cec29c799 AS lychee

‎.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: 31 additions & 34 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
@@ -289,7 +281,7 @@ jobs:
289281

290282
# vaadin tests use pnpm
291283
- name: Cache pnpm modules
292-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
284+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
293285
with:
294286
path: ~/.pnpm-store
295287
key: ${{ runner.os }}-test-cache-pnpm-modules
@@ -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

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
java-version-file: .java-version
7777

7878
- name: Setup Gradle
79-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
79+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
8080

8181
- name: Build and publish artifact snapshots
8282
env:

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ jobs:
5858
5959
- name: Set up Gradle
6060
if: matrix.language == 'java'
61-
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
61+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
6262
with:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
66+
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
6767
with:
6868
languages: ${{ matrix.language }}
6969
# using "linked" helps to keep up with the linked Kotlin support
@@ -84,6 +84,6 @@ jobs:
8484
--no-build-cache --no-daemon
8585
8686
- name: Perform CodeQL analysis
87-
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
87+
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
8888
with:
8989
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)