From 804e22d4b745ab9cd784bb9e7915fc7f1ab0cb6a Mon Sep 17 00:00:00 2001 From: jerevoss Date: Mon, 22 Jan 2024 15:34:22 -0800 Subject: [PATCH] lint --- opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py index 9303a9e35f8..426b1afa501 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py @@ -390,13 +390,13 @@ def get_aggregated_resources( detected_resource: Resource = _EMPTY_RESOURCE try: detected_resource = future.result(timeout=timeout) - # pylint: disable=broad-except except concurrent.futures.TimeoutError: if detector.raise_on_error: raise ex logger.warning( "Detector %s took longer than %s seconds, skipping", detector, timeout ) + # pylint: disable=broad-except except Exception as ex: if detector.raise_on_error: raise ex