Skip to content

Commit ed8435b

Browse files
authored
Merge branch 'open-telemetry:main' into main
2 parents afa0080 + 1ac3dee commit ed8435b

File tree

352 files changed

+7945
-2889
lines changed

Some content is hidden

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

352 files changed

+7945
-2889
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/build-common.yml

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

231231
# vaadin tests use pnpm
232232
- name: Cache pnpm modules
233-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
233+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
234234
with:
235235
path: ~/.pnpm-store
236236
key: ${{ runner.os }}-test-cache-pnpm-modules

.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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
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/reusable-test-indy.yml

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

5353
# vaadin tests use pnpm
5454
- name: Cache pnpm modules
55-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
55+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
5656
with:
5757
path: ~/.pnpm-store
5858
key: ${{ runner.os }}-test-latest-cache-pnpm-modules

.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@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
49+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
5050
with:
5151
path: ~/.pnpm-store
5252
key: ${{ runner.os }}-test-latest-cache-pnpm-modules

.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@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
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.

RELEASING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ as the last step, which publishes a snapshot build to
1212

1313
## Release cadence
1414

15-
This repository roughly targets monthly minor releases from the `main` branch on the Wednesday after
16-
the second Monday of the month (roughly a few of days after the monthly minor release of
17-
[opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java)).
15+
This repository roughly targets monthly minor releases from the `main` branch on the Thursday after
16+
the second Monday of the month (roughly a couple of days after the monthly minor release of
17+
[opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib)).
1818

1919
## Preparing a new major or minor release
2020

0 commit comments

Comments
 (0)