Skip to content

Commit 38fb785

Browse files
robsundayrobsunday
committed
Merge branch 'main' into jmx-unit-semconv-alignment
2 parents 1dcd568 + 97e5260 commit 38fb785

File tree

217 files changed

+3316
-775
lines changed

Some content is hidden

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

217 files changed

+3316
-775
lines changed

‎.fossa.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ targets:
7676
- type: gradle
7777
path: ./
7878
target: ':instrumentation:apache-shenyu-2.4:javaagent'
79+
- type: gradle
80+
path: ./
81+
target: ':instrumentation:avaje-jex-3.0:javaagent'
7982
- type: gradle
8083
path: ./
8184
target: ':instrumentation:c3p0-0.9:javaagent'
@@ -721,6 +724,9 @@ targets:
721724
- type: gradle
722725
path: ./
723726
target: ':instrumentation:opensearch:opensearch-rest-1.0:javaagent'
727+
- type: gradle
728+
path: ./
729+
target: ':instrumentation:opensearch:opensearch-rest-3.0:javaagent'
724730
- type: gradle
725731
path: ./
726732
target: ':instrumentation:opensearch:opensearch-rest-common:javaagent'

‎.github/renovate.json5‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
33
extends: [
4-
'config:recommended',
5-
'docker:pinDigests',
6-
'helpers:pinGitHubActionDigests',
4+
'config:best-practices',
5+
'helpers:pinGitHubActionDigestsToSemver',
76
],
87
ignorePaths: [
98
'instrumentation/**',
@@ -32,6 +31,7 @@
3231
'io.opentelemetry.contrib:opentelemetry-aws-resources',
3332
'io.opentelemetry.contrib:opentelemetry-aws-xray-propagator',
3433
'io.opentelemetry.contrib:opentelemetry-gcp-resources',
34+
'io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources',
3535
'io.opentelemetry.contrib:opentelemetry-baggage-processor',
3636
'io.opentelemetry.proto:opentelemetry-proto',
3737
'io.opentelemetry.semconv:opentelemetry-semconv',
@@ -329,8 +329,8 @@
329329
{
330330
customType: 'regex',
331331
datasourceTemplate: 'pypi',
332-
fileMatch: [
333-
'^.github/workflows/',
332+
managerFilePatterns: [
333+
'/^.github/workflows//',
334334
],
335335
matchStrings: [
336336
'pip install (?<depName>[^=]+)==(?<currentValue>[^\\s]+)',
@@ -339,8 +339,8 @@
339339
{
340340
customType: 'regex',
341341
datasourceTemplate: 'npm',
342-
fileMatch: [
343-
'^.github/workflows/',
342+
managerFilePatterns: [
343+
'/^.github/workflows//',
344344
],
345345
matchStrings: [
346346
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Use CLA approved bot
8585
run: .github/scripts/use-cla-approved-bot.sh
8686

87-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
87+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
8888
id: otelbot-token
8989
with:
9090
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/backport.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
32+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ jobs:
242242
- 17
243243
- 21
244244
- 23
245-
- 24-ea
245+
- 24
246+
- 25-ea
246247
vm:
247248
- hotspot
248249
- openj9
@@ -256,7 +257,11 @@ jobs:
256257
- true
257258
exclude:
258259
- vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
259-
- test-java-version: 24-ea
260+
- test-java-version: 23
261+
vm: hotspot
262+
- test-java-version: 24
263+
vm: openj9
264+
- test-java-version: 25-ea
260265
vm: openj9
261266
fail-fast: false
262267
steps:

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
cache-read-only: ${{ github.event_name == 'pull_request' }}
5151

5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
53+
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
5454
with:
5555
languages: java, actions
5656
# using "latest" helps to keep up with the latest Kotlin support
@@ -65,4 +65,4 @@ jobs:
6565
run: ./gradlew assemble -x javadoc -x :instrumentation:quarkus-resteasy-reactive:quarkus3-testing:quarkusGenerateCodeDev -x :instrumentation:quarkus-resteasy-reactive:quarkus2-testing:quarkusGenerateCodeDev --no-build-cache --no-daemon
6666

6767
- name: Perform CodeQL analysis
68-
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
68+
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
- name: 'Checkout Repository'
2020
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121
- name: 'Dependency Review'
22-
uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0
22+
uses: actions/dependency-review-action@38ecb5b593bf0eb19e335c03f97670f792489a8b # v4.7.0

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
45+
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
4646
with:
4747
sarif_file: results.sarif

‎.github/workflows/prepare-patch-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Use CLA approved bot
5252
run: .github/scripts/use-cla-approved-bot.sh
5353

54-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
54+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
5555
id: otelbot-token
5656
with:
5757
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/prepare-release-branch.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Use CLA approved bot
6464
run: .github/scripts/use-cla-approved-bot.sh
6565

66-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
66+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
6767
id: otelbot-token
6868
with:
6969
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -120,7 +120,7 @@ jobs:
120120
- name: Use CLA approved bot
121121
run: .github/scripts/use-cla-approved-bot.sh
122122

123-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
123+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
124124
id: otelbot-token
125125
with:
126126
app-id: ${{ vars.OTELBOT_APP_ID }}

0 commit comments

Comments
 (0)