Merge remote-tracking branch 'origin/main' into otelbot/semconv-integration-v1.40.0-dev

Author: otelbot[bot]

.cspell/en-words.txt

@@ -127,6 +127,7 @@ Socha
 Stalnaker
 stdoutmetric
 Strimzi
+subresponse
 symfony
 tabpane
 textlint

.github/scripts/collector-sync.sh

@@ -43,7 +43,10 @@ if [ ! -d "tmp_repos/opentelemetry-ecosystem-explorer" ]; then
   exit 1
 fi
 
-VERSION=$(ls -1 tmp_repos/opentelemetry-ecosystem-explorer/ecosystem-registry/collector/core 2>/dev/null | grep -v -i 'SNAPSHOT' | sort -V | tail -n 1)
+VERSION=$(find tmp_repos/opentelemetry-ecosystem-explorer/ecosystem-registry/collector/core \
+  -mindepth 1 -maxdepth 1 -type d -printf '%f\n' 2>/dev/null | \
+  grep -v -i 'SNAPSHOT' | sort -V | tail -n 1)
+
 if [ -z "$VERSION" ]; then
   echo "Error: No collector versions found"
   exit 1
@@ -92,7 +95,7 @@ _Last updated: $(date -u '+%Y-%m-%d %H:%M:%S UTC')_"
 fi
 
 echo "Checking for component changes..."
-CHANGED_FILES=$(git diff --name-only data/collector/)
+CHANGED_FILES=$(git diff --name-only data/collector/ data/collector-versions.yml)
 
 if [ -z "$CHANGED_FILES" ]; then
   echo "No component changes detected"

.github/workflows/check-text.yml

@@ -1,4 +1,6 @@
-name: Linter # cSpell:ignore yargs
+name: Linter
+
+# cSpell:ignore startswith yargs
 
 on:
   merge_group:

.github/workflows/test-collector-sync.yml

@@ -0,0 +1,45 @@
+name: Test collector-sync
+
+on:
+  pull_request:
+    paths:
+      - 'scripts/collector-sync/**'
+      - '.github/workflows/test-collector-sync.yml'
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Python tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
+        with:
+          enable-cache: true
+
+      - name: Install dependencies
+        run: |
+          cd scripts/collector-sync
+          uv sync --all-extras
+
+      - name: Run pytest
+        run: |
+          cd scripts/collector-sync
+          uv run pytest
+
+      - name: Run mypy type checking
+        run: |
+          cd scripts/collector-sync
+          uv run mypy src/
+
+      - name: Run ruff linting
+        run: |
+          cd scripts/collector-sync
+          uv run ruff check src/

.github/workflows/test.yml

@@ -0,0 +1,28 @@
+name: Tests
+
+# Scope: runs the `test:*-*` scripts grouped by `test:compound-tests` in
+# package.json (e.g. edge-function and redirect live checks). It does not run
+# `test:base`, which is currently `npm run check` / `check:all`; those are
+# covered elsewhere (check-file, check-links, check-text, spelling, i18n, …).
+
+on:
+  merge_group:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: 'TEST (excluding test:base)'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: .nvmrc
+
+      - run: npm install --ignore-scripts --omit=optional
+
+      - run: npm run test:compound-tests

content/en/docs/contributing/pr-checks.md

@@ -1,5 +1,5 @@
 ---
-title: Pull request checks
+title: Pull request checks and tests
 description: Learn how to make your pull request successfully pass all checks
 weight: 40
 ---
