setup_fastpi_app_tracing -> initialize_fastapi_app_tracing @GitHK

bisgaard-itis · bisgaard-itis · commit 68fd58685948 · 2025-05-26T16:36:19.000+02:00
diff --git a/packages/service-library/src/servicelib/fastapi/tracing.py b/packages/service-library/src/servicelib/fastapi/tracing.py
@@ -180,7 +180,7 @@ def _shutdown() -> None:
             _logger.exception("Failed to uninstrument RequestsInstrumentor")
 
 
-def setup_fastapi_app_tracing(app: FastAPI):
+def initialize_fastapi_app_tracing(app: FastAPI):
     FastAPIInstrumentor.instrument_app(app)
 
 
diff --git a/services/agent/src/simcore_service_agent/core/application.py b/services/agent/src/simcore_service_agent/core/application.py
@@ -6,7 +6,7 @@
     override_fastapi_openapi_method,
 )
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
@@ -70,7 +70,7 @@ def create_app() -> FastAPI:
     setup_rpc_api_routes(app)
 
     if settings.AGENT_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app)
 
     async def _on_startup() -> None:
         print(APP_STARTED_BANNER_MSG, flush=True)  # noqa: T201
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
@@ -6,7 +6,7 @@
 from packaging.version import Version
 from servicelib.fastapi.profiler import initialize_profiler
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
@@ -97,7 +97,7 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
         setup_prometheus_instrumentation(app)
 
     if settings.API_SERVER_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app)
 
     if settings.API_SERVER_WEBSERVER:
         webserver.setup(
diff --git a/services/autoscaling/src/simcore_service_autoscaling/core/application.py b/services/autoscaling/src/simcore_service_autoscaling/core/application.py
@@ -2,7 +2,7 @@
 
 from fastapi import FastAPI
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 
@@ -75,7 +75,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_redis(app)
 
     if app.state.settings.AUTOSCALING_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app)
 
     setup_auto_scaler_background_task(app)
     setup_buffer_machines_pool_task(app)
diff --git a/services/catalog/src/simcore_service_catalog/core/application.py b/services/catalog/src/simcore_service_catalog/core/application.py
@@ -9,7 +9,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 from starlette.middleware.base import BaseHTTPMiddleware
@@ -72,7 +72,7 @@ def create_app() -> FastAPI:
         setup_prometheus_instrumentation(app)
 
     if settings.CATALOG_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(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,7 +5,7 @@
     setup_prometheus_instrumentation,
 )
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 
@@ -80,7 +80,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_clusters_management(app)
 
     if app.state.settings.CLUSTERS_KEEPER_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(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,7 +11,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 from starlette.middleware.base import BaseHTTPMiddleware
@@ -80,7 +80,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     app.add_middleware(GZipMiddleware)
 
     if app.state.settings.DATCORE_ADAPTER_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(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
@@ -8,7 +8,7 @@
 )
 from servicelib.fastapi.profiler import initialize_profiler
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
@@ -178,7 +178,7 @@ def init_app(settings: AppSettings | None = None) -> FastAPI:
     db.setup(app, settings.POSTGRES)
 
     if settings.DIRECTOR_V2_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(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,7 +5,7 @@
 from servicelib.async_utils import cancel_sequential_workers
 from servicelib.fastapi.client_session import setup_client_session
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 
@@ -66,7 +66,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_registry(app)
 
     if app.state.settings.DIRECTOR_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app)
 
     # ERROR HANDLERS
 
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
@@ -4,7 +4,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.profiler import initialize_profiler
-from servicelib.fastapi.tracing import setup_fastapi_app_tracing
+from servicelib.fastapi.tracing import initialize_fastapi_app_tracing
 
 from .._meta import API_VERSION, API_VTAG, PROJECT_NAME, SUMMARY
 from ..api.frontend import initialize_frontend
@@ -44,6 +44,6 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
         initialize_profiler(app)
 
     if app_settings.DYNAMIC_SCHEDULER_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_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
@@ -10,7 +10,7 @@
     override_fastapi_openapi_method,
 )
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
@@ -200,7 +200,7 @@ def create_app():
         setup_prometheus_metrics(app)
 
     if application_settings.DYNAMIC_SIDECAR_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app)
 
     # ERROR HANDLERS  ------------
     app.add_exception_handler(
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
@@ -2,7 +2,7 @@
 
 from fastapi import FastAPI
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 
@@ -63,7 +63,7 @@ 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)
+        initialize_fastapi_app_tracing(app)
 
     # EVENTS
     async def _on_startup() -> None:
diff --git a/services/invitations/src/simcore_service_invitations/core/application.py b/services/invitations/src/simcore_service_invitations/core/application.py
@@ -4,7 +4,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 
@@ -48,7 +48,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
         setup_prometheus_instrumentation(app)
 
     if app.state.settings.INVITATIONS_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_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
@@ -9,7 +9,7 @@
     override_fastapi_openapi_method,
 )
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
@@ -61,6 +61,6 @@ def create_app() -> FastAPI:
         initialize_prometheus_instrumentation(app)
 
     if settings.NOTIFICATIONS_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_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
@@ -4,7 +4,7 @@
 )
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 
@@ -78,7 +78,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
         setup_prometheus_instrumentation(app)
 
     if app.state.settings.PAYMENTS_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_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
@@ -3,7 +3,7 @@
 from fastapi import FastAPI
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 
@@ -76,7 +76,7 @@ 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)
+        initialize_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
@@ -18,7 +18,7 @@
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.profiler import ProfilerMiddleware
 from servicelib.fastapi.tracing import (
-    setup_fastapi_app_tracing,
+    initialize_fastapi_app_tracing,
     setup_tracing,
 )
 from starlette.middleware.base import BaseHTTPMiddleware
@@ -121,7 +121,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:  # noqa: C901
         setup_prometheus_instrumentation(app)
 
     if settings.STORAGE_TRACING:
-        setup_fastapi_app_tracing(app)
+        initialize_fastapi_app_tracing(app)
 
     async def _on_startup() -> None:
         if settings.STORAGE_WORKER_MODE:

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`setup_prometheus_instrumentation,`
`6`	`6`	`)`
`7`	`7`	`from servicelib.fastapi.tracing import (`
`8`		`- setup_fastapi_app_tracing,`
	`8`	`+ initialize_fastapi_app_tracing,`
`9`	`9`	`setup_tracing,`
`10`	`10`	`)`
`11`	`11`
`@@ -80,7 +80,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:`
`80`	`80`	`setup_clusters_management(app)`
`81`	`81`
`82`	`82`	`if app.state.settings.CLUSTERS_KEEPER_TRACING:`
`83`		`- setup_fastapi_app_tracing(app)`
	`83`	`+ initialize_fastapi_app_tracing(app)`
`84`	`84`	`# ERROR HANDLERS`
`85`	`85`
`86`	`86`	`# EVENTS`