Merge branch 'debug-logging' of github.com:googleapis/python-api-core…

… into debug-logging

google/api_core/client_logging.py

@@ -7,6 +7,8 @@
 _LOGGING_INITIALIZED = False
 _BASE_LOGGER_NAME = "google"
 
+# Fields to be included in the StructuredLogFormatter.
+#
 # TODO(https://github.com/googleapis/python-api-core/issues/761): Update this list to support additional logging fields.
 _recognized_logging_fields = [
     "httpRequest",
@@ -29,8 +31,21 @@ def logger_configured(logger) -> bool:
     )
 
 
-# TODO(https://github.com/googleapis/python-api-core/issues/763): Add documentation.
+# TODO(https://github.com/googleapis/python-api-core/issues/763): Expand documentation.
 def initialize_logging():
+    """Initializes "google" loggers, partly based on the environment variable
+
+    Initializes the "google" logger and any loggers (at the "google"
+    level or lower) specified by the environment variable
+    GOOGLE_SDK_PYTHON_LOGGING_SCOPE, as long as none of these loggers
+    were previously configured. If any such loggers (including the
+    "google" logger) are initialized, they are set to NOT propagate
+    log events up to their parent loggers.
+
+    This initialization is executed only once, and hence the
+    environment variable is only processed the first time this
+    function is called.
+    """
     global _LOGGING_INITIALIZED
     if _LOGGING_INITIALIZED:
         return
@@ -39,8 +54,18 @@ def initialize_logging():
     _LOGGING_INITIALIZED = True
 
 
-# TODO(https://github.com/googleapis/python-api-core/issues/763): Add documentation.
+# TODO(https://github.com/googleapis/python-api-core/issues/763): Expand documentation.
 def parse_logging_scopes(scopes: Optional[str] = None) -> List[str]:
+    """Returns a list of logger names.
+
+    Splits the single string of comma-separated logger names into a list of individual logger name strings.
+
+    Args:
+      scopes: The name of a single logger. (In the future, this will be a comma-separated list of multiple loggers.)
+
+    Returns:
+      A list of all the logger names in scopes.
+    """
     if not scopes:
         return []
     # TODO(https://github.com/googleapis/python-api-core/issues/759): check if the namespace is a valid namespace.
@@ -50,8 +75,9 @@ def parse_logging_scopes(scopes: Optional[str] = None) -> List[str]:
     return namespaces
 
 
-# TODO(https://github.com/googleapis/python-api-core/issues/763): Add documentation.
+# TODO(https://github.com/googleapis/python-api-core/issues/763): Expand documentation.
 def configure_defaults(logger):
+    """Configures `logger` to emit structured info to stdout."""
     if not logger_configured(logger):
         console_handler = logging.StreamHandler()
         logger.setLevel("DEBUG")
@@ -61,8 +87,22 @@ def configure_defaults(logger):
         logger.addHandler(console_handler)
 
 
-# TODO(https://github.com/googleapis/python-api-core/issues/763): Add documentation.
+# TODO(https://github.com/googleapis/python-api-core/issues/763): Expand documentation.
 def setup_logging(scopes: str=""):
+    """Sets up logging for the specified `scopes`.
+
+    If the loggers specified in `scopes` have not been previously
+    configured, this will configure them to emit structured log
+    entries to stdout, and to not propagate their log events to their
+    parent loggers. Additionally, if the "google" logger (whether it
+    was specified in `scopes` or not) was not previously configured,
+    it will also configure it to not propagate log events to the root
+    logger.
+
+    Args:
+      scopes: The name of a single logger. (In the future, this will be a comma-separated list of multiple loggers.)
+
+    """
 
     # only returns valid logger scopes (namespaces)
     # this list has at most one element.

tests/unit/test_client_logging.py

@@ -17,62 +17,62 @@ def reset_logger(scope):
 
 
 def test_setup_logging_w_no_scopes():
-    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foo"):
+    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foogle"):
         setup_logging()
-        base_logger = logging.getLogger("foo")
+        base_logger = logging.getLogger("foogle")
         assert base_logger.handlers == []
         assert not base_logger.propagate
         assert base_logger.level == logging.NOTSET
 
-    reset_logger("foo")
+    reset_logger("foogle")
 
 
 def test_setup_logging_w_base_scope():
