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 diff --git a/google/cloud/logging_v2/handlers/handlers.py b/google/cloud/logging_v2/handlers/handlers.py index 973321423..3580a4e98 100644 --- a/google/cloud/logging_v2/handlers/handlers.py +++ b/google/cloud/logging_v2/handlers/handlers.py @@ -24,7 +24,14 @@ DEFAULT_LOGGER_NAME = "python" -EXCLUDED_LOGGER_DEFAULTS = ("google.cloud", "google.auth", "google_auth_httplib2") +"""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,6 +228,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 - logger.addHandler(logging.StreamHandler()) 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 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)