From 6250331118aebfa3df3fd50e5ec74a93aff86103 Mon Sep 17 00:00:00 2001 From: ohmayr Date: Mon, 11 Nov 2024 19:09:39 +0000 Subject: [PATCH 1/3] experiment: logging prototype --- googleapiclient/discovery.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/googleapiclient/discovery.py b/googleapiclient/discovery.py index f7bbd77763c..b54eaae551d 100644 --- a/googleapiclient/discovery.py +++ b/googleapiclient/discovery.py @@ -86,8 +86,6 @@ # The client library requires a version of httplib2 that supports RETRIES. httplib2.RETRIES = 1 -logger = logging.getLogger(__name__) - URITEMPLATE = re.compile("{[^}]*}") VARNAME = re.compile("[a-zA-Z0-9_-]+") DISCOVERY_URI = ( @@ -124,12 +122,19 @@ GOOGLE_API_USE_CLIENT_CERTIFICATE = "GOOGLE_API_USE_CLIENT_CERTIFICATE" GOOGLE_API_USE_MTLS_ENDPOINT = "GOOGLE_API_USE_MTLS_ENDPOINT" GOOGLE_CLOUD_UNIVERSE_DOMAIN = "GOOGLE_CLOUD_UNIVERSE_DOMAIN" +GOOGLE_SDK_PYTHON_LOGGING_LEVEL = "GOOGLE_SDK_PYTHON_LOGGING_LEVEL" DEFAULT_UNIVERSE = "googleapis.com" # Parameters accepted by the stack, but not visible via discovery. # TODO(dhermes): Remove 'userip' in 'v2'. STACK_QUERY_PARAMETERS = frozenset(["trace", "pp", "userip", "strict"]) STACK_QUERY_PARAMETER_DEFAULT_VALUE = {"type": "string", "location": "query"} +logger = logging.getLogger("google" + __name__) +try: + from google.api_core.client_logging import setup_logging + logging_level_env = os.getenv(GOOGLE_SDK_PYTHON_LOGGING_LEVEL, "CRITICAL") +except ImportError: + pass class APICoreVersionError(ValueError): def __init__(self): From 4f34beab4a6c69d3c383746d60e091c51bf5d3cf Mon Sep 17 00:00:00 2001 From: ohmayr Date: Mon, 11 Nov 2024 19:11:06 +0000 Subject: [PATCH 2/3] setup --- googleapiclient/discovery.py | 1 + 1 file changed, 1 insertion(+) diff --git a/googleapiclient/discovery.py b/googleapiclient/discovery.py index b54eaae551d..fb80b0f0f07 100644 --- a/googleapiclient/discovery.py +++ b/googleapiclient/discovery.py @@ -133,6 +133,7 @@ try: from google.api_core.client_logging import setup_logging logging_level_env = os.getenv(GOOGLE_SDK_PYTHON_LOGGING_LEVEL, "CRITICAL") + setup_logging(log_level=logging_level_env) except ImportError: pass From 5e3cb67f8953accea1ea1b8721c174ae27887f34 Mon Sep 17 00:00:00 2001 From: ohmayr Date: Mon, 11 Nov 2024 19:12:04 +0000 Subject: [PATCH 3/3] fix namespace --- googleapiclient/discovery.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googleapiclient/discovery.py b/googleapiclient/discovery.py index fb80b0f0f07..78b4c55d2bd 100644 --- a/googleapiclient/discovery.py +++ b/googleapiclient/discovery.py @@ -129,7 +129,7 @@ STACK_QUERY_PARAMETERS = frozenset(["trace", "pp", "userip", "strict"]) STACK_QUERY_PARAMETER_DEFAULT_VALUE = {"type": "string", "location": "query"} -logger = logging.getLogger("google" + __name__) +logger = logging.getLogger("google." + __name__) try: from google.api_core.client_logging import setup_logging logging_level_env = os.getenv(GOOGLE_SDK_PYTHON_LOGGING_LEVEL, "CRITICAL")