Merge branch 'main' into codeboten/load-context-api

Author: codeboten

.github/workflows/check-links.yml

@@ -29,6 +29,8 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
 
       - name: Get changed markdown files
         id: changed-files
@@ -42,11 +44,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
+        if: steps.changed-files.outputs.any_changed == 'true' && github.event_name == 'pull_request'
+        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 "origin/${{ github.base_ref }}...HEAD" -- \
+            ${{ 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; }

CHANGELOG.md

@@ -36,6 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#5120](https://github.com/open-telemetry/opentelemetry-python/pull/5120))
 - Add WeaverLiveCheck test util
   ([#5088](https://github.com/open-telemetry/opentelemetry-python/pull/5088))
+- Fix incorrect type annotation on `detectors` parameter of `get_aggregated_resources`
+  ([#5135](https://github.com/open-telemetry/opentelemetry-python/pull/5135))
 - ci: wait for tracecontext server readiness instead of a fixed sleep in `scripts/tracecontext-integration-test.sh`
   ([#5149](https://github.com/open-telemetry/opentelemetry-python/pull/5149))
 - `opentelemetry-api`: conditionallly import entrypoints for `opentelemetry_context` only if the `OTEL_PYTHON_CONTEXT` env variable is defined, return `ContextVarsRuntimeContext` otherwise

dev-requirements.txt

@@ -14,6 +14,6 @@ requests==2.32.3
 ruamel.yaml==0.17.21
 asgiref==3.7.2
 psutil==7.2.2
-GitPython==3.1.41
+GitPython==3.1.47
 pre-commit==3.7.0
 ruff==0.14.1

opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py

@@ -67,6 +67,7 @@
 import socket
 import sys
 import typing
+from collections.abc import Sequence
 from json import dumps
 from os import environ
 from types import ModuleType
@@ -517,7 +518,7 @@ def detect(self) -> "Resource":
 
 
 def get_aggregated_resources(
-    detectors: typing.List["ResourceDetector"],
+    detectors: Sequence["ResourceDetector"],
     initial_resource: typing.Optional[Resource] = None,
     timeout: int = 5,
 ) -> "Resource":

tox.ini

@@ -344,7 +344,7 @@ commands_post =
 [testenv:public-symbols-check]
 recreate = True
 deps =
-  GitPython==3.1.40
+  GitPython==3.1.47
   griffe==1.7.3
   toml
 commands =