Skip to content

Commit

Permalink
feat: add base logger to enable debug logging
Browse files Browse the repository at this point in the history
  • Loading branch information
ohmayr committed Nov 22, 2024
1 parent 46b3d3a commit 7b1605c
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 0 deletions.
73 changes: 73 additions & 0 deletions google/api_core/client_logging.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import logging
import json
import re
import os

LOGGING_INITIALIZED = False

# TODO(<add-link>): Update Request / Response messages.
REQUEST_MESSAGE = "Sending request ..."
RESPONSE_MESSAGE = "Receiving response ..."

# TODO(<add-link>): Update this list to support additional logging fields
_recognized_logging_fields = ["httpRequest", "rpcName", "serviceName"] # Additional fields to be Logged.

def logger_configured(logger):
return logger.hasHandlers() or logger.level != logging.NOTSET

def initialize_logging():
global LOGGING_INITIALIZED
if LOGGING_INITIALIZED:
return
scopes = os.getenv("GOOGLE_SDK_PYTHON_LOGGING_SCOPE")
setup_logging(scopes)
LOGGING_INITIALIZED = True

def parse_logging_scopes(scopes):
if not scopes:
return []
# TODO(<add-link>): check if the namespace is a valid namespace.
# TODO(<add-link>): parse a list of namespaces. Current flow expects a single string for now.
namespaces = [scopes]
return namespaces

def default_settings(logger):
if not logger_configured(logger):
console_handler = logging.StreamHandler()
logger.setLevel("DEBUG")
logger.propagate = False
formatter = StructuredLogFormatter()
console_handler.setFormatter(formatter)
logger.addHandler(console_handler)

def setup_logging(scopes):
# disable log propagation at base logger level to the root logger only if a base logger is not already configured via code changes.
base_logger = logging.getLogger("google")
if not logger_configured(base_logger):
base_logger.propagate = False

# only returns valid logger scopes (namespaces)
# this list has at most one element.
loggers = parse_logging_scopes(scopes)

for namespace in loggers:
# This will either create a module level logger or get the reference of the base logger instantiated above.
logger = logging.getLogger(namespace)

# Set default settings.
default_settings(logger)

class StructuredLogFormatter(logging.Formatter):
def format(self, record):
log_obj = {
'timestamp': self.formatTime(record),
'severity': record.levelname,
'name': record.name,
'message': record.getMessage(),
}

for field_name in _recognized_logging_fields:
value = getattr(record, field_name, None)
if value is not None:
log_obj[field_name] = value
return json.dumps(log_obj)
17 changes: 17 additions & 0 deletions tests/unit/test_client_logging.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import logging
import pytest

from google.api_core.client_logging import BaseLogger


def test_base_logger(caplog):

logger = BaseLogger().get_logger()

with caplog.at_level(logging.INFO, logger="google"):
logger.info("This is a test message.")

assert "This is a test message." in caplog.text
assert caplog.records[0].name == "google"
assert caplog.records[0].levelname == "INFO"
assert caplog.records[0].message == "This is a test message."

0 comments on commit 7b1605c

Please sign in to comment.