propagate fastapi instrumentatoin

bisgaard-itis · bisgaard-itis · commit 1e4583ec8c7c · 2025-09-29T10:41:57.000+02:00
diff --git a/packages/service-library/src/servicelib/fastapi/tracing.py b/packages/service-library/src/servicelib/fastapi/tracing.py
@@ -203,11 +203,16 @@ def _shutdown(tracing_data: TracingData) -> None:
 
 
 def initialize_fastapi_app_tracing(
-    app: FastAPI, *, add_response_trace_id_header: bool = False
+    app: FastAPI,
+    *,
+    tracing_data: TracingData,
+    add_response_trace_id_header: bool = False,
 ):
     if add_response_trace_id_header:
         app.add_middleware(ResponseTraceIdHeaderMiddleware)
-    FastAPIInstrumentor.instrument_app(app)
+    FastAPIInstrumentor.instrument_app(
+        app, tracer_provider=tracing_data.tracer_provider
+    )
 
 
 def setup_httpx_client_tracing(client: AsyncClient | Client):
diff --git a/packages/service-library/tests/fastapi/test_tracing.py b/packages/service-library/tests/fastapi/test_tracing.py
@@ -241,7 +241,9 @@ async def handler(handler_data: dict):
         tracing_settings=tracing_settings,
         tracing_data=tracing_data,
     )(app=mocked_app):
-        initialize_fastapi_app_tracing(mocked_app, add_response_trace_id_header=True)
+        initialize_fastapi_app_tracing(
+            mocked_app, tracing_data=tracing_data, add_response_trace_id_header=True
+        )
         client = TestClient(mocked_app)
         response = client.get("/")
         assert _OSPARC_TRACE_ID_HEADER in response.headers
@@ -294,7 +296,9 @@ async def handler(handler_data: dict):
         tracing_settings=tracing_settings,
         tracing_data=tracing_data,
     )(app=mocked_app):
-        initialize_fastapi_app_tracing(mocked_app, add_response_trace_id_header=True)
+        initialize_fastapi_app_tracing(
+            mocked_app, tracing_data=tracing_data, add_response_trace_id_header=True
+        )
         client = TestClient(mocked_app)
         _ = client.get("/")
         trace_id = handler_data.get(_OSPARC_TRACE_ID_HEADER)
@@ -344,7 +348,9 @@ async def handler():
         tracing_settings=tracing_settings,
         tracing_data=tracing_data,
     )(app=mocked_app):
-        initialize_fastapi_app_tracing(mocked_app, add_response_trace_id_header=True)
+        initialize_fastapi_app_tracing(
+            mocked_app, tracing_data=tracing_data, add_response_trace_id_header=True
+        )
         client = TestClient(mocked_app)
         for _ in range(n_requests):
             client.get("/")
diff --git a/services/agent/src/simcore_service_agent/core/application.py b/services/agent/src/simcore_service_agent/core/application.py
@@ -7,6 +7,7 @@
     override_fastapi_openapi_method,
 )
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -62,7 +63,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     setup_rpc_api_routes(app)
 
     if settings.AGENT_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     async def _on_startup() -> None:
         print(APP_STARTED_BANNER_MSG, flush=True)  # noqa: T201
diff --git a/services/catalog/src/simcore_service_catalog/core/application.py b/services/catalog/src/simcore_service_catalog/core/application.py
@@ -11,6 +11,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -60,12 +61,12 @@ def create_app(
 
     # MIDDLEWARES
     if settings.CATALOG_TRACING:
-        setup_tracing(app, settings.CATALOG_TRACING, APP_NAME)
+        setup_tracing(app, settings.CATALOG_TRACING, service_name=APP_NAME)
     if settings.CATALOG_PROMETHEUS_INSTRUMENTATION_ENABLED:
         setup_prometheus_instrumentation(app)
 
     if settings.CATALOG_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     if settings.SC_BOOT_MODE != BootModeEnum.PRODUCTION:
         # middleware to time requests (ONLY for development)
diff --git a/services/clusters-keeper/src/simcore_service_clusters_keeper/core/application.py b/services/clusters-keeper/src/simcore_service_clusters_keeper/core/application.py
@@ -5,6 +5,7 @@
     setup_prometheus_instrumentation,
 )
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -64,7 +65,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_clusters_management(app)
 
     if app.state.settings.CLUSTERS_KEEPER_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
     # ERROR HANDLERS
 
     # EVENTS
