Merge branch 'master' into add-support_standard_group_id-to-statics

Author: matusdrobuliak66

packages/service-library/src/servicelib/fastapi/client_session.py

@@ -2,20 +2,25 @@
 
 import httpx
 from fastapi import FastAPI
+from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from settings_library.tracing import TracingSettings
 
 
 def setup_client_session(
     app: FastAPI,
     *,
     default_timeout: datetime.timedelta = datetime.timedelta(seconds=20),
-    max_keepalive_connections: int = 20
+    max_keepalive_connections: int = 20,
+    tracing_settings: TracingSettings | None,
 ) -> None:
     async def on_startup() -> None:
         session = httpx.AsyncClient(
             transport=httpx.AsyncHTTPTransport(http2=True),
             limits=httpx.Limits(max_keepalive_connections=max_keepalive_connections),
             timeout=default_timeout.total_seconds(),
         )
+        if tracing_settings:
+            setup_httpx_client_tracing(session)
         app.state.aiohttp_client_session = session
 
     async def on_shutdown() -> None:

services/director/src/simcore_service_director/core/application.py

@@ -50,6 +50,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
         app,
         max_keepalive_connections=settings.DIRECTOR_REGISTRY_CLIENT_MAX_KEEPALIVE_CONNECTIONS,
         default_timeout=settings.DIRECTOR_REGISTRY_CLIENT_TIMEOUT,
+        tracing_settings=settings.DIRECTOR_TRACING,
     )
     setup_registry(app)
 

services/storage/src/simcore_service_storage/core/application.py

@@ -69,7 +69,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:  # noqa: C901
 
     setup_db(app)
     setup_s3(app)
-    setup_client_session(app)
+    setup_client_session(app, tracing_settings=settings.STORAGE_TRACING)
 
     if settings.STORAGE_CELERY and not settings.STORAGE_WORKER_MODE:
         setup_rabbitmq(app)