Add local and cloud logger

Author: davidgamez

api/src/middleware/request_context_middleware.py

@@ -4,6 +4,7 @@
 
 from middleware.request_context import RequestContext, _request_context
 from utils.logger import HttpRequest, API_ACCESS_LOG
+from shared.common.logging_utils import Logger
 
 
 class RequestContextMiddleware:
@@ -12,7 +13,8 @@ class RequestContextMiddleware:
     """
 
     def __init__(self, app: ASGIApp) -> None:
-        self.logger = logging.getLogger(API_ACCESS_LOG)
+        # self.logger = logging.getLogger(API_ACCESS_LOG)
+        self.logger = Logger(API_ACCESS_LOG).get_logger()
         self.app = app
 
     @staticmethod
@@ -38,10 +40,12 @@ def create_http_request(
         """
         request_method = scope["method"]
         request_path = scope["path"]
+        query_string = scope.get("query_string", b"").decode("utf-8")
         protocol = scope["scheme"].upper() + "/" + str(scope["http_version"])
         return HttpRequest(
             requestMethod=request_method,
             requestUrl=f"{request_context.protocol}://{request_context.host}{request_path}",
+            queryString=query_string,
             remoteIp=request_context.client_host,
             protocol=protocol,
             status=status_code,

api/src/shared/common/logging_utils.py

@@ -1,5 +1,7 @@
 import logging
 import os
+from google.cloud.logging.handlers import CloudLoggingHandler
+import google.cloud.logging
 
 
 def get_env_logging_level():
@@ -9,27 +11,54 @@ def get_env_logging_level():
     return os.getenv("LOGGING_LEVEL", "INFO")
 
 
+def is_local_env():
+    return os.getenv("K_SERVICE") is None
+
+
 class Logger:
     """
-    Util class for logging information, errors or warnings
+    GCP-friendly logger: structured JSON output, works locally or in production.
     """
 
-    def __init__(self, name):
-        """
-        Initialize the logger
-        """
-        formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s")
-
-        console_handler = logging.StreamHandler()
-        console_handler.setFormatter(formatter)
-
+    def __init__(self, name: str):
         self.logger = logging.getLogger(name)
-        self.logger.addHandler(console_handler)
         self.logger.setLevel(get_env_logging_level())
+        self.logger.handlers.clear()
+
+        # formatter = jsonlogger.JsonFormatter(
+        #     '%(asctime)s %(levelname)s %(name)s %(message)s'
+        # )
+
+        if is_local_env():
+            handler = logging.StreamHandler()
+        else:
+            try:
+                client = google.cloud.logging.Client()
+                handler = CloudLoggingHandler(client)
+            except Exception as e:
+                # fallback to stdout if cloud client fails
+                self.logger.error(f"GCP logging failed, using fallback: {e}")
+                handler = logging.StreamHandler()
+
+        # handler.setFormatter(formatter)
+        self.logger.addHandler(handler)
+
+        # Also configure SQLAlchemy to use this logger
+        self.setup_sqlalchemy_logger(handler)
+
+    def setup_sqlalchemy_logger(self, handler):
+        sqlalchemy_loggers = [
+            "sqlalchemy.engine",
+            # "sqlalchemy.pool",
+            # "sqlalchemy.dialects.postgresql",
+            "sqlalchemy.engine.Engine"
+        ]
+        for logger_name in sqlalchemy_loggers:
+            logger = logging.getLogger(logger_name)
+            logger.setLevel(get_env_logging_level())
+            logger.handlers.clear()
+            logger.addHandler(handler)
+            logger.propagate = False
 
     def get_logger(self):
-        """
-        Get the logger instance
-        :return: the logger instance
-        """
         return self.logger

api/src/utils/logger.py

@@ -29,6 +29,7 @@ class HttpRequest:
     serverIp: str
     latency: float
     protocol: str
+    queryString: str
 
 
 @dataclass