Skip to content

Commit 83c2000

Browse files
authored
Merge branch 'main' into glossary
2 parents f3e9ef0 + 6b4cdaa commit 83c2000

File tree

589 files changed

+15976
-8012
lines changed

Some content is hidden

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

589 files changed

+15976
-8012
lines changed

.cspell/en-words.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ otel-endusers
9292
otelcol
9393
otep
9494
otlp
95+
Otmar
9596
packagist
9697
pageinfo
9798
Paixão

.cspell/es-palabras.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,10 @@ agregable
2626
milisegundos
2727
subproyecto
2828
autoinstrumentación
29+
muestreado
30+
muestreador
31+
muestreo
32+
muestreen
33+
muestrear
34+
muestrearse
35+
muestreados

.github/scripts/check-refcache.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ fi
4343
DIFFS_FOUND=0
4444
for file in $REFCACHE_FILES; do
4545
if ! diff -q "$REFERENCE_FILE" "$file" >/dev/null 2>&1; then
46-
echo " - $file differs"
4746
DIFFS_FOUND=1
47+
echo " - $file differs"
48+
diff "$REFERENCE_FILE" "$file" | tail -n 100
49+
echo ""
4850
else
4951
echo " - $file is identical"
5052
fi

.github/workflows/auto-update-community-members.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v5
2121

2222
- name: Set up Node.js
23-
uses: actions/setup-node@v5
23+
uses: actions/setup-node@v6
2424
with:
2525
node-version: '22'
2626

.github/workflows/build-dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
jq '.dependencies |= {minisearch: .minisearch} | del(.optionalDependencies)' package.json > tmp/package-min.json
3030
cp tmp/package-min.json package.json
3131
32-
- uses: actions/setup-node@v5
32+
- uses: actions/setup-node@v6
3333
with:
3434
node-version-file: .nvmrc
3535
cache: npm
@@ -43,7 +43,7 @@ jobs:
4343
GET: no # For details, see: https://opentelemetry.io/docs/contributing/development/#submodule-changes
4444
PIN_SKIP: ${{ inputs.submodule_path_regex }}
4545

46-
- uses: actions/upload-artifact@v4
46+
- uses: actions/upload-artifact@v5
4747
with:
4848
name: build-log-etc
4949
path: |
@@ -57,7 +57,7 @@ jobs:
5757
runs-on: ubuntu-latest
5858
steps:
5959
- uses: actions/checkout@v5
60-
- uses: actions/download-artifact@v5
60+
- uses: actions/download-artifact@v6
6161
with: { name: build-log-etc }
6262
- name: Fail when refcache contains entries with HTTP status 4XX
6363
run: |
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-latest
7575
steps:
7676
- uses: actions/checkout@v5
77-
- uses: actions/download-artifact@v5
77+
- uses: actions/download-artifact@v6
7878
with: { name: build-log-etc }
7979
- run: cat tmp/build-log.txt
8080
- run: scripts/check-build-log.sh

.github/workflows/check-links.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
package.json > tmp/package-min.json
3838
cp tmp/package-min.json package.json
3939
40-
- uses: actions/setup-node@v5
40+
- uses: actions/setup-node@v6
4141
with:
4242
node-version-file: .nvmrc
4343
cache: npm
@@ -58,7 +58,7 @@ jobs:
5858
run: npm run log:build
5959
continue-on-error: true
6060

61-
- uses: actions/upload-artifact@v4
61+
- uses: actions/upload-artifact@v5
6262
with:
6363
name: build-artifacts
6464
path: |
@@ -90,10 +90,10 @@ jobs:
9090
regex: '^(..[^/]|[a-m]./)'
9191
steps:
9292
- uses: actions/checkout@v5
93-
- uses: actions/download-artifact@v5
93+
- uses: actions/download-artifact@v6
9494
with: { name: build-artifacts }
9595

96-
- uses: actions/setup-node@v5
96+
- uses: actions/setup-node@v6
9797
with:
9898
node-version-file: .nvmrc
9999
cache: npm
@@ -103,7 +103,7 @@ jobs:
103103
run: |
104104
.github/scripts/check-links-shard.sh '${{ matrix.shard.id }}' '${{ matrix.shard.regex }}'
105105
106-
- uses: actions/upload-artifact@v4
106+
- uses: actions/upload-artifact@v5
107107
with:
108108
name: refcache-${{ matrix.shard.id }}
109109
path: |
@@ -116,7 +116,7 @@ jobs:
116116
runs-on: ubuntu-latest
117117
steps:
118118
- uses: actions/checkout@v5
119-
- uses: actions/download-artifact@v5
119+
- uses: actions/download-artifact@v6
120120
with:
121121
pattern: refcache-*
122122
path: tmp/check-refcache
@@ -130,7 +130,7 @@ jobs:
130130
runs-on: ubuntu-latest
131131
steps:
132132
- uses: actions/checkout@v5
133-
- uses: actions/download-artifact@v5
133+
- uses: actions/download-artifact@v6
134134
with: { name: build-artifacts }
135135
- run: cat tmp/build-log.txt
136136
- run: scripts/check-build-log.sh

.github/workflows/check-registry.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
| del(.dependencies, .optionalDependencies)' \
2626
package.json > tmp/package-ci.json
2727
cp tmp/package-ci.json package.json
28-
- uses: actions/setup-node@v5
28+
- uses: actions/setup-node@v6
2929
with:
3030
node-version-file: .nvmrc
3131
cache: npm

.github/workflows/check-spelling.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v5
16-
- uses: actions/setup-node@v5
16+
- uses: actions/setup-node@v6
1717
with:
1818
node-version-file: .nvmrc
1919
- run: npm run _install:dict --ignore-scripts

.github/workflows/check-text.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
| del(.dependencies, .optionalDependencies)' \
2121
package.json > tmp/package-ci.json
2222
cp tmp/package-ci.json package.json
23-
- uses: actions/setup-node@v5
23+
- uses: actions/setup-node@v6
2424
with:
2525
node-version-file: .nvmrc
2626
cache: npm
@@ -42,7 +42,7 @@ jobs:
4242
| del(.dependencies, .optionalDependencies)' \
4343
package.json > tmp/package-ci.json
4444
cp tmp/package-ci.json package.json
45-
- uses: actions/setup-node@v5
45+
- uses: actions/setup-node@v6
4646
with:
4747
node-version-file: .nvmrc
4848
cache: npm

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# uploads of run results in SARIF format to the repository Actions tab.
3434
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3535
- name: 'Upload artifact'
36-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
36+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
3737
with:
3838
name: SARIF file
3939
path: results.sarif
@@ -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@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
45+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
4646
with:
4747
sarif_file: results.sarif

0 commit comments

Comments
 (0)