Skip to content

Commit 5ef85ed

Browse files
authored
Merge branch 'main' into issue-5721
2 parents b1e2d78 + 99f0ae5 commit 5ef85ed

File tree

632 files changed

+18123
-8797
lines changed

Some content is hidden

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

632 files changed

+18123
-8797
lines changed

.cspell.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ import:
1010
caseSensitive: true
1111
ignorePaths:
1212
- '*.svg'
13-
- data/community/members.yaml
14-
- vendors.yaml
1513
- content/ja
1614
- content/zh
15+
- data/community/members.yaml
16+
- static/refcache.json
17+
- vendors.yaml
1718
patterns:
1819
- name: CodeBlock
1920
pattern: |
@@ -55,4 +56,5 @@ dictionaries:
5556
# Other
5657
- companies
5758
words: # Valid words across all locales
59+
- Docsy
5860
- htmltest

.cspell/en-words.txt

-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ quoteservice
111111
react-native-app
112112
recommendationservice
113113
redis
114-
relref
115114
Rexed
116115
runbook
117116
runbooks

.cspell/pt-palavras.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
desserializa
22
desserializar
33
autoinstrumentação
4+
autoinstrumentações
45
autoconsistentes
56
serialização
67
verbosidade

.editorconfig

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ root = true
33
[*]
44
end_of_line = lf
55
insert_final_newline = true
6-
7-
[Makefile]
8-
indent_style = tab
6+
trim_trailing_whitespace = true
97

108
[*.{html,js,json,md,sass,yaml}]
119
indent_style = space
1210
indent_size = 2
11+
12+
[Makefile]
13+
indent_style = tab

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
auto-update-versions:
1111
name: Auto-update community members page
1212
runs-on: ubuntu-24.04
13-
# Remove the if statement below when testing againt a fork
13+
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:
1616
- name: Checkout

.github/workflows/auto-update-registry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
auto-update-versions:
1111
name: Auto-update registry versions
1212
runs-on: ubuntu-20.04
13-
# Remove the if statement below when testing againt a fork
13+
# Remove the if statement below when testing against a fork
1414
if: github.repository == 'open-telemetry/opentelemetry.io'
1515
steps:
1616
- name: Checkout

.github/workflows/check-file.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Files
2+
3+
on:
4+
merge_group:
5+
pull_request:
6+
7+
jobs:
8+
check-expired:
9+
name: EXPIRED FILE check
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
- run: npm run check:expired
14+
- run: npm run _diff:fail
15+
16+
check-filenames:
17+
name: FILENAME check
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
- run: npm run check:filenames
22+
23+
check-formatting:
24+
name: FILE FORMAT
25+
runs-on: ubuntu-latest
26+
steps:
27+
- uses: actions/checkout@v4
28+
- run: npm run check:format

.github/workflows/check-format.yml

-39
This file was deleted.

.github/workflows/check-links.yml

+45-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
name: Links
22

3+
# cSpell:ignore nvmrc opentelemetrybot
34
on:
45
merge_group:
56
pull_request:
67

