add instrumentation to httpx client in catalog

Author: bisgaard-itis

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

@@ -46,8 +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)
+
     # STARTUP-EVENT
-    app.add_event_handler("startup", create_on_startup(app))
+    app.add_event_handler("startup", create_on_startup(app, add_tracing=add_tracing))
 
     # PLUGIN SETUP
     setup_function_services(app)
@@ -65,8 +70,6 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
         app.add_middleware(
             BaseHTTPMiddleware, dispatch=timing_middleware.add_process_time_header
         )
-    if app.state.settings.CATALOG_TRACING:
-        setup_tracing(app, app.state.settings.CATALOG_TRACING, APP_NAME)
 
     app.add_middleware(GZipMiddleware)
 

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

@@ -26,7 +26,7 @@ def _flush_finished_banner() -> None:
     print(APP_FINISHED_BANNER_MSG, flush=True)  # noqa: T201
 
 
-def create_on_startup(app: FastAPI) -> EventCallable:
+def create_on_startup(app: FastAPI, add_tracing: bool = False) -> EventCallable:
     async def _() -> None:
         _flush_started_banner()
 
@@ -37,7 +37,7 @@ async def _() -> None:
 
         if app.state.settings.CATALOG_DIRECTOR:
             # setup connection to director
-            await setup_director(app)
+            await setup_director(app, add_tracing=add_tracing)
 
             # 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

@@ -11,6 +11,7 @@
 from models_library.services_metadata_published import ServiceMetaDataPublished
 from models_library.services_types import ServiceKey, ServiceVersion
 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 starlette import status
 from tenacity.asyncio import AsyncRetrying
@@ -106,11 +107,13 @@ class DirectorApi:
     SEE services/catalog/src/simcore_service_catalog/api/dependencies/director.py
     """
 
-    def __init__(self, base_url: str, app: FastAPI):
+    def __init__(self, base_url: str, app: FastAPI, add_tracing: bool = False):
         self.client = httpx.AsyncClient(
             base_url=base_url,
             timeout=app.state.settings.CATALOG_CLIENT_REQUEST.HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT,
         )
+        if add_tracing:
+            setup_httpx_client_tracing(self.client)
         self.vtag = app.state.settings.CATALOG_DIRECTOR.DIRECTOR_VTAG
 
     async def close(self):
@@ -151,15 +154,19 @@ async def get_service(
         return ServiceMetaDataPublished.parse_obj(data[0])
 
 
-async def setup_director(app: FastAPI) -> None:
+async def setup_director(app: FastAPI, add_tracing: bool = False) -> None:
     if settings := app.state.settings.CATALOG_DIRECTOR:
         with log_context(
             _logger, logging.DEBUG, "Setup director at %s", f"{settings.base_url=}"
         ):
             async for attempt in AsyncRetrying(**_director_startup_retry_policy):
-                client = DirectorApi(base_url=settings.base_url, app=app)
+                client = DirectorApi(
+                    base_url=settings.base_url, app=app, add_tracing=add_tracing
+                )
                 with attempt:
-                    client = DirectorApi(base_url=settings.base_url, app=app)
+                    client = DirectorApi(
+                        base_url=settings.base_url, app=app, add_tracing=add_tracing
+                    )
                     if not await client.is_responsive():
                         with suppress(Exception):
                             await client.close()