Skip to content

Commit dec5a55

Browse files
authored
Merge branch 'main' into fix-logic-errors
2 parents 0951c31 + 52413f3 commit dec5a55

File tree

242 files changed

+5664
-4074
lines changed

Some content is hidden

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

242 files changed

+5664
-4074
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# this file exists so that Renovate can auto-update docker image versions that are then used elsewhere
22

3-
FROM lycheeverse/lychee:sha-2aa22f8@sha256:2e3786630482c41f9f2dd081e06d7da1c36d66996e8cf6573409b8bc418d48c4 AS lychee
3+
FROM lycheeverse/lychee:sha-8222559@sha256:6f49010cc46543af3b765f19d5319c0cdd4e8415d7596e1b401d5b4cec29c799 AS lychee

.github/workflows/build-common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ jobs:
289289

290290
# vaadin tests use pnpm
291291
- name: Cache pnpm modules
292-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
292+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
293293
with:
294294
path: ~/.pnpm-store
295295
key: ${{ runner.os }}-test-cache-pnpm-modules

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
66+
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
87+
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
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@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
22+
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0

.github/workflows/documentation-synchronization-audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Documentation Synchronization Audit (opentelemetry.io)
22

33
on:
44
schedule:
5-
- cron: "30 1 * * *" # daily at 1:30 UTC
5+
- cron: "30 1 * * 1" # every Monday at 1:30 UTC
66
workflow_dispatch:
77

88
permissions:

.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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
45+
uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
4646
with:
4747
sarif_file: results.sarif

.github/workflows/overhead-benchmark-daily.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,18 @@ jobs:
2828
run: |
2929
rsync -avv gh-pages/benchmark-overhead/results/ benchmark-overhead/results/
3030
31+
- name: Set up JDK for running Gradle
32+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
33+
with:
34+
distribution: temurin
35+
java-version-file: .java-version
36+
3137
- name: Setup Gradle
3238
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
3339

40+
- name: Build Latest Snapshot JAR
41+
run: ./gradlew assemble -x javadoc
42+
3443
- name: Run tests
3544
working-directory: benchmark-overhead
3645
run: ./gradlew test
@@ -42,17 +51,15 @@ jobs:
4251
- name: Copy results back to gh-pages branch
4352
run: rsync -avv benchmark-overhead/results/ gh-pages/benchmark-overhead/results/ && rm -rf benchmark-overhead/results
4453

54+
- name: Use CLA approved bot
55+
run: .github/scripts/use-cla-approved-bot.sh
56+
4557
- name: Commit updated results
46-
uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4
47-
with:
48-
add: "benchmark-overhead/results"
49-
cwd: "./gh-pages"
50-
branch: "gh-pages"
51-
message: "update test result data"
52-
author_name: otelbot
53-
author_email: [email protected]
54-
committer_name: otelbot
55-
committer_email: [email protected]
58+
working-directory: ./gh-pages
59+
run: |
60+
git add benchmark-overhead/results
61+
git commit -m "update test result data"
62+
git push
5663
5764
workflow-notification:
5865
permissions:

.github/workflows/reusable-native-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2828
- id: read-java
2929
run: echo "version=$(cat .java-version)" >> "$GITHUB_OUTPUT"
30-
- uses: graalvm/setup-graalvm@aba6a077d71fbfc02138d7470c4ad6e7f85bd2a9 # v1.3.7.1
30+
- uses: graalvm/setup-graalvm@e140024fdc2d95d3c7e10a636887a91090d29990 # v1.4.0.1
3131
with:
3232
version: "latest"
3333
java-version: ${{ matrix.test-java-version }}

.github/workflows/reusable-test-latest-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
# vaadin tests use pnpm
4848
- name: Cache pnpm modules
49-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
49+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
5050
with:
5151
path: ~/.pnpm-store
5252
key: ${{ runner.os }}-test-latest-cache-pnpm-modules

.lychee.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@ max_concurrency = 4
66
# Check link anchors
77
include_fragments = true
88

9+
remap = [
10+
# workaround for https://github.com/lycheeverse/lychee/issues/1729
11+
"https://github.com/(.*?)/(.*?)/blob/(.*?)/(.*#.*)$ https://raw.githubusercontent.com/$1/$2/$3/$4",
12+
"https://docs.oracle.com/(.*)#.*$ https://docs.oracle.com/$1"
13+
]
14+
915
# excluding links to pull requests and issues is done for performance
1016
# stackexchange link fails with 403 when accessed by lychee
1117
exclude = [
18+
# workaround for https://github.com/lycheeverse/lychee/issues/1729
19+
'^https://github.com/.*#issuecomment-.*$',
1220
'^https://github.com/open-telemetry/opentelemetry-java-instrumentation/(issues|pull)/\d+$',
1321
'^http://code.google.com/p/concurrentlinkedhashmap$',
1422
'^https://softwareengineering.stackexchange.com/questions/29727.*',

0 commit comments

Comments
 (0)