convert rest of fastapi apps

bisgaard-itis · bisgaard-itis · commit 97ded34e9707 · 2025-05-25T08:50:24.000+02:00
diff --git a/packages/service-library/src/servicelib/fastapi/tracing.py b/packages/service-library/src/servicelib/fastapi/tracing.py
@@ -188,7 +188,7 @@ def setup_httpx_client_tracing(client: AsyncClient | Client):
     HTTPXClientInstrumentor.instrument_client(client)
 
 
-def setup_tracing(
+def tracing_instrument_tooling(
     app: FastAPI, tracing_settings: TracingSettings, service_name: str
 ) -> None:
     # NOTE: This does not instrument the app itself. Call setup_fastapi_app_tracing to do that.
diff --git a/services/agent/src/simcore_service_agent/core/application.py b/services/agent/src/simcore_service_agent/core/application.py
@@ -5,7 +5,10 @@
     get_common_oas_options,
     override_fastapi_openapi_method,
 )
-from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 from servicelib.logging_utils import config_all_loggers
 
 from .._meta import (
@@ -56,7 +59,7 @@ def create_app() -> FastAPI:
     app.state.settings = settings
 
     if settings.AGENT_TRACING:
-        setup_tracing(app, settings.AGENT_TRACING, APP_NAME)
+        tracing_instrument_tooling(app, settings.AGENT_TRACING, APP_NAME)
 
     setup_instrumentation(app)
 
diff --git a/services/api-server/src/simcore_service_api_server/core/application.py b/services/api-server/src/simcore_service_api_server/core/application.py
@@ -5,7 +5,10 @@
 from models_library.basic_types import BootModeEnum
 from packaging.version import Version
 from servicelib.fastapi.profiler import initialize_profiler
-from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 from servicelib.logging_utils import config_all_loggers
 
 from .. import exceptions
@@ -83,7 +86,7 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
     app.state.settings = settings
 
     if settings.API_SERVER_TRACING:
-        setup_tracing(app, settings.API_SERVER_TRACING, APP_NAME)
+        tracing_instrument_tooling(app, settings.API_SERVER_TRACING, APP_NAME)
 
     if settings.API_SERVER_POSTGRES:
         setup_postgres(app)
diff --git a/services/autoscaling/src/simcore_service_autoscaling/core/application.py b/services/autoscaling/src/simcore_service_autoscaling/core/application.py
@@ -1,7 +1,10 @@
 import logging
 
 from fastapi import FastAPI
-from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 
 from .._meta import (
     API_VERSION,
@@ -61,7 +64,9 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
 
     # PLUGINS SETUP
     if app.state.settings.AUTOSCALING_TRACING:
-        setup_tracing(app, app.state.settings.AUTOSCALING_TRACING, APP_NAME)
+        tracing_instrument_tooling(
+            app, app.state.settings.AUTOSCALING_TRACING, APP_NAME
+        )
 
     setup_instrumentation(app)
     setup_api_routes(app)
diff --git a/services/catalog/src/simcore_service_catalog/core/application.py b/services/catalog/src/simcore_service_catalog/core/application.py
@@ -8,7 +8,10 @@
     setup_prometheus_instrumentation,
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
-from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 from starlette.middleware.base import BaseHTTPMiddleware
 
 from .._meta import (
@@ -64,7 +67,7 @@ def create_app() -> FastAPI:
 
     # MIDDLEWARES
     if settings.CATALOG_TRACING:
-        setup_tracing(app, settings.CATALOG_TRACING, APP_NAME)
+        tracing_instrument_tooling(app, settings.CATALOG_TRACING, APP_NAME)
     if settings.CATALOG_PROMETHEUS_INSTRUMENTATION_ENABLED:
         setup_prometheus_instrumentation(app)
 
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
@@ -4,7 +4,10 @@
 from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation,
 )
-from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 
 from .._meta import (
     API_VERSION,
@@ -59,7 +62,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     assert app.state.settings.API_VERSION == API_VERSION  # nosec
 
     if app.state.settings.CLUSTERS_KEEPER_TRACING:
-        setup_tracing(
+        tracing_instrument_tooling(
             app,
             app.state.settings.CLUSTERS_KEEPER_TRACING,
             APP_NAME,
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
@@ -10,7 +10,10 @@
     setup_prometheus_instrumentation,
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
-from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 from starlette.middleware.base import BaseHTTPMiddleware
 
 from .._meta import API_VERSION, API_VTAG, APP_NAME
@@ -61,7 +64,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     app.state.settings = settings
 
     if app.state.settings.DATCORE_ADAPTER_TRACING:
-        setup_tracing(
+        tracing_instrument_tooling(
             app,
             app.state.settings.DATCORE_ADAPTER_TRACING,
             APP_NAME,
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
@@ -7,7 +7,10 @@
     override_fastapi_openapi_method,
 )
 from servicelib.fastapi.profiler import initialize_profiler
-from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 from servicelib.logging_utils import config_all_loggers
 
 from .._meta import API_VERSION, API_VTAG, APP_NAME, PROJECT_NAME, SUMMARY
@@ -146,7 +149,7 @@ def init_app(settings: AppSettings | None = None) -> FastAPI:
     substitutions.setup(app)
 
     if settings.DIRECTOR_V2_TRACING:
-        setup_tracing(app, settings.DIRECTOR_V2_TRACING, APP_NAME)
+        tracing_instrument_tooling(app, settings.DIRECTOR_V2_TRACING, APP_NAME)
 
     if settings.DIRECTOR_V2_PROMETHEUS_INSTRUMENTATION_ENABLED:
         instrumentation.setup(app)
diff --git a/services/director/src/simcore_service_director/core/application.py b/services/director/src/simcore_service_director/core/application.py
@@ -4,7 +4,10 @@
 from fastapi import FastAPI
 from servicelib.async_utils import cancel_sequential_workers
 from servicelib.fastapi.client_session import setup_client_session
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 
 from .._meta import (
     API_VERSION,
@@ -49,7 +52,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
 
     # PLUGINS SETUP
     if app.state.settings.DIRECTOR_TRACING:
-        setup_tracing(app, app.state.settings.DIRECTOR_TRACING, APP_NAME)
+        tracing_instrument_tooling(app, app.state.settings.DIRECTOR_TRACING, APP_NAME)
 
     setup_api_routes(app)
 
@@ -62,6 +65,9 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     )
     setup_registry(app)
 
+    if app.state.settings.DIRECTOR_TRACING:
+        setup_fastapi_app_tracing(app)
+
     # ERROR HANDLERS
 
     # EVENTS
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
@@ -28,8 +28,6 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
         lifespan=events.create_app_lifespan(settings=app_settings),
     )
     override_fastapi_openapi_method(app)
-    if app_settings.DYNAMIC_SCHEDULER_TRACING:
-        setup_fastapi_app_tracing(app)
 
     # STATE
     app.state.settings = app_settings
@@ -45,4 +43,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     if app_settings.DYNAMIC_SCHEDULER_PROFILING:
         initialize_profiler(app)
 
+    if app_settings.DYNAMIC_SCHEDULER_TRACING:
+        setup_fastapi_app_tracing(app)
+
     return app
diff --git a/services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/application.py b/services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/application.py
@@ -9,7 +9,10 @@
     get_common_oas_options,
     override_fastapi_openapi_method,
 )
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 from servicelib.logging_utils import config_all_loggers
 from simcore_sdk.node_ports_common.exceptions import NodeNotFound
 
@@ -176,7 +179,9 @@ def create_app():
     application_settings: ApplicationSettings = app.state.settings
 
     if application_settings.DYNAMIC_SIDECAR_TRACING:
-        setup_tracing(app, application_settings.DYNAMIC_SIDECAR_TRACING, PROJECT_NAME)
+        tracing_instrument_tooling(
+            app, application_settings.DYNAMIC_SIDECAR_TRACING, PROJECT_NAME
+        )
 
     setup_rabbitmq(app)
     setup_rpc_api_routes(app)
@@ -196,6 +201,9 @@ def create_app():
     if application_settings.are_prometheus_metrics_enabled:
         setup_prometheus_metrics(app)
 
+    if application_settings.DYNAMIC_SIDECAR_TRACING:
+        setup_fastapi_app_tracing(app)
+
     # ERROR HANDLERS  ------------
     app.add_exception_handler(
         NodeNotFound,
diff --git a/services/efs-guardian/src/simcore_service_efs_guardian/core/application.py b/services/efs-guardian/src/simcore_service_efs_guardian/core/application.py
@@ -1,7 +1,10 @@
 import logging
 
 from fastapi import FastAPI
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 
 from .._meta import (
     API_VERSION,
@@ -43,7 +46,9 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     app.state.settings = app_settings
     assert app.state.settings.API_VERSION == API_VERSION  # nosec
     if app.state.settings.EFS_GUARDIAN_TRACING:
-        setup_tracing(app, app.state.settings.EFS_GUARDIAN_TRACING, APP_NAME)
+        tracing_instrument_tooling(
+            app, app.state.settings.EFS_GUARDIAN_TRACING, APP_NAME
+        )
 
     # PLUGINS SETUP
     setup_rabbitmq(app)
@@ -59,6 +64,9 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
 
     setup_fire_and_forget(app)
 
+    if app.state.settings.EFS_GUARDIAN_TRACING:
+        setup_fastapi_app_tracing(app)
+
     # EVENTS
     async def _on_startup() -> None:
         print(APP_STARTED_BANNER_MSG, flush=True)  # noqa: T201
diff --git a/services/invitations/src/simcore_service_invitations/core/application.py b/services/invitations/src/simcore_service_invitations/core/application.py
@@ -3,7 +3,10 @@
     setup_prometheus_instrumentation,
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 
 from .._meta import (
     API_VERSION,
@@ -35,14 +38,20 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     app.state.settings = settings or ApplicationSettings()  # type: ignore[call-arg]
     assert app.state.settings.API_VERSION == API_VERSION  # nosec
 
+    if app.state.settings.INVITATIONS_TRACING:
+        tracing_instrument_tooling(
+            app, app.state.settings.INVITATIONS_TRACING, APP_NAME
+        )
+
     # PLUGINS SETUP
     setup_api_routes(app)
 
-    if app.state.settings.INVITATIONS_TRACING:
-        setup_tracing(app, app.state.settings.INVITATIONS_TRACING, APP_NAME)
     if app.state.settings.INVITATIONS_PROMETHEUS_INSTRUMENTATION_ENABLED:
         setup_prometheus_instrumentation(app)
 
+    if app.state.settings.INVITATIONS_TRACING:
+        setup_fastapi_app_tracing(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
@@ -8,7 +8,10 @@
     get_common_oas_options,
     override_fastapi_openapi_method,
 )
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 from servicelib.logging_utils import config_all_loggers
 
 from .._meta import API_VTAG, APP_NAME, SUMMARY, VERSION
@@ -50,11 +53,16 @@ def create_app() -> FastAPI:
     app.state.settings = settings
 
     if settings.NOTIFICATIONS_TRACING:
-        setup_tracing(app, settings.NOTIFICATIONS_TRACING, APP_NAME)  # pragma: no cover
+        tracing_instrument_tooling(
+            app, settings.NOTIFICATIONS_TRACING, APP_NAME
+        )  # pragma: no cover
 
     initialize_rest_api(app)
 
     if settings.NOTIFICATIONS_PROMETHEUS_INSTRUMENTATION_ENABLED:
         initialize_prometheus_instrumentation(app)
 
+    if settings.NOTIFICATIONS_TRACING:
+        setup_fastapi_app_tracing(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
@@ -3,7 +3,10 @@
     setup_prometheus_instrumentation,
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 
 from .._meta import (
     API_VERSION,
@@ -47,7 +50,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
 
     # PLUGINS SETUP
     if app.state.settings.PAYMENTS_TRACING:
-        setup_tracing(app, app.state.settings.PAYMENTS_TRACING, APP_NAME)
+        tracing_instrument_tooling(app, app.state.settings.PAYMENTS_TRACING, APP_NAME)
 
     # API w/ postgres db
     setup_postgres(app)
@@ -74,6 +77,9 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     if app.state.settings.PAYMENTS_PROMETHEUS_INSTRUMENTATION_ENABLED:
         setup_prometheus_instrumentation(app)
 
+    if app.state.settings.PAYMENTS_TRACING:
+        setup_fastapi_app_tracing(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
@@ -2,7 +2,10 @@
 
 from fastapi import FastAPI
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import (
+    setup_fastapi_app_tracing,
+    tracing_instrument_tooling,
+)
 
 from .._meta import (
     API_VERSION,
@@ -51,7 +54,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
 
     # PLUGINS SETUP
     if app.state.settings.RESOURCE_USAGE_TRACKER_TRACING:
-        setup_tracing(
+        tracing_instrument_tooling(
             app,
             app.state.settings.RESOURCE_USAGE_TRACKER_TRACING,
             app.state.settings.APP_NAME,
@@ -72,6 +75,9 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
 
     setup_process_message_running_service(app)  # Requires Rabbit
 
+    if app.state.settings.RESOURCE_USAGE_TRACKER_TRACING:
+        setup_fastapi_app_tracing(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
