Merge pull request #360 from LACMTA:2023-api-optimization

Update logging configuration and dependencies

fastapi/app/main.py

@@ -2,7 +2,7 @@
 from distutils.command.config import config
 from typing import Union, List, Dict, Optional
 from versiontag import get_version
-import queue
+
 import http
 import json
 import requests
@@ -62,11 +62,7 @@
 from .config import Config
 from pathlib import Path
 
-from pythonjsonlogger import jsonlogger
-import logging.handlers
-
 from logzio.handler import LogzioHandler
-
 import logging
 import typing as t
 
@@ -688,16 +684,12 @@ def read_user(username: str, db: Session = Depends(get_db),token: str = Depends(
 async def get_all_routes():
     return [route.path for route in app.routes]
 
-
-
 @app.on_event("startup")
 async def startup_event():
-    log_queue = queue.Queue(-1)
     uvicorn_access_logger = logging.getLogger("uvicorn.access")
     uvicorn_error_logger = logging.getLogger("uvicorn.error")
     logger = logging.getLogger("uvicorn.app")
-
-    logzio_formatter = jsonlogger.JsonFormatter("%(message)s")
+    logzio_formatter = logging.Formatter("%(message)s")
     logzio_uvicorn_access_handler = LogzioHandler(Config.LOGZIO_TOKEN, 'uvicorn.access', 5, Config.LOGZIO_URL)
     logzio_uvicorn_access_handler.setLevel(logging.INFO)
     logzio_uvicorn_access_handler.setFormatter(logzio_formatter)
@@ -710,18 +702,14 @@ async def startup_event():
     logzio_app_handler.setLevel(logging.INFO)
     logzio_app_handler.setFormatter(logzio_formatter)
 
-    uvicorn_access_logger.addHandler(logging.handlers.QueueHandler(log_queue))
-    uvicorn_error_logger.addHandler(logging.handlers.QueueHandler(log_queue))
-    logger.addHandler(logging.handlers.QueueHandler(log_queue))
+    uvicorn_access_logger.addHandler(logzio_uvicorn_access_handler)
+    uvicorn_error_logger.addHandler(logzio_uvicorn_error_handler)
+    logger.addHandler(logzio_app_handler)
 
     uvicorn_access_logger.addFilter(LogFilter())
     uvicorn_error_logger.addFilter(LogFilter())
     logger.addFilter(LogFilter())
 
-    queue_listener = logging.handlers.QueueListener(
-        log_queue, logzio_uvicorn_access_handler, logzio_uvicorn_error_handler, logzio_app_handler
-    )
-    queue_listener.start()
 
 app.add_middleware(
     CORSMiddleware,

fastapi/app/requirements.txt

@@ -24,7 +24,6 @@ pandas
 polyline
 websockets
 fastapi-cache2[redis]
-python-json-logger
 pymemcache
 asyncio
 asyncpg

fastapi/requirements.txt

@@ -32,8 +32,6 @@ sqlalchemy[asyncio]
 versiontag
 gitpython
 fastapi-pagination
-prometheus-fastapi-instrumentator
-prometheus_client
 geojson
 pytest
 asyncpg