diff --git a/services/datcore-adapter/src/simcore_service_datcore_adapter/core/application.py b/services/datcore-adapter/src/simcore_service_datcore_adapter/core/application.py
@@ -11,6 +11,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -63,7 +64,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     app.add_middleware(GZipMiddleware)
 
     if app.state.settings.DATCORE_ADAPTER_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     # events
     app.add_event_handler("startup", on_startup)
diff --git a/services/director-v2/src/simcore_service_director_v2/core/application.py b/services/director-v2/src/simcore_service_director_v2/core/application.py
@@ -13,6 +13,7 @@
 )
 from servicelib.fastapi.profiler import initialize_profiler
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -199,7 +200,7 @@ def create_app(  # noqa: C901, PLR0912
     db.setup(app, settings.POSTGRES)
 
     if settings.DIRECTOR_V2_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     if settings.DYNAMIC_SERVICES.DIRECTOR_V2_DYNAMIC_SERVICES_ENABLED:
         dynamic_services.setup(app, tracing_settings=settings.DIRECTOR_V2_TRACING)
diff --git a/services/director/src/simcore_service_director/core/application.py b/services/director/src/simcore_service_director/core/application.py
@@ -5,6 +5,7 @@
 from servicelib.fastapi.client_session import setup_client_session
 from servicelib.fastapi.http_error import set_app_default_http_error_handlers
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -55,7 +56,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_registry(app)
 
     if app.state.settings.DIRECTOR_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     # ERROR HANDLERS
     set_app_default_http_error_handlers(app)
diff --git a/services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/application.py b/services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/application.py
@@ -61,6 +61,6 @@ def create_app(
 
     if app_settings.DYNAMIC_SCHEDULER_TRACING:
         assert tracing_data  # nosec
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=tracing_data)
 
     return app
diff --git a/services/invitations/src/simcore_service_invitations/core/application.py b/services/invitations/src/simcore_service_invitations/core/application.py
@@ -4,6 +4,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -48,7 +49,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
         setup_prometheus_instrumentation(app)
 
     if app.state.settings.INVITATIONS_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     # ERROR HANDLERS
     exceptions_handlers.setup(app)
diff --git a/services/notifications/src/simcore_service_notifications/core/application.py b/services/notifications/src/simcore_service_notifications/core/application.py
@@ -10,6 +10,7 @@
     override_fastapi_openapi_method,
 )
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -50,6 +51,6 @@ def create_app(
         initialize_prometheus_instrumentation(app)
 
     if settings.NOTIFICATIONS_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     return app
diff --git a/services/payments/src/simcore_service_payments/core/application.py b/services/payments/src/simcore_service_payments/core/application.py
@@ -4,6 +4,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -78,7 +79,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
         setup_prometheus_instrumentation(app)
 
     if app.state.settings.PAYMENTS_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     # ERROR HANDLERS
     # ... add here ...
diff --git a/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/core/application.py b/services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/core/application.py
@@ -3,6 +3,7 @@
 from fastapi import FastAPI
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -74,7 +75,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_process_message_running_service(app)  # Requires Rabbit
 
     if app.state.settings.RESOURCE_USAGE_TRACKER_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     # ERROR HANDLERS
     setup_exception_handlers(app)
diff --git a/services/storage/src/simcore_service_storage/core/application.py b/services/storage/src/simcore_service_storage/core/application.py
@@ -18,6 +18,7 @@
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.profiler import ProfilerMiddleware
 from servicelib.fastapi.tracing import (
+    get_tracing_data,
     initialize_fastapi_app_tracing,
     setup_tracing,
 )
@@ -103,7 +104,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:  # noqa: C901
         setup_prometheus_instrumentation(app)
 
     if settings.STORAGE_TRACING:
-        initialize_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))
 
     async def _on_startup() -> None:
         if settings.STORAGE_WORKER_MODE:

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`override_fastapi_openapi_method,`
`8`	`8`	`)`
`9`	`9`	`from servicelib.fastapi.tracing import (`
	`10`	`+ get_tracing_data,`
