Merge branch 'main' into flaky-weaver-test-pypy

Author: xrmx

.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,10 @@ 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))
 
 ## Version 1.41.0/0.62b0 (2026-04-09)
 

CONTRIBUTING.md

@@ -13,6 +13,8 @@ Before you can contribute, you will need to sign the [Contributor License Agreem
 
 Please also read the [OpenTelemetry Contributor Guide](https://github.com/open-telemetry/community/blob/main/guides/contributor/README.md).
 
+If you are using AI agents to assist with contributions, please read [AGENTS.md](AGENTS.md) for guidance on how to use them responsibly in this project.
+
 # Find your right repo
 
 This is the main repo for OpenTelemetry Python. Nevertheless, there are other repos that are related to this project.
@@ -144,7 +146,7 @@ CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox
 ```
 
 The continuation integration overrides that environment variable with as per the configuration
-[here](https://github.com/open-telemetry/opentelemetry-python/blob/main/.github/workflows/test_0.yml#L14).
+[here](https://github.com/open-telemetry/opentelemetry-python/blob/main/.github/workflows/test.yml#L14).
 
 ### Benchmarks
 

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":

scripts/tracecontext-integration-test.sh

@@ -7,22 +7,42 @@ mkdir -p target
 rm -rf ./target/trace-context
 git clone https://github.com/w3c/trace-context ./target/trace-context
 cd ./target/trace-context && git checkout $TRACECONTEXT_GIT_TAG && cd -
-# start example opentelemetry service, which propagates trace-context by 
+# start example opentelemetry service, which propagates trace-context by
 # default.
 python ./tests/w3c_tracecontext_validation_server.py 1>&2 &
 EXAMPLE_SERVER_PID=$!
-# give the app server a little time to start up. Not adding some sort
-# of delay would cause many of the tracecontext tests to fail being
-# unable to connect.
-sleep 1
-onshutdown() 
+onshutdown()
 {
     # send a sigint, to ensure
     # it is caught as a KeyboardInterrupt in the
     # example service.
     kill $EXAMPLE_SERVER_PID
 }
 trap onshutdown EXIT
+# Wait for the example server to accept connections on 127.0.0.1:5000
+# before running the W3C tracecontext tests. A fixed `sleep` raced the
+# Flask startup on slow CI runners and produced intermittent connection
+# errors (see issue #5104).
+wait_for_server() {
+    host=127.0.0.1
+    port=5000
+    deadline=$(( $(date +%s) + 30 ))
+    while [ "$(date +%s)" -lt "$deadline" ]; do
+        # Bail out early if the server process died.
+        if ! kill -0 "$EXAMPLE_SERVER_PID" 2>/dev/null; then
+            echo "tracecontext example server exited before becoming ready" >&2
+            return 1
+        fi
+        # Use python so we don't depend on extra tools (nc, curl, etc.).
+        if python -c "import socket,sys; s=socket.socket(); s.settimeout(1); sys.exit(0 if s.connect_ex(('$host', $port)) == 0 else 1)" 2>/dev/null; then
+            return 0
+        fi
+        sleep 0.5
+    done
+    echo "tracecontext example server did not become ready within 30s" >&2
+    return 1
+}
+wait_for_server
 cd ./target/trace-context/test
 
 # The disabled test is not compatible with an optional part of the W3C 

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 =