From 530a91bee331d825bcc036ed6578e2cf26f609e1 Mon Sep 17 00:00:00 2001 From: "(Eliseo) Nathaniel Ruiz Nowell" Date: Fri, 23 Jul 2021 15:00:25 -0700 Subject: [PATCH] lazy loading for log messages --- .../src/opentelemetry/sdk/extension/aws/resource/_lambda.py | 2 +- .../opentelemetry/sdk/extension/aws/resource/beanstalk.py | 2 +- .../src/opentelemetry/sdk/extension/aws/resource/ec2.py | 2 +- .../src/opentelemetry/sdk/extension/aws/resource/ecs.py | 5 ++--- .../src/opentelemetry/sdk/extension/aws/resource/eks.py | 6 ++++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/_lambda.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/_lambda.py index 1578411954..762725325c 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/_lambda.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/_lambda.py @@ -58,5 +58,5 @@ def detect(self) -> "Resource": if self.raise_on_error: raise exception - logger.warning(f"{self.__class__.__name__} failed: {exception}") + logger.warning("%s failed: %s", self.__class__.__name__, exception) return Resource.get_empty() diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/beanstalk.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/beanstalk.py index f87be81f52..8252ec0f17 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/beanstalk.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/beanstalk.py @@ -66,5 +66,5 @@ def detect(self) -> "Resource": if self.raise_on_error: raise exception - logger.warning(f"{self.__class__.__name__} failed: {exception}") + logger.warning("%s failed: %s", self.__class__.__name__, exception) return Resource.get_empty() diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/ec2.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/ec2.py index aa8aca3790..17e892e91d 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/ec2.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/ec2.py @@ -99,5 +99,5 @@ def detect(self) -> "Resource": if self.raise_on_error: raise exception - logger.warning(f"{self.__class__.__name__} failed: {exception}") + logger.warning("%s failed: %s", self.__class__.__name__, exception) return Resource.get_empty() diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/ecs.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/ecs.py index 84f9159ec6..ad8269dfae 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/ecs.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/ecs.py @@ -53,8 +53,7 @@ def detect(self) -> "Resource": container_id = line[-_CONTAINER_ID_LENGTH:] except FileNotFoundError as exception: logger.warning( - "Failed to get container ID on ECS: %s.", - exception, + "Failed to get container ID on ECS: %s.", exception ) return Resource( @@ -70,5 +69,5 @@ def detect(self) -> "Resource": if self.raise_on_error: raise exception - logger.warning(f"{self.__class__.__name__} failed: {exception}") + logger.warning("%s failed: %s", self.__class__.__name__, exception) return Resource.get_empty() diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/eks.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/eks.py index fabd2f937a..3619024f7b 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/eks.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/resource/eks.py @@ -38,7 +38,9 @@ def _aws_http_request(method, path, cred_value): method=method, ), timeout=2000, - context=ssl.create_default_context(cafile="/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"), + context=ssl.create_default_context( + cafile="/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" + ), ) as response: return response.read().decode("utf-8") @@ -127,5 +129,5 @@ def detect(self) -> "Resource": if self.raise_on_error: raise exception - logger.warning(f"{self.__class__.__name__} failed: {exception}") + logger.warning("%s failed: %s", self.__class__.__name__, exception) return Resource.get_empty()