8+
env:
9+
CHANGED_FILES:
10+
PR_NUM: ${{ github.event.pull_request.number }}
11+
USER_EMAIL: [email protected]
12+
USER_NAME: opentelemetrybot
13+
714
jobs:
815
build-and-check-links:
916
name: BUILD and CHECK LINKS
@@ -42,12 +49,12 @@ jobs:
4249
echo "submodule(s); or undo the submodule update(s) if it happened by mistake."
4350
npm run _diff:fail
4451
45-
- run: npm run log:check:links
52+
- run: |
53+
npm run log:check:links
54+
CHANGED_FILES=$(git status --porcelain)
55+
echo "CHANGED_FILES=$CHANGED_FILES" >> "$GITHUB_ENV"
4656
continue-on-error: true
47-
- name: Any files need updating?
48-
run: |
49-
echo "If the diff fails due to .htmltest, then either run 'npm run fix:htmltest-config' locally or '/fix:htmltest-config' in GitHub"
50-
npm run _diff:fail
57+
5158
- uses: actions/upload-artifact@v4
5259
with:
5360
name: build-log-etc
@@ -56,6 +63,36 @@ jobs:
5663
tmp/package*.json
5764
static/refcache.json
5865
66+
- name: Push changes if any, and fail check
67+
if: ${{ env.CHANGED_FILES }}
68+
run: |
69+
echo "Changes detected in the refcache etc:"
70+
git status --short
71+
72+
echo 'cmd: gh pr checkout $PR_NUM -b "pr-check-links-${RANDOM}"'
73+
# git branch -v
74+
75+
# git config --local user.email "$USER_EMAIL"
76+
# git config --local user.name "$USER_NAME"
77+
# git add -A
78+
# git commit -m "Updates from build-and-check-links workflow"
79+
80+
# echo "\nPushing changes to PR."
81+
# current_branch=$(git rev-parse --abbrev-ref HEAD)
82+
# echo current_branch=$current_branch
83+
# # gh pr checkout sets some git configs that we can use to make sure
84+
# # we push to the right repo & to the right branch
85+
# remote_repo=$(git config --get branch.${current_branch}.remote)
86+
# echo remote_repo=$remote_repo
87+
# remote_branch=$(git config --get branch.${current_branch}.merge)
88+
# echo remote_branch=$remote_branch
89+
# git push ${remote_repo} HEAD:${remote_branch}
90+
91+
# echo "Failing workflow so that changes can be reviewed, and checks rerun."
92+
# exit 1
93+
# env:
94+
# GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
95+
5996
check-refcache:
6097
name: REFCACHE updates?
6198
needs: build-and-check-links
@@ -67,7 +104,9 @@ jobs:
67104
- name: Fail when refcache contains entries with HTTP status 4XX
68105
run: |
69106
if grep -B 1 -e '"StatusCode": 4' static/refcache.json; then
70-
echo "Run 'npx gulp prune' to remove 4xx entries from the refcache"
107+
echo "Run 'npm run _refcache:prune' to remove 404 entries from refcache.json,"
108+
echo "or run './scripts/double-check-refcache-400s.mjs' locally to address"
109+
echo "other 400-status entries."
71110
exit 1
72111
fi
73112
- name: Does the refcache need updating?

.github/workflows/check-spelling.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,19 @@ jobs:
2626
suggestions: true
2727

2828
dict-check:
29-
name: CSPELL:IGNORE check
29+
name: CSPELL page-local word list check
3030
runs-on: ubuntu-latest
31+
env:
32+
FIX_CMD: fix:dict
3133
steps:
3234
- uses: actions/checkout@v4
33-
- run: npm run fix:dict
35+
- run: npm run ${{ env.FIX_CMD }}
3436
- name: Any changed files?
3537
run: |
3638
CHANGES=`git status --porcelain`
3739
if [[ $CHANGES ]]; then
38-
echo "Locally run `npm run fix:dict` and commit the changes:"
40+
echo "Add comment '/fix:${{ env.FIX_CMD }}' to your PR in GitHub,"
41+
echo "or locally run 'npm run ${{ env.FIX_CMD }}' and commit the changes:"
3942
echo "$CHANGES"
4043
exit 1
4144
else

.github/workflows/component-owners.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
contents: read
1111
issues: write
1212
pull-requests: write
13+
if: github.repository_owner == 'open-telemetry'
1314
steps:
1415
- uses: dyladan/[email protected]
1516
with:

.github/workflows/scripts/check-i18n-helper.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ echo "For localization docs, see https://opentelemetry.io/docs/contributing/loca
55
CHANGES=`git status --porcelain`
66

77
if [[ -z $CHANGES ]]; then
8-
echo "All localization pages have the requisit commit hash. <3"
8+
echo "All localization pages have the requisite commit hash. <3"
99
exit;
1010
fi
1111

.github/workflows/survey-on-merged-pr.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
11
name: Survey on Merged PR by Non-Member
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types: [closed]
66

7+
env:
8+
PR_NUM: ${{ github.event.pull_request.number }}
9+
SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=open-telemetry/opentelemetry.io
10+
711
jobs:
812
comment-on-pr:
13+
name: Add survey to PR if author is not a member
914
runs-on: ubuntu-latest
15+
permissions:
16+
contents: write
17+
pull-requests: write
1018
if: github.event.pull_request.merged == true
1119
steps:
20+
- uses: actions/checkout@v4
1221
- name: Check if user is a member of the org
1322
id: check-membership
1423
run: |
@@ -26,7 +35,6 @@ jobs:
2635
- name: Add comment to PR if author is not a member
2736
if: env.MEMBER_FOUND == 'false'
2837
run: |
29-
PR_NUMBER=${{ github.event.pull_request.number }}
30-
gh pr comment $PR_NUMBER --body "Thank you for your contribution! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by filling out this survey: https://forms.gle/WV58koUBGSG9HBY66"
38+
gh pr comment ${PR_NUM} --repo open-telemetry/opentelemetry.io --body "Thank you for your contribution! 🎉 We would like to hear from you about your experience contributing to OpenTelemetry by taking a few minutes to fill out this [survey](${SURVEY_URL})"
3139
env:
3240
GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

0 commit comments

Comments
 (0)