From b34eabab08f6aed58392cd0688a7cf8fb09c2fee Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Thu, 6 May 2021 12:21:01 -0700 Subject: [PATCH 1/6] added owlbot to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b4243ced7..ba7b78cfd 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,6 @@ system_tests/local_test_setup # Make sure a generated file isn't accidentally committed. pylintrc pylintrc.test + +# ignore owlbot +owl-bot-staging From 95da8eb4e578352502c68e9d9a6a9e5a648b034f Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 10 May 2021 11:56:31 -0700 Subject: [PATCH 2/6] add to excluded logger list --- google/cloud/logging_v2/handlers/handlers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/google/cloud/logging_v2/handlers/handlers.py b/google/cloud/logging_v2/handlers/handlers.py index 973321423..60710ff44 100644 --- a/google/cloud/logging_v2/handlers/handlers.py +++ b/google/cloud/logging_v2/handlers/handlers.py @@ -24,7 +24,7 @@ DEFAULT_LOGGER_NAME = "python" -EXCLUDED_LOGGER_DEFAULTS = ("google.cloud", "google.auth", "google_auth_httplib2") +EXCLUDED_LOGGER_DEFAULTS = ("google.cloud", "google.auth", "google_auth_httplib2", "google.api_core.bidi", "werkzeug") _CLEAR_HANDLER_RESOURCE_TYPES = ("gae_app", "cloud_function") @@ -223,4 +223,3 @@ def setup_logging( for logger_name in all_excluded_loggers: logger = logging.getLogger(logger_name) logger.propagate = False - logger.addHandler(logging.StreamHandler()) From 7b08acb821b719e994692ee21b78a932e9dbefe4 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 10 May 2021 12:09:30 -0700 Subject: [PATCH 3/6] updated environment tests --- tests/environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/environment b/tests/environment index df1b7c131..f1937814b 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit df1b7c131575f8eb59120cef75709496602b7665 +Subproject commit f1937814bf78953a160fa33600f6af8cfdb82527 From d39fd401e9a3338a8117c18e68d6d23c1916add9 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 10 May 2021 14:17:19 -0700 Subject: [PATCH 4/6] added comments --- google/cloud/logging_v2/handlers/handlers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/google/cloud/logging_v2/handlers/handlers.py b/google/cloud/logging_v2/handlers/handlers.py index 60710ff44..f3a916344 100644 --- a/google/cloud/logging_v2/handlers/handlers.py +++ b/google/cloud/logging_v2/handlers/handlers.py @@ -24,6 +24,7 @@ DEFAULT_LOGGER_NAME = "python" +"""Exclude internal logs from propagating through handlers""" EXCLUDED_LOGGER_DEFAULTS = ("google.cloud", "google.auth", "google_auth_httplib2", "google.api_core.bidi", "werkzeug") _CLEAR_HANDLER_RESOURCE_TYPES = ("gae_app", "cloud_function") @@ -221,5 +222,6 @@ def setup_logging( logger.setLevel(log_level) logger.addHandler(handler) for logger_name in all_excluded_loggers: + # prevent excluded loggers from propagating logs to handler logger = logging.getLogger(logger_name) logger.propagate = False From 425e479228e53722a93764f2c841afd2a1a74260 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 10 May 2021 14:50:38 -0700 Subject: [PATCH 5/6] fix lint issue --- google/cloud/logging_v2/handlers/handlers.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/google/cloud/logging_v2/handlers/handlers.py b/google/cloud/logging_v2/handlers/handlers.py index f3a916344..3580a4e98 100644 --- a/google/cloud/logging_v2/handlers/handlers.py +++ b/google/cloud/logging_v2/handlers/handlers.py @@ -25,7 +25,13 @@ DEFAULT_LOGGER_NAME = "python" """Exclude internal logs from propagating through handlers""" -EXCLUDED_LOGGER_DEFAULTS = ("google.cloud", "google.auth", "google_auth_httplib2", "google.api_core.bidi", "werkzeug") +EXCLUDED_LOGGER_DEFAULTS = ( + "google.cloud", + "google.auth", + "google_auth_httplib2", + "google.api_core.bidi", + "werkzeug", +) _CLEAR_HANDLER_RESOURCE_TYPES = ("gae_app", "cloud_function") From 3848c1978aae2b5ea50310a2c5899d6c7acfa41d Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 10 May 2021 15:03:32 -0700 Subject: [PATCH 6/6] fixed unit test --- tests/unit/test_client.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py index f33f1cbdc..9dbfa87fd 100644 --- a/tests/unit/test_client.py +++ b/tests/unit/test_client.py @@ -799,7 +799,13 @@ def test_setup_logging(self): handler.transport.worker.stop() expected_kwargs = { - "excluded_loggers": ("google.cloud", "google.auth", "google_auth_httplib2"), + "excluded_loggers": ( + "google.cloud", + "google.auth", + "google_auth_httplib2", + "google.api_core.bidi", + "werkzeug", + ), "log_level": 20, } self.assertEqual(kwargs, expected_kwargs) @@ -836,7 +842,13 @@ def test_setup_logging_w_extra_kwargs(self): handler.transport.worker.stop() expected_kwargs = { - "excluded_loggers": ("google.cloud", "google.auth", "google_auth_httplib2"), + "excluded_loggers": ( + "google.cloud", + "google.auth", + "google_auth_httplib2", + "google.api_core.bidi", + "werkzeug", + ), "log_level": 20, } self.assertEqual(kwargs, expected_kwargs)