diff --git a/CHANGELOG.md b/CHANGELOG.md index eb28471034d..4031880bf78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#2450](https://github.com/open-telemetry/opentelemetry-python/pull/2450)) - Bump semantic conventions from 1.6.1 to 1.8.0 ([#2461](https://github.com/open-telemetry/opentelemetry-python/pull/2461)) +- fix exception handling in get_aggregated_resources + ([#2464](https://github.com/open-telemetry/opentelemetry-python/pull/2464)) ## [1.9.1-0.28b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.9.1-0.28b1) - 2022-01-29 diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py index c8790adf111..d32d9438293 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py @@ -308,12 +308,12 @@ def get_aggregated_resources( detected_resource = future.result(timeout=timeout) # pylint: disable=broad-except except Exception as ex: + detected_resource = _EMPTY_RESOURCE if detector.raise_on_error: raise ex logger.warning( "Exception %s in detector %s, ignoring", ex, detector ) - detected_resource = _EMPTY_RESOURCE finally: detectors_merged_resource = detectors_merged_resource.merge( detected_resource