Skip to content

Commit d719e7e

Browse files
Duncan-tree-zhouDuncan-tree-zhou
authored
Merge branch 'main' into add_metric_annotation_instrument
2 parents f4ea230 + 01d8d56 commit d719e7e

File tree

479 files changed

+8910
-2225
lines changed

Some content is hidden

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

479 files changed

+8910
-2225
lines changed

‎.fossa.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ targets:
44
only:
55
# only scanning the modules which are published
66
# (as opposed to internal testing modules
7+
- type: gradle
8+
path: ./
9+
target: ':declarative-config-bridge'
710
- type: gradle
811
path: ./
912
target: ':instrumentation-annotations'
@@ -346,6 +349,12 @@ targets:
346349
- type: gradle
347350
path: ./
348351
target: ':instrumentation:aws-lambda:aws-lambda-events-2.2:library'
352+
- type: gradle
353+
path: ./
354+
target: ':instrumentation:aws-lambda:aws-lambda-events-3.11:library'
355+
- type: gradle
356+
path: ./
357+
target: ':instrumentation:aws-lambda:aws-lambda-events-common-2.2:library'
349358
- type: gradle
350359
path: ./
351360
target: ':instrumentation:aws-sdk:aws-sdk-1.11:javaagent'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
run: .github/scripts/gha-free-disk-space.sh
2323

2424
- name: Set up JDK for running Gradle
25-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
25+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2626
with:
2727
distribution: temurin
2828
java-version-file: .java-version

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
run: .github/scripts/gha-free-disk-space.sh
2323

2424
- name: Set up JDK for running Gradle
25-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
25+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2626
with:
2727
distribution: temurin
2828
java-version-file: .java-version

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
run: .github/scripts/gha-free-disk-space.sh
6767

6868
- name: Set up JDK for running Gradle
69-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
69+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
7070
with:
7171
distribution: temurin
7272
java-version-file: .java-version

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
no-build-cache:
1010
type: boolean
1111
required: false
12-
max-test-retries:
13-
type: string
14-
required: false
1512
skip-openj9-tests:
1613
type: boolean
1714
required: false
@@ -35,7 +32,7 @@ jobs:
3532
run: .github/scripts/gha-free-disk-space.sh
3633

3734
- name: Set up JDK for running Gradle
38-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
35+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3936
with:
4037
distribution: temurin
4138
java-version-file: .java-version
@@ -57,7 +54,7 @@ jobs:
5754
run: .github/scripts/gha-free-disk-space.sh
5855

5956
- name: Set up JDK for running Gradle
60-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
57+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
6158
with:
6259
distribution: temurin
6360
java-version-file: .java-version
@@ -96,7 +93,7 @@ jobs:
9693
run: .github/scripts/gha-free-disk-space.sh
9794

9895
- name: Set up JDK for running Gradle
99-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
96+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
10097
with:
10198
distribution: temurin
10299
java-version-file: .java-version
@@ -136,6 +133,7 @@ jobs:
136133
set +e
137134
grep '^ implementation(".*:.*:[0-9].*")\|^ api(".*:.*:[0-9].*")' \
138135
--include=\*.kts \
136+
--exclude-dir=quarkus\*-plugin \
139137
-r instrumentation \
140138
| grep -v testing/build.gradle.kts \
141139
| grep -v com.azure:azure-core-tracing-opentelemetry \
@@ -179,7 +177,7 @@ jobs:
179177
run: .github/scripts/gha-free-disk-space.sh
180178

181179
- name: Set up JDK for running Gradle
182-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
180+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
183181
with:
184182
distribution: temurin
185183
java-version-file: .java-version
@@ -271,14 +269,14 @@ jobs:
271269

272270
- id: setup-test-java
273271
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
274-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
272+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
275273
with:
276274
# using zulu because new releases get published quickly
277275
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
278276
java-version: ${{ matrix.test-java-version }}
279277

280278
- name: Set up JDK for running Gradle
281-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
279+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
282280
with:
283281
distribution: temurin
284282
java-version-file: .java-version
@@ -425,7 +423,7 @@ jobs:
425423
run: .github/scripts/gha-free-disk-space.sh
426424

427425
- name: Set up JDK for running Gradle
428-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
426+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
429427
with:
430428
distribution: temurin
431429
java-version-file: .java-version
@@ -477,7 +475,7 @@ jobs:
477475
run: .github/scripts/gha-free-disk-space.sh
478476

479477
- name: Set up JDK for running Gradle
480-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
478+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
481479
with:
482480
distribution: temurin
483481
java-version-file: .java-version
@@ -500,7 +498,7 @@ jobs:
500498
run: .github/scripts/gha-free-disk-space.sh
501499

502500
- name: Set up JDK for running Gradle
503-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
501+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
504502
with:
505503
distribution: temurin
506504
java-version-file: .java-version

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
run: .github/scripts/gha-free-disk-space.sh
7171

7272
- name: Set up JDK for running Gradle
73-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
73+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
7474
with:
7575
distribution: temurin
7676
java-version-file: .java-version

‎.github/workflows/codeql.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ jobs:
3939
# don't need to free disk space (which takes time) since running on larger machine
4040

4141
- name: Set up JDK 11
42-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
42+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
4343
with:
4444
distribution: temurin
4545
java-version: 11
4646

4747
- name: Set up JDK for running Gradle
48-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
48+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
4949
with:
5050
distribution: temurin
5151
java-version-file: .java-version
@@ -63,7 +63,7 @@ jobs:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
66+
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
6767
with:
6868
languages: ${{ matrix.language }}
6969
# using "linked" helps to keep up with the linked Kotlin support
@@ -75,10 +75,15 @@ jobs:
7575
# --no-build-cache is required for codeql to analyze all modules
7676
# --no-daemon is required for codeql to observe the compilation
7777
# (see https://docs.github.com/en/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#specifying-build-commands)
78-
# quarkus tasks are disabled because they often cause the build to fail (see https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/13284)
79-
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
78+
# collectReachabilityMetadata tasks are disabled because they often cause the build to fail
79+
run: >
80+
./gradlew assemble -x javadoc
81+
-x :smoke-tests-otel-starter:spring-boot-3:collectReachabilityMetadata
82+
-x :smoke-tests-otel-starter:spring-boot-3.2:collectReachabilityMetadata
83+
-x :smoke-tests-otel-starter:spring-boot-reactive-3:collectReachabilityMetadata
84+
--no-build-cache --no-daemon
8085
8186
- name: Perform CodeQL analysis
82-
uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
87+
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
8388
with:
8489
category: "/language:${{matrix.language}}"

‎.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121
- name: 'Dependency Review'
22-
uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
22+
uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2

‎.github/workflows/documentation-disable-list-audit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616

17-
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
17+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
1818
with:
1919
distribution: temurin
2020
java-version: 17

‎.github/workflows/metadata-update.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: .github/scripts/gha-free-disk-space.sh
2828

2929
- name: Set up JDK for running Gradle
30-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
30+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3131
with:
3232
distribution: temurin
3333
java-version-file: .java-version
@@ -68,7 +68,7 @@ jobs:
6868
env:
6969
GH_TOKEN: ${{ steps.otelbot-token.outputs.token }}
7070
run: |
71-
BRANCH_NAME="metadata-update-main"
71+
BRANCH_NAME="otelbot/metadata-update-main"
7272
echo "branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
7373
if git ls-remote --exit-code --heads origin "$BRANCH_NAME"; then
7474
git fetch origin "$BRANCH_NAME"

0 commit comments

Comments
 (0)