Skip to content

Commit 08c457e

Browse files
lauritlaurit
committed
Merge branch 'main' into clickhouse-client-v0.8
2 parents ba7169a + d2a267a commit 08c457e

File tree

305 files changed

+4726
-1019
lines changed

Some content is hidden

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

305 files changed

+4726
-1019
lines changed

‎.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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: .github/scripts/gha-free-disk-space.sh
3333

3434
- name: Set up JDK for running Gradle
35-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
35+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3636
with:
3737
distribution: temurin
3838
java-version-file: .java-version
@@ -54,7 +54,7 @@ jobs:
5454
run: .github/scripts/gha-free-disk-space.sh
5555

5656
- name: Set up JDK for running Gradle
57-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
57+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
5858
with:
5959
distribution: temurin
6060
java-version-file: .java-version
@@ -93,7 +93,7 @@ jobs:
9393
run: .github/scripts/gha-free-disk-space.sh
9494

9595
- name: Set up JDK for running Gradle
96-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
96+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
9797
with:
9898
distribution: temurin
9999
java-version-file: .java-version
@@ -133,6 +133,7 @@ jobs:
133133
set +e
134134
grep '^ implementation(".*:.*:[0-9].*")\|^ api(".*:.*:[0-9].*")' \
135135
--include=\*.kts \
136+
--exclude-dir=quarkus\*-plugin \
136137
-r instrumentation \
137138
| grep -v testing/build.gradle.kts \
138139
| grep -v com.azure:azure-core-tracing-opentelemetry \
@@ -176,7 +177,7 @@ jobs:
176177
run: .github/scripts/gha-free-disk-space.sh
177178

178179
- name: Set up JDK for running Gradle
179-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
180+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
180181
with:
181182
distribution: temurin
182183
java-version-file: .java-version
@@ -268,14 +269,14 @@ jobs:
268269

269270
- id: setup-test-java
270271
name: Set up JDK ${{ matrix.test-java-version }}-${{ matrix.vm }} for running tests
271-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
272+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
272273
with:
273274
# using zulu because new releases get published quickly
274275
distribution: ${{ matrix.vm == 'hotspot' && 'zulu' || 'adopt-openj9'}}
275276
java-version: ${{ matrix.test-java-version }}
276277

277278
- name: Set up JDK for running Gradle
278-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
279+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
279280
with:
280281
distribution: temurin
281282
java-version-file: .java-version
@@ -422,7 +423,7 @@ jobs:
422423
run: .github/scripts/gha-free-disk-space.sh
423424

424425
- name: Set up JDK for running Gradle
425-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
426+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
426427
with:
427428
distribution: temurin
428429
java-version-file: .java-version
@@ -474,7 +475,7 @@ jobs:
474475
run: .github/scripts/gha-free-disk-space.sh
475476

476477
- name: Set up JDK for running Gradle
477-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
478+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
478479
with:
479480
distribution: temurin
480481
java-version-file: .java-version
@@ -497,7 +498,7 @@ jobs:
497498
run: .github/scripts/gha-free-disk-space.sh
498499

499500
- name: Set up JDK for running Gradle
500-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
501+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
501502
with:
502503
distribution: temurin
503504
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: 1 addition & 1 deletion
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

‎.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@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
45+
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
4646
with:
4747
sarif_file: results.sarif

0 commit comments

Comments
 (0)