Merge branch 'main' into up-ruff-rule

Author: emdneto

CHANGELOG.md

@@ -38,6 +38,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))
 

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
@@ -515,7 +516,7 @@ def detect(self) -> "Resource":
 
 
 def get_aggregated_resources(
-    detectors: list["ResourceDetector"],
+    detectors: Sequence["ResourceDetector"],
     initial_resource: Resource | None = 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 =