Merge branch 'main' into main

Author: JP-MY

.changelog/.gitignore

@@ -0,0 +1 @@
+!.gitignore

.changelog/5017.fixed

@@ -0,0 +1,2 @@
+Add missing `.rst` files to Sphinx documentation build for SDK logs,
+propagators, and exporter submodules.

.changelog/5216.added

@@ -0,0 +1 @@
+`opentelemetry-sdk`: add pull metric reader support to declarative file configuration, including Prometheus metric reader via the `prometheus_development` config field

.changelog/5223.changed

@@ -0,0 +1 @@
+`opentelemetry-proto`: regenerate protobuf code from opentelemetry-proto v1.10.0

.changelog/5224.added

@@ -0,0 +1 @@
+`opentelemetry-proto-json`: update to use opentelemetry-proto v1.10.0

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Switch to SPDX license headers (#5177)
+4d978892d3253da1d6f4e6e6abfbe1e1bee87b05

.github/workflows/add-to-project.yml

@@ -0,0 +1,28 @@
+name: Add PR to project board
+
+on:
+  pull_request_target:
+    types: [opened, reopened, ready_for_review]
+
+permissions:
+  contents: read
+
+jobs:
+  add-to-project:
+    name: add to project board
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+    steps:
+      # NOTE: do NOT add an actions/checkout step here. This workflow uses
+      # pull_request_target (which has access to secrets) but must never
+      # execute code from the fork branch. See PR #4955 for context.
+      - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
+        id: otelbot-token
+        with:
+          app-id: ${{ vars.OTELBOT_PYTHON_APP_ID }}
+          private-key: ${{ secrets.OTELBOT_PYTHON_PRIVATE_KEY }}
+
+      - uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: https://github.com/orgs/open-telemetry/projects/88
+          github-token: ${{ steps.otelbot-token.outputs.token }}

.github/workflows/changelog.yml

@@ -1,6 +1,6 @@
-# This action requires that any PR targeting the main branch should touch at
-# least one CHANGELOG file. If a CHANGELOG entry is not required, add the "Skip
-# Changelog" label to disable this action.
+# This action requires that any PR targeting the main branch should add a
+# changelog fragment file in the .changelog/ directory. If a changelog entry
+# is not required, add the "Skip Changelog" label to disable this action.
 
 name: changelog
 
@@ -9,6 +9,7 @@ on:
     types: [opened, synchronize, reopened, labeled, unlabeled]
     branches:
       - main
+  merge_group:
 
 permissions:
   contents: read
@@ -17,23 +18,70 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     if: |
+      github.event_name != 'merge_group' &&
       !contains(github.event.pull_request.labels.*.name, 'Skip Changelog')
       && github.actor != 'otelbot[bot]'
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - name: Check for CHANGELOG changes
+      - name: Fetch base branch
+        run: git fetch origin ${{ github.base_ref }} --depth=1
+
+      - name: Ensure no direct changes to CHANGELOG.md
         run: |
-          # Only the latest commit of the feature branch is available
-          # automatically. To diff with the base branch, we need to
-          # fetch that too (and we only need its latest commit).
-          git fetch origin ${{ github.base_ref }} --depth=1
-          if [[ $(git diff --name-only FETCH_HEAD | grep CHANGELOG) ]]
+          if [[ $(git diff --name-only FETCH_HEAD -- 'CHANGELOG.md') ]]
           then
-            echo "A CHANGELOG was modified. Looks good!"
-          else
-            echo "No CHANGELOG was modified."
-            echo "Please add a CHANGELOG entry, or add the \"Skip Changelog\" label if not required."
+            echo "CHANGELOG.md should not be directly modified."
+            echo "Please add a changelog fragment file to the .changelog/ directory instead."
+            echo "See CONTRIBUTING.md for details."
+            echo ""
+            echo "Or add the \"Skip Changelog\" label if this job should be skipped."
+            false
+          fi
+
+      - name: Install towncrier
+        run: pip install towncrier==25.8.0
+
+      - name: Check for changelog fragment
+        run: |
+          if ! towncrier check --compare-with origin/${{ github.base_ref }}; then
+            echo ""
+            echo "No changelog fragment found for this PR."
+            echo "Add a file named .changelog/${{ github.event.pull_request.number }}.<type>"
+            echo "where <type> is one of: added, changed, deprecated, removed, fixed"
+            echo "See CONTRIBUTING.md for details."
+            echo ""
+            echo "Or add the \"Skip Changelog\" label if this job should be skipped."
             false
           fi
+
+      - name: Validate fragment filenames
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          fragments=$(git diff --diff-filter=A --name-only origin/${{ github.base_ref }} -- '.changelog/*' | grep -v '/\.gitignore$' || true)
+          [ -z "$fragments" ] && exit 0
+          invalid=()
+          while IFS= read -r f; do
+            base=$(basename "$f")
+            if [[ ! "$base" =~ ^([0-9]+)\.(added|changed|deprecated|removed|fixed)$ ]]; then
+              invalid+=("$f (expected <PR_NUMBER>.<type>; type one of added, changed, deprecated, removed, fixed)")
+              continue
+            fi
+            if [[ "${BASH_REMATCH[1]}" != "${PR_NUMBER}" ]]; then
+              invalid+=("$f (PR number ${BASH_REMATCH[1]} does not match this PR's number ${PR_NUMBER})")
+            fi
+          done <<< "$fragments"
+          if (( ${#invalid[@]} > 0 )); then
+            echo "Invalid changelog fragment(s):"
+            for msg in "${invalid[@]}"; do
+              echo "  $msg"
+            done
+            exit 1
+          fi
+
+      - name: Preview changelog
+        run: towncrier build --draft --version Unreleased

.github/workflows/check-links.yml

@@ -13,14 +13,24 @@ on:
       - '**/*.rst'
       - '.github/workflows/check-links.yml'
       - '.github/workflows/check_links_config.json'
+  merge_group:
+    paths:
+      - '**/*.md'
+      - '**/*.rst'
+      - '.github/workflows/check-links.yml'
+      - '.github/workflows/check_links_config.json'
 
 permissions:
   contents: read
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha || github.run_id }}
   cancel-in-progress: true
 
+env:
+  # Diff against merge group SHAs in queue, or PR base branch otherwise
+  DIFF_RANGE: ${{ github.event_name == 'merge_group' && format('{0}...{1}', github.event.merge_group.base_sha, github.event.merge_group.head_sha) || format('origin/{0}...HEAD', github.base_ref) }}
+
 jobs:
   check-links:
     runs-on: ubuntu-latest
@@ -29,6 +39,8 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
       - name: Get changed markdown files
         id: changed-files
@@ -42,11 +54,41 @@ jobs:
         if: steps.changed-files.outputs.any_changed == 'true'
         run: npm install -g markdown-link-check@v3.12.2
 
-      - name: Run markdown-link-check
-        if: steps.changed-files.outputs.any_changed == 'true'
+      - name: Check links on push to main
+        if: steps.changed-files.outputs.any_changed == 'true' && github.event_name == 'push'
         run: |
           markdown-link-check \
             --verbose \
             --config .github/workflows/check_links_config.json \
             ${{ steps.changed-files.outputs.all_changed_files }} \
-            || { echo "Check that anchor links are lowercase"; exit 1; }
+            || { echo "Check that anchor links are lowercase"; exit 1; }
+
+      - name: Check new links only on pull requests and merge groups
+        if: steps.changed-files.outputs.any_changed == 'true' && (github.event_name == 'pull_request' || github.event_name == 'merge_group')
+        run: |
+          # Extract URLs only from added lines in the diff to avoid
+          # rate limiting when checking all links in large files like
+          # CHANGELOG.md. Only new/changed links are checked on PRs;
+          # pushes to main still check all links in changed files.
+          git diff "$DIFF_RANGE" -- \
+            ${{ steps.changed-files.outputs.all_changed_files }} \
+            | grep '^+' | grep -v '^+++' \
+            | grep -oP 'https?://[^\s\)\]\"'"'"'`>]+' \
+            | sort -u > /tmp/new_links.txt
+
+          if [ ! -s /tmp/new_links.txt ]; then
+            echo "No new links found in diff, skipping check"
+            exit 0
+          fi
+
+          echo "Checking $(wc -l < /tmp/new_links.txt) new links:"
+          cat /tmp/new_links.txt
+
+          # Write links as markdown so markdown-link-check can parse them
+          awk '{print "- <" $0 ">"}' /tmp/new_links.txt > /tmp/new_links.md
+
+          markdown-link-check \
+            --verbose \
+            --config .github/workflows/check_links_config.json \
+            /tmp/new_links.md \
+            || { echo "Check that anchor links are lowercase"; exit 1; }

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
     branches:
     - 'main'
   pull_request:
+  merge_group:
 
 permissions:
   contents: read
@@ -42,7 +43,11 @@ jobs:
       - contrib
     runs-on: ubuntu-latest
     steps:
+      # Skip alls-green check for post-release version bumps in merge_group.
+      # This avoids a deadlock where core and contrib repos wait for each other's releases.
+      # See RELEASING.md for more details.
       - name: Decide whether the needed jobs succeeded or failed
+        if: ${{ !(github.event_name == 'merge_group' && contains(github.event.merge_group.head_commit.message, 'Update version to')) }}
         uses: re-actors/alls-green@release/v1
         with:
           jobs: ${{ toJSON(needs) }}