fix logging

Author: davidgamez

api/src/feeds/impl/feeds_api_impl.py

@@ -45,7 +45,7 @@
 from feeds.impl.error_handling import raise_http_error, raise_http_validation_error, convert_exception
 from middleware.request_context import is_user_email_restricted
 from utils.date_utils import valid_iso_date
-from utils.logger import Logger
+from shared.common.logging_utils import Logger
 
 T = TypeVar("T", bound="BasicFeed")
 

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 utils.logger import Logger
+from shared.common.logging_utils import Logger
 
 DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S"
 

api/src/scripts/load_dataset_on_create.py

@@ -10,7 +10,7 @@
 from google.cloud.pubsub_v1.futures import Future
 
 from shared.database_gen.sqlacodegen_models import Feed
-from utils.logger import Logger
+from shared.common.logging_utils import Logger
 
 # Lazy create so we won't try to connect to google cloud when the file is imported.
 pubsub_client = None

api/src/scripts/populate_db.py

@@ -9,7 +9,7 @@
 
 from shared.database.database import Database
 from shared.database_gen.sqlacodegen_models import Feed, Gtfsrealtimefeed, Gtfsfeed, Gbfsfeed
-from utils.logger import Logger
+from shared.common.logging_utils import Logger
 
 if TYPE_CHECKING:
     from sqlalchemy.orm import Session

api/src/scripts/populate_db_test_data.py

@@ -17,7 +17,7 @@
     Officialstatushistory,
 )
 from scripts.populate_db import set_up_configs, DatabasePopulateHelper
-from utils.logger import Logger
+from shared.common.logging_utils import Logger
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:

api/src/shared/common/logging_utils.py

@@ -0,0 +1,35 @@
+import logging
+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")
+
+
+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/shared/database/database.py

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

api/src/utils/logger.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
 import logging
-import os
 from dataclasses import dataclass
 from typing import Final, Optional
 
@@ -126,36 +125,3 @@ async def async_emit(self, record):
             jsonPayload=json_payload,
         )
         self.logger.info(json.dumps(log_record.__dict__))
-
-
-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")
-
-
-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/tests/utils/test_logger.py

@@ -1,7 +1,8 @@
 import unittest
 from unittest.mock import patch
 
-from utils.logger import HttpRequest, LogRecord, AsyncStreamHandler, GCPLogHandler, Logger
+from utils.logger import HttpRequest, LogRecord, AsyncStreamHandler, GCPLogHandler
+from shared.common.logging_utils import Logger
 
 
 class TestLogger(unittest.TestCase):

functions-python/backfill_dataset_service_date_range/function_config.json

@@ -6,7 +6,7 @@
   "memory": "2Gi",
   "trigger_http": true,
   "include_folders": ["helpers"],
-  "include_api_folders": ["database_gen", "database"],
+  "include_api_folders": ["database_gen", "database", "common"],
   "secret_environment_variables": [
     {
       "key": "FEEDS_DATABASE_URL"