Merge branch 'main' into patch-1

Author: rohin

.cspell.yml

@@ -10,10 +10,11 @@ import:
 caseSensitive: true
 ignorePaths:
   - '*.svg'
-  - data/community/members.yaml
-  - vendors.yaml
   - content/ja
   - content/zh
+  - data/community/members.yaml
+  - static/refcache.json
+  - vendors.yaml
 patterns:
   - name: CodeBlock
     pattern: |

.cspell/pt-palavras.txt

@@ -1,6 +1,7 @@
 desserializa
 desserializar
 autoinstrumentação
+autoinstrumentações
 autoconsistentes
 serialização
 verbosidade

.editorconfig

@@ -3,10 +3,11 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
-
-[Makefile]
-indent_style = tab
+trim_trailing_whitespace = true
 
 [*.{html,js,json,md,sass,yaml}]
 indent_style = space
 indent_size = 2
+
+[Makefile]
+indent_style = tab

.github/workflows/build-dev.yml

@@ -7,14 +7,6 @@ on:
         description: Regex of submodule paths to update to HEAD before building.
         default: content-modules
         type: string
-  workflow_call:
-    inputs:
-      submodule_path_regex:
-        type: string
-        required: true
-      skip_ref_cache_check:
-        type: boolean
-        default: false
 
 jobs:
   build-and-test:
@@ -60,7 +52,6 @@ jobs:
     name: REFCACHE updates?
     needs: build-and-test
     runs-on: ubuntu-latest
-    if: ${{ !inputs.skip_ref_cache_check }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4

.github/workflows/build-semconv-daily.yml

@@ -0,0 +1,28 @@
+name: Files
+
+on:
+  merge_group:
+  pull_request:
+
+jobs:
+  check-expired:
+    name: EXPIRED FILE check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm run check:expired
+      - run: npm run _diff:fail
+
+  check-filenames:
+    name: FILENAME check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm run check:filenames
+
+  check-formatting:
+    name: FILE FORMAT
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm run check:format

.github/workflows/check-file.yml

@@ -1,9 +1,16 @@
 name: Links
 
+# cSpell:ignore nvmrc opentelemetrybot
 on:
   merge_group:
   pull_request:
 
+env:
+  CHANGED_FILES:
+  PR_NUM: ${{ github.event.pull_request.number }}
+  USER_EMAIL: [email protected]
+  USER_NAME: opentelemetrybot
+
 jobs:
   build-and-check-links:
     name: BUILD and CHECK LINKS
@@ -42,12 +49,12 @@ jobs:
           echo "submodule(s); or undo the submodule update(s) if it happened by mistake."
           npm run _diff:fail
 
-      - run: npm run log:check:links
+      - run: |
+          npm run log:check:links
+          CHANGED_FILES=$(git status --porcelain)
+          echo "CHANGED_FILES=$CHANGED_FILES" >> "$GITHUB_ENV"
         continue-on-error: true
-      - name: Any files need updating?
-        run: |
-          echo "If the diff fails due to .htmltest, then either run 'npm run fix:htmltest-config' locally or '/fix:htmltest-config' in GitHub"
-          npm run _diff:fail
+
       - uses: actions/upload-artifact@v4
         with:
           name: build-log-etc
@@ -56,6 +63,36 @@ jobs:
             tmp/package*.json
             static/refcache.json
 
+      - name: Push changes if any, and fail check
+        if: ${{ env.CHANGED_FILES }}
+        run: |
+          echo "Changes detected in the refcache etc:"
+          git status --short
+
+          echo 'cmd: gh pr checkout $PR_NUM -b "pr-check-links-${RANDOM}"'
+        #   git branch -v
+
+        #   git config --local user.email "$USER_EMAIL"
+        #   git config --local user.name "$USER_NAME"
+        #   git add -A
+        #   git commit -m "Updates from build-and-check-links workflow"
+
+        #   echo "\nPushing changes to PR."
+        #   current_branch=$(git rev-parse --abbrev-ref HEAD)
+        #   echo current_branch=$current_branch
+        #   # gh pr checkout sets some git configs that we can use to make sure
+        #   # we push to the right repo & to the right branch
+        #   remote_repo=$(git config --get branch.${current_branch}.remote)
+        #   echo remote_repo=$remote_repo
+        #   remote_branch=$(git config --get branch.${current_branch}.merge)
+        #   echo remote_branch=$remote_branch
+        #   git push ${remote_repo} HEAD:${remote_branch}
+
+        #   echo "Failing workflow so that changes can be reviewed, and checks rerun."
+        #   exit 1
+        # env:
+        #   GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
+
   check-refcache:
     name: REFCACHE updates?
     needs: build-and-check-links
@@ -67,7 +104,9 @@ jobs:
       - name: Fail when refcache contains entries with HTTP status 4XX
         run: |
           if grep -B 1 -e '"StatusCode": 4' static/refcache.json; then
-            echo "Run 'npx gulp prune' to remove 4xx entries from the refcache"
+            echo "Run 'npm run _refcache:prune' to remove 404 entries from refcache.json,"
+            echo "or run './scripts/double-check-refcache-400s.mjs' locally to address"
+            echo "other 400-status entries."
             exit 1
           fi
       - name: Does the refcache need updating?

.github/workflows/check-format.yml

@@ -26,16 +26,19 @@ jobs:
           suggestions: true
 
   dict-check:
-    name: CSPELL:IGNORE check
+    name: CSPELL page-local word list check
     runs-on: ubuntu-latest
+    env:
+      FIX_CMD: fix:dict
     steps:
       - uses: actions/checkout@v4
-      - run: npm run fix:dict
+      - run: npm run ${{ env.FIX_CMD }}
       - name: Any changed files?
         run: |
           CHANGES=`git status --porcelain`
           if [[ $CHANGES ]]; then
-            echo "Locally run `npm run fix:dict` and commit the changes:"
+            echo "Add comment '/fix:${{ env.FIX_CMD }}' to your PR in GitHub,"
+            echo "or locally run 'npm run ${{ env.FIX_CMD }}' and commit the changes:"
             echo "$CHANGES"
             exit 1
           else

.github/workflows/check-links.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   PR_NUM: ${{ github.event.pull_request.number }}
-  SURVEY_URL: https://forms.gle/WV58koUBGSG9HBY66
+  SURVEY_URL: https://docs.google.com/forms/d/e/1FAIpQLSf2FfCsW-DimeWzdQgfl0KDzT2UEAqu69_f7F2BVPSxVae1cQ/viewform?entry.1540511742=open-telemetry/opentelemetry.io
 
 jobs:
   comment-on-pr:
@@ -35,6 +35,6 @@ jobs:
       - name: Add comment to PR if author is not a member
         if: env.MEMBER_FOUND == 'false'
         run: |
-          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}"
+          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})"
         env:
           GH_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}