clean-up logger

Author: davidgamez

api/src/feeds/impl/feeds_api_impl.py

@@ -35,7 +35,6 @@
     InternalHTTPException,
     gbfs_feed_not_found,
 )
-from shared.common.logging_utils import Logger
 from shared.database.database import Database, with_db_session
 from shared.database_gen.sqlacodegen_models import (
     Feed as FeedOrm,
@@ -50,6 +49,7 @@
 from shared.feed_filters.gtfs_feed_filter import LocationFilter
 from shared.feed_filters.gtfs_rt_feed_filter import GtfsRtFeedFilter, EntityTypeFilter
 from utils.date_utils import valid_iso_date
+from utils.logger import get_logger
 
 T = TypeVar("T", bound="Feed")
 
@@ -64,7 +64,7 @@ class FeedsApiImpl(BaseFeedsApi):
     APIFeedType = Union[FeedOrm, GtfsFeed, GtfsRTFeed]
 
     def __init__(self) -> None:
-        self.logger = Logger("FeedsApiImpl").get_logger()
+        self.logger = get_logger("FeedsApiImpl")
 
     @with_db_session
     def get_feed(self, id: str, db_session: Session) -> Feed:

api/src/feeds/impl/models/validation_report_impl.py

@@ -1,6 +1,6 @@
 from shared.database_gen.sqlacodegen_models import Validationreport
 from feeds_gen.models.validation_report import ValidationReport
-from shared.common.logging_utils import Logger
+from utils.logger import get_logger
 
 DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
 
@@ -18,7 +18,7 @@ class Config:
 
     @classmethod
     def _get_logger(cls):
-        return Logger(ValidationReportImpl.__class__.__module__).get_logger()
+        return get_logger(ValidationReportImpl.__class__.__module__)
 
     @classmethod
     def from_orm(cls, validation_report: Validationreport | None) -> ValidationReport | None:

api/src/main.py

@@ -15,7 +15,6 @@
 #
 # This files allows to add extra application decorators aside from the generated code.
 # The app created here is intended to replace the generated feeds_gen.main:app variable.
-import logging
 import os
 
 import uvicorn
@@ -59,9 +58,7 @@
 
 @app.on_event("startup")
 async def startup_event():
-    print("print: TEST_LOG_FROM_MAIN_PY_INIT_QA_PROD")
     global_logging_setup()
-    logging.critical("TEST_LOG_FROM_MAIN_PY_INIT_QA_PROD")
 
 
 if __name__ == "__main__":

api/src/middleware/request_context_middleware.py

@@ -12,7 +12,6 @@ class RequestContextMiddleware:
 
     def __init__(self, app: ASGIApp) -> None:
         self.logger = get_logger(API_ACCESS_LOG)
-        self.logger.critical("MIDDLEWARE_INIT_TEST_QA_PROD")
         self.app = app
 
     @staticmethod
@@ -61,10 +60,6 @@ def log_api_access(
         """
         Log the API access logs.
         """
-        self.logger.critical(
-            f"MIDDLEWARE_USER_ID_CHECK_QA_PROD_CRITICAL: "
-            f"{request_context.user_id if request_context.user_id else 'USER_ID_IS_EMPTY_OR_NONE'}"
-        )
         latency = time.time() - start_time
         request = self.create_http_request(scope, request_context, status_code, content_length, latency)
         headers = {k.decode().lower(): v.decode() for k, v in scope.get("headers", [])}

api/src/scripts/load_dataset_on_create.py

@@ -10,13 +10,13 @@
 from google.cloud.pubsub_v1.futures import Future
 
 from shared.database_gen.sqlacodegen_models import Feed
-from shared.common.logging_utils import Logger
+from utils.logger import get_logger
 
 # Lazy create so we won't try to connect to google cloud when the file is imported.
 pubsub_client = None
 
 lock = threading.Lock()
-logger = Logger("load_dataset_on_create").get_logger()
+logger = get_logger("load_dataset_on_create")
 
 
 def get_pubsub_client():

api/src/scripts/populate_db.py

@@ -9,13 +9,13 @@
 from dotenv import load_dotenv
 from sqlalchemy import text
 
-from shared.common.logging_utils import Logger
 from shared.database.database import Database
 from shared.database.database import configure_polymorphic_mappers
 from shared.database_gen.sqlacodegen_models import Feed, Gtfsrealtimefeed, Gtfsfeed, Gbfsfeed
 from shared.database_gen.sqlacodegen_models import (
     t_feedsearch,
 )
+from utils.logger import get_logger
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
@@ -50,7 +50,7 @@ def __init__(self, filepaths):
         Specify a list of files to load the csv data from.
         Can also be a single string with a file name.
         """
-        self.logger = Logger(self.__class__.__name__).get_logger()
+        self.logger = get_logger(self.__class__.__name__)
         self.logger.setLevel(logging.INFO)
         self.db = Database(echo_sql=False)
         self.df = pandas.DataFrame()

api/src/scripts/populate_db_test_data.py

@@ -20,9 +20,10 @@
     Gbfsfeed,
 )
 from scripts.populate_db import set_up_configs, DatabasePopulateHelper
-from shared.common.logging_utils import Logger
 from typing import TYPE_CHECKING
 
+from utils.logger import get_logger
+
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session
 
@@ -38,7 +39,7 @@ def __init__(self, filepaths):
         Specify a list of files to load the json data from.
         Can also be a single string with a file name.
         """
-        self.logger = Logger(self.__class__.__module__).get_logger()
+        self.logger = get_logger(self.__class__.__module__)
 
         if not isinstance(filepaths, list):
             self.filepaths = [filepaths]

api/src/shared/common/logging_utils.py

@@ -7,29 +7,3 @@ def get_env_logging_level():
     Get the logging level from the environment via OS variable LOGGING_LEVEL. Returns INFO if not set.
     """
     return logging.getLevelName(os.getenv("LOGGING_LEVEL", "INFO"))
-
-
-class Logger:
-    """
-    Util class for logging information, errors or warnings
-    """
-
-    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)
-
-        self.logger = logging.getLogger(name)
-        self.logger.addHandler(console_handler)
-        self.logger.setLevel(get_env_logging_level())
-
-    def get_logger(self):
-        """
-        Get the logger instance
-        :return: the logger instance
-        """
-        return self.logger

api/src/utils/logger.py

@@ -132,7 +132,7 @@ def global_logging_setup():
     try:
         client = google.cloud.logging.Client()
         handler = CloudLoggingHandler(client, structured=True)
-        handler.setLevel(logging.DEBUG)
+        handler.setLevel(get_env_logging_level())
         handler.addFilter(GoogleCloudLogFilter(project=client.project))
     except Exception as e:
         logging.error("Error initializing cloud logging: %s", e)
@@ -141,7 +141,7 @@ def global_logging_setup():
 
     # Configure root logger
     root_logger = logging.getLogger()
-    root_logger.setLevel(logging.DEBUG)
+    root_logger.setLevel(get_env_logging_level())
     root_logger.handlers.clear()
     root_logger.addHandler(handler)