Skip to content

Commit bb41af8

Browse files
jaydelucajaydeluca
authored
Merge branch 'main' into nats-instrumentation
2 parents e599182 + 88713dd commit bb41af8

File tree

546 files changed

+12698
-6489
lines changed

Some content is hidden

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

546 files changed

+12698
-6489
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/renovate.json5‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,17 @@
112112
'io.opentelemetry:{/,}**',
113113
],
114114
},
115+
{
116+
// junit 6+ requires Java 17+
117+
matchPackageNames: [
118+
'org.junit:**',
119+
'org.junit.jupiter:**',
120+
],
121+
matchUpdateTypes: [
122+
'major',
123+
],
124+
enabled: false,
125+
},
115126
{
116127
// junit-pioneer 2+ requires Java 11+
117128
matchPackageNames: [

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

‎.github/workflows/issue-management-stale-action.yml‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
schedule:
55
# hourly at minute 23
66
- cron: "23 * * * *"
7+
workflow_dispatch:
78

89
permissions:
910
contents: read
@@ -12,25 +13,57 @@ jobs:
1213
stale:
1314
permissions:
1415
contents: read
16+
actions: write # because actions/stale deletes its old cache before saving new one
1517
issues: write # for actions/stale to close stale issues
1618
pull-requests: write # for actions/stale to close stale PRs
1719
runs-on: ubuntu-latest
1820
steps:
21+
# Action #1: Handle issues/PRs awaiting author feedback
22+
# - After 7 days inactive: Adds "stale" label + warning comment
23+
# - After 7 more days inactive: Closes
1924
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
2025
with:
21-
repo-token: ${{ secrets.GITHUB_TOKEN }}
26+
only-labels: "needs author feedback"
2227
days-before-stale: 7
2328
days-before-close: 7
24-
only-labels: "needs author feedback"
2529
stale-issue-label: stale
2630
stale-issue-message: >
27-
This has been automatically marked as stale because it has been marked
28-
as needing author feedback and has not had any activity for 7 days.
29-
It will be closed automatically if there is no response from the author
30-
within 7 additional days from this comment.
31+
This issue has been labeled as stale due to lack of activity and needing author feedback.
32+
It will be automatically closed if there is no further activity over the next 7 days.
33+
stale-pr-label: stale
34+
stale-pr-message: >
35+
This PR has been labeled as stale due to lack of activity and needing author feedback.
36+
It will be automatically closed if there is no further activity over the next 7 days.
37+
38+
# Action #2: Close old enhancement requests
39+
# - Targets: Issues with "enhancement" label (but NOT "needs author feedback")
40+
# - After 365 days inactive: Adds "stale" label + closes immediately (no warning period)
41+
# - Skips: Issues with "needs author feedback" to avoid conflicts with Action #1
42+
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
43+
with:
44+
only-labels: "enhancement"
45+
# Skip issues that need author feedback (handled by the first action with 7+7 day policy)
46+
exempt-issue-labels: "needs author feedback"
47+
days-before-pr-stale: -1
48+
days-before-pr-close: -1
49+
days-before-stale: 365
50+
days-before-close: 0
51+
close-issue-label: stale
52+
close-issue-message: >
53+
Since there has been no activity on this enhancement for the past year we are closing it to help maintain our backlog.
54+
Anyone who would like to work on it is still welcome to do so, and we can re-open it at that time.
55+
56+
# Action #3: Handle stale PRs
57+
# - After 180 days inactive: Adds "stale" label + warning comment
58+
# - After 14 more days inactive: Closes
59+
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
60+
with:
61+
days-before-issue-stale: -1
62+
days-before-issue-close: -1
63+
days-before-pr-stale: 180
64+
days-before-pr-close: 14
3165
stale-pr-label: stale
3266
stale-pr-message: >
33-
This has been automatically marked as stale because it has been marked
34-
as needing author feedback and has not had any activity for 7 days.
35-
It will be closed automatically if there is no response from the author
36-
within 7 additional days from this comment.
67+
This PR has been labeled as stale due to lack of activity.
68+
It will be automatically closed if there is no further activity over the next 14 days.
69+
exempt-draft-pr: false

‎.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

0 commit comments

Comments
 (0)