Skip to content

Commit abda9aa

Browse files
committed
merge main
2 parents 636bf5a + 1ac3dee commit abda9aa

File tree

250 files changed

+4991
-1502
lines changed

Some content is hidden

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

250 files changed

+4991
-1502
lines changed

.github/scripts/markdown-link-check-config.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/scripts/markdown-link-check-with-retry.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/codeql-daily.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
java-version-file: .java-version
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
33+
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
3434
with:
3535
languages: java
3636
# using "latest" helps to keep up with the latest Kotlin support
@@ -45,7 +45,7 @@ jobs:
4545
run: ./gradlew assemble -x javadoc --no-build-cache --no-daemon
4646

4747
- name: Perform CodeQL analysis
48-
uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
48+
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
4949

5050
workflow-notification:
5151
needs:

.github/workflows/reusable-markdown-link-check.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414

15-
- name: Install markdown-link-check
16-
# https://github.com/tcort/markdown-link-check/issues/297
17-
run: npm install -g [email protected]
18-
19-
- name: Run markdown-link-check
20-
run: |
21-
find . -type f \
22-
-name '*.md' \
23-
-not -path './CHANGELOG.md' \
24-
-not -path './licenses/*' \
25-
-not -path '*/build/*' \
26-
| xargs .github/scripts/markdown-link-check-with-retry.sh
15+
- uses: lycheeverse/lychee-action@v2
16+
with:
17+
# remove version after next release of lychee-action
18+
lycheeVersion: latest
19+
# excluding links to pull requests and issues is done for performance
20+
args: >
21+
--include-fragments
22+
--exclude "^https://github.com/open-telemetry/opentelemetry-java-instrumentation/(issue|pull)/\\d+$"
23+
--exclude "^http://code.google.com/p/concurrentlinkedhashmap$"
24+
--max-retries 6
25+
.

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ jobs:
6464

6565
# Upload the results to GitHub's code scanning dashboard.
6666
- name: "Upload to code-scanning"
67-
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
67+
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
6868
with:
6969
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 62 additions & 25 deletions
Large diffs are not rendered by default.

benchmark-overhead-jmh/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ otelJava {
1313
}
1414

1515
dependencies {
16-
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.0")
16+
jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.1")
1717
}
1818

1919
tasks {

benchmark-overhead/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repositories {
1616
}
1717

1818
dependencies {
19-
implementation(enforcedPlatform("org.junit:junit-bom:5.11.3"))
19+
implementation(enforcedPlatform("org.junit:junit-bom:5.11.4"))
2020

2121
testImplementation("org.testcontainers:testcontainers:1.20.4")
2222
testImplementation("org.testcontainers:postgresql:1.20.4")

benchmark-overhead/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

benchmark-overhead/gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

0 commit comments

Comments
 (0)