diff --git a/CHANGELOG.md b/CHANGELOG.md index 941551d8a9..afe82e55b2 100644 --- a/CHANGELOG.md +++ b/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)) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py index beb21098e1..9e3c194770 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py +++ b/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":