@GitHK @pcrespov revert name change

bisgaard-itis · bisgaard-itis · commit 01100b35baab · 2025-05-26T14:56:48.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 tracing_instrument_tooling(
+def setup_tracing(
     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
@@ -7,7 +7,7 @@
 )
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
 
@@ -59,7 +59,7 @@ def create_app() -> FastAPI:
     app.state.settings = settings
 
     if settings.AGENT_TRACING:
-        tracing_instrument_tooling(app, settings.AGENT_TRACING, APP_NAME)
+        setup_tracing(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
@@ -7,7 +7,7 @@
 from servicelib.fastapi.profiler import initialize_profiler
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
 
@@ -86,7 +86,7 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
     app.state.settings = settings
 
     if settings.API_SERVER_TRACING:
-        tracing_instrument_tooling(app, settings.API_SERVER_TRACING, APP_NAME)
+        setup_tracing(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
@@ -3,7 +3,7 @@
 from fastapi import FastAPI
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 
 from .._meta import (
@@ -64,9 +64,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
 
     # PLUGINS SETUP
     if app.state.settings.AUTOSCALING_TRACING:
-        tracing_instrument_tooling(
-            app, app.state.settings.AUTOSCALING_TRACING, APP_NAME
-        )
+        setup_tracing(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
@@ -10,7 +10,7 @@
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 from starlette.middleware.base import BaseHTTPMiddleware
 
@@ -67,7 +67,7 @@ def create_app() -> FastAPI:
 
     # MIDDLEWARES
     if settings.CATALOG_TRACING:
-        tracing_instrument_tooling(app, settings.CATALOG_TRACING, APP_NAME)
+        setup_tracing(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
@@ -6,7 +6,7 @@
 )
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 
 from .._meta import (
@@ -62,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:
-        tracing_instrument_tooling(
+        setup_tracing(
             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
@@ -12,7 +12,7 @@
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 from starlette.middleware.base import BaseHTTPMiddleware
 
@@ -64,7 +64,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     app.state.settings = settings
 
     if app.state.settings.DATCORE_ADAPTER_TRACING:
-        tracing_instrument_tooling(
+        setup_tracing(
             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
@@ -9,7 +9,7 @@
 from servicelib.fastapi.profiler import initialize_profiler
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
 
@@ -149,7 +149,7 @@ def init_app(settings: AppSettings | None = None) -> FastAPI:
     substitutions.setup(app)
 
     if settings.DIRECTOR_V2_TRACING:
-        tracing_instrument_tooling(app, settings.DIRECTOR_V2_TRACING, APP_NAME)
+        setup_tracing(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
@@ -6,7 +6,7 @@
 from servicelib.fastapi.client_session import setup_client_session
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 
 from .._meta import (
@@ -52,7 +52,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
 
     # PLUGINS SETUP
     if app.state.settings.DIRECTOR_TRACING:
-        tracing_instrument_tooling(app, app.state.settings.DIRECTOR_TRACING, APP_NAME)
+        setup_tracing(app, app.state.settings.DIRECTOR_TRACING, APP_NAME)
 
     setup_api_routes(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
@@ -11,7 +11,7 @@
 )
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
 from simcore_sdk.node_ports_common.exceptions import NodeNotFound
@@ -179,9 +179,7 @@ def create_app():
     application_settings: ApplicationSettings = app.state.settings
 
     if application_settings.DYNAMIC_SIDECAR_TRACING:
-        tracing_instrument_tooling(
-            app, application_settings.DYNAMIC_SIDECAR_TRACING, PROJECT_NAME
-        )
+        setup_tracing(app, application_settings.DYNAMIC_SIDECAR_TRACING, PROJECT_NAME)
 
     setup_rabbitmq(app)
     setup_rpc_api_routes(app)
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
@@ -3,7 +3,7 @@
 from fastapi import FastAPI
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 
 from .._meta import (
@@ -46,9 +46,7 @@ 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:
-        tracing_instrument_tooling(
-            app, app.state.settings.EFS_GUARDIAN_TRACING, APP_NAME
-        )
+        setup_tracing(app, app.state.settings.EFS_GUARDIAN_TRACING, APP_NAME)
 
     # PLUGINS SETUP
     setup_rabbitmq(app)
diff --git a/services/invitations/src/simcore_service_invitations/core/application.py b/services/invitations/src/simcore_service_invitations/core/application.py
@@ -5,7 +5,7 @@
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 
 from .._meta import (
@@ -39,9 +39,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     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
-        )
+        setup_tracing(app, app.state.settings.INVITATIONS_TRACING, APP_NAME)
 
     # PLUGINS SETUP
     setup_api_routes(app)
diff --git a/services/notifications/src/simcore_service_notifications/core/application.py b/services/notifications/src/simcore_service_notifications/core/application.py
@@ -10,7 +10,7 @@
 )
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 from servicelib.logging_utils import config_all_loggers
 
@@ -53,9 +53,7 @@ def create_app() -> FastAPI:
     app.state.settings = settings
 
     if settings.NOTIFICATIONS_TRACING:
-        tracing_instrument_tooling(
-            app, settings.NOTIFICATIONS_TRACING, APP_NAME
-        )  # pragma: no cover
+        setup_tracing(app, settings.NOTIFICATIONS_TRACING, APP_NAME)  # pragma: no cover
 
     initialize_rest_api(app)
 
diff --git a/services/payments/src/simcore_service_payments/core/application.py b/services/payments/src/simcore_service_payments/core/application.py
@@ -5,7 +5,7 @@
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 
 from .._meta import (
@@ -50,7 +50,7 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
 
     # PLUGINS SETUP
     if app.state.settings.PAYMENTS_TRACING:
-        tracing_instrument_tooling(app, app.state.settings.PAYMENTS_TRACING, APP_NAME)
+        setup_tracing(app, app.state.settings.PAYMENTS_TRACING, APP_NAME)
 
     # API w/ postgres db
     setup_postgres(app)
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
@@ -4,7 +4,7 @@
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 
 from .._meta import (
@@ -54,7 +54,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
 
     # PLUGINS SETUP
     if app.state.settings.RESOURCE_USAGE_TRACKER_TRACING:
-        tracing_instrument_tooling(
+        setup_tracing(
             app,
             app.state.settings.RESOURCE_USAGE_TRACKER_TRACING,
             app.state.settings.APP_NAME,
diff --git a/services/storage/src/simcore_service_storage/core/application.py b/services/storage/src/simcore_service_storage/core/application.py
@@ -19,7 +19,7 @@
 from servicelib.fastapi.profiler import ProfilerMiddleware
 from servicelib.fastapi.tracing import (
     setup_fastapi_app_tracing,
-    tracing_instrument_tooling,
+    setup_tracing,
 )
 from starlette.middleware.base import BaseHTTPMiddleware
 
@@ -84,7 +84,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:  # noqa: C901
     app.state.settings = settings
 
     if settings.STORAGE_TRACING:
-        tracing_instrument_tooling(app, settings.STORAGE_TRACING, APP_NAME)
+        setup_tracing(app, settings.STORAGE_TRACING, APP_NAME)
 
     setup_db(app)
     setup_s3(app)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`)`
`8`	`8`	`from servicelib.fastapi.tracing import (`
`9`	`9`	`setup_fastapi_app_tracing,`
`10`		`- tracing_instrument_tooling,`
	`10`	`+ setup_tracing,`
`11`	`11`	`)`
`12`	`12`	`from servicelib.logging_utils import config_all_loggers`
`13`	`13`
`@@ -59,7 +59,7 @@ def create_app() -> FastAPI:`
`59`	`59`	`app.state.settings = settings`
`60`	`60`
`61`	`61`	`if settings.AGENT_TRACING:`
`62`		`- tracing_instrument_tooling(app, settings.AGENT_TRACING, APP_NAME)`
	`62`	`+ setup_tracing(app, settings.AGENT_TRACING, APP_NAME)`
`63`	`63`
`64`	`64`	`setup_instrumentation(app)`
`65`	`65`