improve catalog instrumentation

Author: bisgaard-itis

services/catalog/src/simcore_service_catalog/core/application.py

@@ -46,13 +46,13 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     # STATE
     app.state.settings = settings
 
-    add_tracing = False
-    if app.state.settings.CATALOG_TRACING:
-        add_tracing = True
-        setup_tracing(app, app.state.settings.CATALOG_TRACING, APP_NAME)
+    if settings.CATALOG_TRACING:
+        setup_tracing(app, settings.CATALOG_TRACING, APP_NAME)
 
     # STARTUP-EVENT
-    app.add_event_handler("startup", create_on_startup(app, add_tracing=add_tracing))
+    app.add_event_handler(
+        "startup", create_on_startup(app, tracing_settings=settings.CATALOG_TRACING)
+    )
 
     # PLUGIN SETUP
     setup_function_services(app)

services/catalog/src/simcore_service_catalog/core/events.py

@@ -5,6 +5,7 @@
 from fastapi import FastAPI
 from servicelib.fastapi.db_asyncpg_engine import close_db_connection, connect_to_db
 from servicelib.logging_utils import log_context
+from settings_library.tracing import TracingSettings
 
 from .._meta import APP_FINISHED_BANNER_MSG, APP_STARTED_BANNER_MSG
 from ..db.events import setup_default_product
@@ -26,7 +27,9 @@ def _flush_finished_banner() -> None:
     print(APP_FINISHED_BANNER_MSG, flush=True)  # noqa: T201
 
 
-def create_on_startup(app: FastAPI, add_tracing: bool = False) -> EventCallable:
+def create_on_startup(
+    app: FastAPI, tracing_settings: TracingSettings | None
+) -> EventCallable:
     async def _() -> None:
         _flush_started_banner()
 
@@ -37,7 +40,7 @@ async def _() -> None:
 
         if app.state.settings.CATALOG_DIRECTOR:
             # setup connection to director
-            await setup_director(app, add_tracing=add_tracing)
+            await setup_director(app, tracing_settings=tracing_settings)
 
             # FIXME: check director service is in place and ready. Hand-shake??
             # SEE https://github.com/ITISFoundation/osparc-simcore/issues/1728

services/catalog/src/simcore_service_catalog/services/director.py

@@ -13,6 +13,7 @@
 from models_library.utils.json_serialization import json_dumps
 from servicelib.fastapi.tracing import setup_httpx_client_tracing
 from servicelib.logging_utils import log_context
+from settings_library.tracing import TracingSettings
 from starlette import status
 from tenacity.asyncio import AsyncRetrying
 from tenacity.before_sleep import before_sleep_log
@@ -107,12 +108,14 @@ class DirectorApi:
     SEE services/catalog/src/simcore_service_catalog/api/dependencies/director.py
     """
 
-    def __init__(self, base_url: str, app: FastAPI, add_tracing: bool = False):
+    def __init__(
+        self, base_url: str, app: FastAPI, tracing_settings: TracingSettings | None
+    ):
         self.client = httpx.AsyncClient(
             base_url=base_url,
             timeout=app.state.settings.CATALOG_CLIENT_REQUEST.HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT,
         )
-        if add_tracing:
+        if tracing_settings:
             setup_httpx_client_tracing(self.client)
         self.vtag = app.state.settings.CATALOG_DIRECTOR.DIRECTOR_VTAG
 
@@ -154,7 +157,9 @@ async def get_service(
         return ServiceMetaDataPublished.parse_obj(data[0])
 
 
-async def setup_director(app: FastAPI, add_tracing: bool = False) -> None:
+async def setup_director(
+    app: FastAPI, tracing_settings: TracingSettings | None
+) -> None:
     if settings := app.state.settings.CATALOG_DIRECTOR:
         with log_context(
             _logger, logging.DEBUG, "Setup director at %s", f"{settings.base_url=}"