-    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foo"):
-        setup_logging("foo")
-        base_logger = logging.getLogger("foo")
+    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foogle"):
+        setup_logging("foogle")
+        base_logger = logging.getLogger("foogle")
         assert isinstance(base_logger.handlers[0], logging.StreamHandler)
         assert not base_logger.propagate
         assert base_logger.level == logging.DEBUG
 
-    reset_logger("foo")
+    reset_logger("foogle")
 
 
 def test_setup_logging_w_configured_scope():
-    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foo"):
-        base_logger = logging.getLogger("foo")
+    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foogle"):
+        base_logger = logging.getLogger("foogle")
         base_logger.propagate = False
-        setup_logging("foo")
+        setup_logging("foogle")
         assert base_logger.handlers == []
         assert not base_logger.propagate
         assert base_logger.level == logging.NOTSET
 
-    reset_logger("foo")
+    reset_logger("foogle")
 
 
 def test_setup_logging_w_module_scope():
-    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foo"):
-        setup_logging("foo.bar")
+    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foogle"):
+        setup_logging("foogle.bar")
 
-        base_logger = logging.getLogger("foo")
+        base_logger = logging.getLogger("foogle")
         assert base_logger.handlers == []
         assert not base_logger.propagate
         assert base_logger.level == logging.NOTSET
 
-        module_logger = logging.getLogger("foo.bar")
+        module_logger = logging.getLogger("foogle.bar")
         assert isinstance(module_logger.handlers[0], logging.StreamHandler)
         assert not module_logger.propagate
         assert module_logger.level == logging.DEBUG
 
-    reset_logger("foo")
-    reset_logger("foo.bar")
+    reset_logger("foogle")
+    reset_logger("foogle.bar")
 
 
 def test_setup_logging_w_incorrect_scope():
-    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foo"):
+    with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foogle"):
         setup_logging("abc")
 
-        base_logger = logging.getLogger("foo")
+        base_logger = logging.getLogger("foogle")
         assert base_logger.handlers == []
         assert not base_logger.propagate
         assert base_logger.level == logging.NOTSET
@@ -83,22 +83,22 @@ def test_setup_logging_w_incorrect_scope():
         assert not logger.propagate
         assert logger.level == logging.DEBUG
 
-    reset_logger("foo")
+    reset_logger("foogle")
     reset_logger("abc")
 
 
 def test_initialize_logging():
 
-    with mock.patch("os.getenv", return_value="foo.bar"):
-        with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foo"):
+    with mock.patch("os.getenv", return_value="foogle.bar"):
+        with mock.patch("google.api_core.client_logging._BASE_LOGGER_NAME", "foogle"):
             initialize_logging()
 
-            base_logger = logging.getLogger("foo")
+            base_logger = logging.getLogger("foogle")
             assert base_logger.handlers == []
             assert not base_logger.propagate
             assert base_logger.level == logging.NOTSET
 
-            module_logger = logging.getLogger("foo.bar")
+            module_logger = logging.getLogger("foogle.bar")
             assert isinstance(module_logger.handlers[0], logging.StreamHandler)
             assert not module_logger.propagate
             assert module_logger.level == logging.DEBUG
@@ -112,17 +112,17 @@ def test_initialize_logging():
             assert base_logger.propagate
             assert module_logger.propagate
 
-    reset_logger("foo")
-    reset_logger("foo.bar")
+    reset_logger("foogle")
+    reset_logger("foogle.bar")
 
 
 def test_structured_log_formatter():
     # TODO(https://github.com/googleapis/python-api-core/issues/761): Test additional fields when implemented.
     record = logging.LogRecord(
-        name="foo",
+        name="Appelation",
         level=logging.DEBUG,
         msg="This is a test message.",
-        pathname="foo/bar",
+        pathname="some/path",
         lineno=25,
         args=None,
         exc_info=None,
@@ -134,7 +134,7 @@ def test_structured_log_formatter():
     formatted_msg = StructuredLogFormatter().format(record)
     parsed_msg = json.loads(formatted_msg)
 
-    assert parsed_msg["name"] == "foo"
+    assert parsed_msg["name"] == "Appelation"
     assert parsed_msg["severity"] == "DEBUG"
     assert parsed_msg["message"] == "This is a test message."
     assert parsed_msg["rpcName"] == "bar"