Skip to content

Commit c1f1277

Browse files
SentryManSentryMan
authored
Merge branch 'main' into feature/helidon
2 parents 4c7d96c + a548f7e commit c1f1277

File tree

461 files changed

+10770
-5608
lines changed

Some content is hidden

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

461 files changed

+10770
-5608
lines changed

‎.fossa.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ targets:
100100
- type: gradle
101101
path: ./
102102
target: ':instrumentation:external-annotations:javaagent'
103+
- type: gradle
104+
path: ./
105+
target: ':instrumentation:failsafe-3.0:library'
103106
- type: gradle
104107
path: ./
105108
target: ':instrumentation:finagle-http-23.11:javaagent'

‎.github/scripts/dependencies.dockerfile‎

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-disable-list-audit.yml‎

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

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Documentation Synchronization Audit (opentelemetry.io)
2+
3+
on:
4+
schedule:
5+
- cron: "30 1 * * 1" # every Monday at 1:30 UTC
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
crawl:
13+
runs-on: ubuntu-latest
14+
outputs:
15+
audit-output: ${{ steps.audit.outputs.AUDIT_OUTPUT }}
16+
steps:
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
18+
19+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
20+
with:
21+
distribution: temurin
22+
java-version: 17
23+
24+
- name: Set up gradle
25+
uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3
26+
27+
- name: Run instrumentation analyzer (identify any module changes)
28+
run: ./gradlew :instrumentation-docs:runAnalysis
29+
30+
- name: Run doc site audit
31+
id: audit
32+
run: |
33+
if ! output=$(./gradlew :instrumentation-docs:docSiteAudit 2>&1); then
34+
echo "AUDIT_FAILED=true" >> $GITHUB_OUTPUT
35+
echo "AUDIT_OUTPUT<<EOF" >> $GITHUB_OUTPUT
36+
# Extract only the content between our custom markers
37+
echo "$output" | sed -n '/=== AUDIT_FAILURE_START ===/,/=== AUDIT_FAILURE_END ===/p' | \
38+
sed '/=== AUDIT_FAILURE_START ===/d' | \
39+
sed '/=== AUDIT_FAILURE_END ===/d' >> $GITHUB_OUTPUT
40+
echo "EOF" >> $GITHUB_OUTPUT
41+
exit 1
42+
else
43+
echo "AUDIT_FAILED=false" >> $GITHUB_OUTPUT
44+
fi
45+
46+
workflow-notification:
47+
permissions:
48+
contents: read
49+
issues: write
50+
needs:
51+
- crawl
52+
if: always()
53+
uses: ./.github/workflows/reusable-workflow-notification.yml
54+
with:
55+
success: ${{ needs.crawl.result == 'success' }}
56+
failure-details: ${{ needs.crawl.outputs.audit-output }}

‎.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/publish-smoke-test-fake-backend-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
java-version-file: .java-version
6868

6969
- name: Login to GitHub package registry
70-
uses: azure/docker-login@15c4aadf093404726ab2ff205b2cdd33fa6d054c # v2
70+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
7171
with:
72-
login-server: ghcr.io
72+
registry: ghcr.io
7373
username: ${{ github.repository_owner }}
7474
password: ${{ secrets.GITHUB_TOKEN }}
7575

0 commit comments

Comments
 (0)