`10`	`11`	`initialize_fastapi_app_tracing,`
`11`	`12`	`setup_tracing,`
`12`	`13`	`)`
`@@ -62,7 +63,7 @@ def create_app(settings: ApplicationSettings \| None = None) -> FastAPI:`
`62`	`63`	`setup_rpc_api_routes(app)`
`63`	`64`
`64`	`65`	`if settings.AGENT_TRACING:`
`65`		`- initialize_fastapi_app_tracing(app)`
	`66`	`+ initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))`
`66`	`67`
`67`	`68`	`async def _on_startup() -> None:`
`68`	`69`	`print(APP_STARTED_BANNER_MSG, flush=True) # noqa: T201`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`setup_prometheus_instrumentation,`
`6`	`6`	`)`
`7`	`7`	`from servicelib.fastapi.tracing import (`
	`8`	`+ get_tracing_data,`
`8`	`9`	`initialize_fastapi_app_tracing,`
`9`	`10`	`setup_tracing,`
`10`	`11`	`)`
`@@ -64,7 +65,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:`
`64`	`65`	`setup_clusters_management(app)`
`65`	`66`
`66`	`67`	`if app.state.settings.CLUSTERS_KEEPER_TRACING:`
`67`		`- initialize_fastapi_app_tracing(app)`
	`68`	`+ initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))`
`68`	`69`	`# ERROR HANDLERS`
`69`	`70`
`70`	`71`	`# EVENTS`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`)`
`12`	`12`	`from servicelib.fastapi.openapi import override_fastapi_openapi_method`
`13`	`13`	`from servicelib.fastapi.tracing import (`
	`14`	`+ get_tracing_data,`
`14`	`15`	`initialize_fastapi_app_tracing,`
`15`	`16`	`setup_tracing,`
`16`	`17`	`)`
`@@ -63,7 +64,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:`
`63`	`64`	`app.add_middleware(GZipMiddleware)`
`64`	`65`
`65`	`66`	`if app.state.settings.DATCORE_ADAPTER_TRACING:`
`66`		`- initialize_fastapi_app_tracing(app)`
	`67`	`+ initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))`
`67`	`68`
`68`	`69`	`# events`
`69`	`70`	`app.add_event_handler("startup", on_startup)`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`)`
`14`	`14`	`from servicelib.fastapi.profiler import initialize_profiler`
`15`	`15`	`from servicelib.fastapi.tracing import (`
	`16`	`+ get_tracing_data,`
`16`	`17`	`initialize_fastapi_app_tracing,`
`17`	`18`	`setup_tracing,`
`18`	`19`	`)`
`@@ -199,7 +200,7 @@ def create_app( # noqa: C901, PLR0912`
`199`	`200`	`db.setup(app, settings.POSTGRES)`
`200`	`201`
`201`	`202`	`if settings.DIRECTOR_V2_TRACING:`
`202`		`- initialize_fastapi_app_tracing(app)`
	`203`	`+ initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))`
`203`	`204`
`204`	`205`	`if settings.DYNAMIC_SERVICES.DIRECTOR_V2_DYNAMIC_SERVICES_ENABLED:`
`205`	`206`	`dynamic_services.setup(app, tracing_settings=settings.DIRECTOR_V2_TRACING)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`)`
`5`	`5`	`from servicelib.fastapi.openapi import override_fastapi_openapi_method`
`6`	`6`	`from servicelib.fastapi.tracing import (`
	`7`	`+ get_tracing_data,`
`7`	`8`	`initialize_fastapi_app_tracing,`
`8`	`9`	`setup_tracing,`
`9`	`10`	`)`
`@@ -48,7 +49,7 @@ def create_app(settings: ApplicationSettings \| None = None) -> FastAPI:`
`48`	`49`	`setup_prometheus_instrumentation(app)`
`49`	`50`
`50`	`51`	`if app.state.settings.INVITATIONS_TRACING:`
`51`		`- initialize_fastapi_app_tracing(app)`
	`52`	`+ initialize_fastapi_app_tracing(app, tracing_data=get_tracing_data(app))`
`52`	`53`
`53`	`54`	`# ERROR HANDLERS`
`54`	`55`	`exceptions_handlers.setup(app)`