@@ -179,3 +179,9 @@ The following code enforces the link requirement described in this section:
   [`scripts/content-modules/adjust-pages.pl`](https://github.com/open-telemetry/opentelemetry.io/blob/main/scripts/content-modules/adjust-pages.pl)
 
 </details>
+
+### `TEST (excluding test:base)` {.notranslate lang=en}
+
+Runs `npm run test:compound-tests`, which executes the compound `test:*-*` NPM
+scripts (for example, Netlify edge-function tests). It does **not** run
+`test:base`.

content/en/ecosystem/registry/_index.md

@@ -15,16 +15,12 @@ weight: 20
 # =============================================================================
 
 aliases: [/registry/*]
-outputs: [HTML, JSON]
-
-# The redirects and aliases implement catch-all rules for old registry entries;
-# we don't publish individual entry pages anymore.
-#
-# We can't use the catch-all `/ecosystem/registry/*`, because that creates a
-# self-loop with `/ecosystem/registry/index.html`. So we use the following
-# redirect rule to avoid the loop, as suggested by Netlify support
-# (email support ID 159489):
-redirects: [{ from: /ecosystem/registry*, to: '/ecosystem/registry?' }]
+outputs: [HTML, markdown, JSON]
+
+# TODO(chalin): move the following comment into the site docs, then add a link
+# to it here. Old /ecosystem/registry/<component> URLs are handled by the
+# `registry-component-redirect` Netlify Edge Function (replaces the Hugo
+# catch-all redirect; see https://github.com/open-telemetry/opentelemetry.io/issues/9633).
 ---
 
 {{% blocks/lead color="dark" %}}

content/en/search.md

@@ -1,5 +1,4 @@
 ---
 title: Search Results
 layout: search
-outputs: [HTML]
 ---

content/en/site/build/ci-workflows.md

@@ -273,9 +273,10 @@ The repository includes several other workflows:
 | `check-text.yml`           | Textlint terminology checks                   |
 | `check-i18n.yml`           | Localization front matter validation          |
 | `check-spelling.yml`       | Spell checking                                |
+| `test.yml`                 | Test (excludes `test:base`)                   |
 | `auto-update-registry.yml` | Auto-update registry package versions         |
 | `auto-update-versions.yml` | Auto-update OTel component versions           |
 | `build-dev.yml`            | Development build and preview                 |
 | `lint-scripts.yml`         | ShellCheck linting for `.github/scripts/`     |
-| `label-prs.yml`            | Auto-label PRs based on file paths            |
+| `label-manager.yml`        | PR labels (component labels & approval flow)  |
 | `component-owners.yml`     | Assign reviewers based on component ownership |

content/en/site/build/npm-scripts.md

@@ -85,19 +85,20 @@ are internal helpers and are not intended to be run directly.
 
 ## Test and CI
 
-| Script                     | Description                                                         |
-| -------------------------- | ------------------------------------------------------------------- |
-| `test`                     | Run the most commonly needed tests.                                 |
-| `test:base`                | Base tests.                                                         |
-| `test:all`                 | Runs `test:base`, `test:collector-sync`, and `test:edge-functions`. |
-| `test:collector-sync`      | Collector-sync tests.                                               |
-| `test:edge-functions`      | Node test runner over `netlify/edge-functions/**/*.test.ts`.        |
-| `test:edge-functions:live` | Optional `node:test` live suite; supports `--help`.                 |
-| `test-and-fix`             | Run fix scripts (excluding i18n/refcache/submodule), then checks.   |
-| `diff:check`               | Warn if working tree has uncommitted changes.                       |
-| `diff:fail`                | Fail if working tree has changes (e.g. after build).                |
-| `netlify-build:preview`    | `build:preview` then `diff:check`.                                  |
-| `netlify-build:production` | `build:production` then `diff:check`.                               |
+| Script                     | Description                                                       |
+| -------------------------- | ----------------------------------------------------------------- |
+| `test`                     | Run the most commonly needed tests.                               |
+| `test:base`                | Base tests (same as `check`).                                     |
+| `test:compound-tests`      | Runs compound `test:*-*` scripts.                                 |
+| `test:all`                 | Runs `test:base` then `test:compound-tests`.                      |
+| `test:collector-sync`      | Collector-sync tests.                                             |
+| `test:edge-functions`      | Node test runner over `netlify/edge-functions/**/*.test.ts`.      |
+| `test:edge-functions:live` | Optional `node:test` live suite; supports `--help`.               |
+| `test-and-fix`             | Run fix scripts (excluding i18n/refcache/submodule), then checks. |
+| `diff:check`               | Warn if working tree has uncommitted changes.                     |
+| `diff:fail`                | Fail if working tree has changes (e.g. after build).              |
+| `netlify-build:preview`    | `build:preview` then `diff:check`.                                |
+| `netlify-build:production` | `build:production` then `diff:check`.                             |
 
 ## Utilities