fix logging lib dependencies

Author: davidgamez

api/src/main.py

@@ -56,13 +56,13 @@
 app.include_router(SearchApiRouter)
 
 
-@app.on_event("startup")
-async def startup_event():
+# @app.on_event("startup")
+# async def startup_event():
     # Add the GCP log handler to the logger.
     # This is required to log the API access logs to the GCP logging service.
-    logger = logging.getLogger(API_ACCESS_LOG)
-    handler = GCPLogHandler()
-    logger.handlers.append(handler)
+    # logger = logging.getLogger(API_ACCESS_LOG)
+    # handler = GCPLogHandler()
+    # logger.handlers.append(handler)
 
 
 if __name__ == "__main__":

api/src/middleware/request_context_middleware.py

@@ -12,7 +12,6 @@ class RequestContextMiddleware:
     """
 
     def __init__(self, app: ASGIApp) -> None:
-        Logger.init_logger()
         self.logger = new_logger(API_ACCESS_LOG)
         self.app = app
 
@@ -64,11 +63,11 @@ def log_api_access(
         request = self.create_http_request(scope, request_context, status_code, content_length, latency)
         self.logger.info(
             "API Access Log",
-            extra={
-                "context": {
-                    "http_request": request,
-                }
-            },
+            # extra={
+            #     "context": {
+            #         "http_request": request,
+            #     }
+            # },
         )
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:

api/src/shared/common/logging_common.py

@@ -0,0 +1,8 @@
+import os
+
+
+def get_env_logging_level():
+    """
+    Get the logging level from the environment via OS variable LOGGING_LEVEL. Returns INFO if not set.
+    """
+    return os.getenv("LOGGING_LEVEL", "INFO")

api/src/shared/database/database.py

@@ -19,7 +19,7 @@
 from sqlalchemy.orm import sessionmaker
 import logging
 
-from utils.logging_utils import get_env_logging_level
+from shared.common.logging_common import get_env_logging_level
 
 
 def generate_unique_id() -> str:

api/src/utils/logging_utils.py

@@ -6,17 +6,11 @@
 import google.cloud.logging
 from google.cloud.logging_v2 import Client
 
+from shared.common.logging_common import get_env_logging_level
 from middleware.request_context import get_request_context
 from utils.config import get_config, PROJECT_ID
 
 
-def get_env_logging_level():
-    """
-    Get the logging level from the environment via OS variable LOGGING_LEVEL. Returns INFO if not set.
-    """
-    return os.getenv("LOGGING_LEVEL", "INFO")
-
-
 def is_local_env():
     return os.getenv("K_SERVICE") is None
 
@@ -64,28 +58,31 @@ def init_logger():
             if hasattr(Logger, "initialized"):
                 return
             logging.basicConfig(level=get_env_logging_level())
-            if is_local_env():
+            if not is_local_env():
                 # Use the default logging handler
                 logging.info("Using default logging handler")
-                return
-            try:
-                client = google.cloud.logging_v2.Client()
-                client.get_default_handler()
-                client.setup_logging()
-                logging.info("GCP logging client initialized")
-            except Exception as error:
-                # This might happen when the GCP authorization credentials are not available.
-                # Example, when running the tests locally
-                logging.error(f"Error initializing the logger: {error}")
-        Logger.initialized = True
+            else:
+                try:
+                    client = google.cloud.logging_v2.Client()
+                    client.get_default_handler()
+                    client.setup_logging()
+                    logger = _get_trace_logger(logging.getLogger("LOGGING_UTILS"))
+                    logger.info("GCP logging client initialized")
+                except Exception as error:
+                    # This might happen when the GCP authorization credentials are not available.
+                    # Example, when running the tests locally
+                    logging.error(f"Error initializing the logger: {error}")
+            Logger.initialized = True
 
     def get_logger(self):
         return self.logger
 
 
-class TraceLogger:
+class TraceLogger(logging.Logger):
     def __init__(self, logger: logging.Logger, project_id: str, trace_id: str, span_id: str):
+        super().__init__(logger.name)
         self._logger = logger
+        self._logger.propagate = False
         self._trace_id = None
         self._span_id = None
         self._project_id = project_id
@@ -106,7 +103,7 @@ def _inject_trace(self, extra):
         return trace_fields
 
     def info(self, msg, *args, extra=None, **kwargs):
-        return self._logger.info(msg, *args, extra=self._inject_trace(extra), **kwargs)
+        return self._logger.info(msg, extra=self._inject_trace(extra))
 
     def error(self, msg, *args, extra=None, **kwargs):
         return self._logger.error(msg, *args, extra=self._inject_trace(extra), **kwargs)
@@ -121,16 +118,21 @@ def exception(self, msg, *args, extra=None, **kwargs):
         return self._logger.exception(msg, *args, extra=self._inject_trace(extra), **kwargs)
 
 
-def new_logger(name: str):
+def new_logger(name: str) -> logging.Logger:
     """
     Create a new logger with the given name.
     """
     Logger.init_logger()
     logger = logging.getLogger(name)
     logger.setLevel(get_env_logging_level())
-    request_context = get_request_context()
+    return _get_trace_logger(logger)
     # if not request_context:
     #     return logger
+def _get_trace_logger(logger: logging.Logger) -> TraceLogger:
+    """
+    Create a new TraceLogger with the given logger and name.
+    """
+    request_context = get_request_context()
     return TraceLogger(logger, get_config(PROJECT_ID), request_context.get("trace_id"), request_context.get("span_id"))