Skip to content

Commit 62e9317

Browse files
cb645jcb645j
authored
Merge branch 'main' into feature/camunda_instrumentation
2 parents 78bc660 + d1a7437 commit 62e9317

File tree

390 files changed

+5816
-2005
lines changed

Some content is hidden

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

390 files changed

+5816
-2005
lines changed

‎.fossa.yml‎

Lines changed: 12 additions & 3 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'
@@ -88,9 +91,6 @@ targets:
8891
- type: gradle
8992
path: ./
9093
target: ':instrumentation:camel-2.20:javaagent'
91-
- type: gradle
92-
path: ./
93-
target: ':instrumentation:clickhouse-client-0.5:javaagent'
9494
- type: gradle
9595
path: ./
9696
target: ':instrumentation:executors:bootstrap'
@@ -397,6 +397,15 @@ targets:
397397
- type: gradle
398398
path: ./
399399
target: ':instrumentation:cassandra:cassandra-4.4:library'
400+
- type: gradle
401+
path: ./
402+
target: ':instrumentation:clickhouse:clickhouse-client-common:javaagent'
403+
- type: gradle
404+
path: ./
405+
target: ':instrumentation:clickhouse:clickhouse-client-v1-0.5:javaagent'
406+
- type: gradle
407+
path: ./
408+
target: ':instrumentation:clickhouse:clickhouse-client-v2-0.8:javaagent'
400409
- type: gradle
401410
path: ./
402411
target: ':instrumentation:couchbase:couchbase-2-common:javaagent'

‎.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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
31+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
31+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
3232
with:
3333
cache-read-only: true
3434

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

Lines changed: 2 additions & 2 deletions
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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
75+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
7676

7777
- name: Update license report
7878
run: ./gradlew generateLicenseReport
@@ -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@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
87+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
8888
id: otelbot-token
8989
with:
9090
app-id: ${{ vars.OTELBOT_APP_ID }}

‎.github/workflows/auto-update-pull-request.yml‎

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

‎.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@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
32+
- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

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

Lines changed: 10 additions & 10 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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
41+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
63+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
102+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
190+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
191191
with:
192192
cache-read-only: ${{ inputs.cache-read-only }}
193193

@@ -283,7 +283,7 @@ jobs:
283283

284284
# vaadin 14 tests fail with node 18
285285
- name: Set up Node
286-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
286+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
287287
with:
288288
node-version: 16
289289

@@ -298,7 +298,7 @@ jobs:
298298
run: .github/scripts/deadlock-detector.sh
299299

300300
- name: Setup Gradle
301-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
301+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
302302
with:
303303
# only push cache for one matrix option since github action cache space is limited
304304
cache-read-only: ${{ inputs.cache-read-only || matrix.test-java-version != 11 || matrix.vm != 'hotspot' }}
@@ -336,7 +336,7 @@ jobs:
336336
- name: Get current job url
337337
id: jobs
338338
if: ${{ !cancelled() }}
339-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
339+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
340340
env:
341341
matrix: ${{ toJson(matrix) }}
342342
with:
@@ -429,7 +429,7 @@ jobs:
429429
java-version-file: .java-version
430430

431431
- name: Set up Gradle cache
432-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
432+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
433433
with:
434434
# only push cache for one matrix option per OS since github action cache space is limited
435435
cache-read-only: ${{ inputs.cache-read-only || matrix.smoke-test-suite != 'tomcat' }}
@@ -481,7 +481,7 @@ jobs:
481481
java-version-file: .java-version
482482

483483
- name: Setup Gradle
484-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
484+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
485485
with:
486486
cache-read-only: ${{ inputs.cache-read-only }}
487487

@@ -504,7 +504,7 @@ jobs:
504504
java-version-file: .java-version
505505

506506
- name: Set up Gradle cache
507-
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
507+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
508508
with:
509509
cache-read-only: ${{ inputs.cache-read-only }}
510510

‎.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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
79+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
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@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
61+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
6262
with:
6363
cache-read-only: ${{ github.event_name == 'pull_request' }}
6464

6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
66+
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
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@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
87+
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
8888
with:
8989
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@bc41886e18ea39df68b1b1245f4184881938e050 # v4.7.2
22+
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3

0 commit comments

Comments
 (0)