further cleanup

Author: bisgaard-itis

services/clusters-keeper/src/simcore_service_clusters_keeper/core/application.py

@@ -64,7 +64,7 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_redis(app)
     setup_clusters_management(app)
 
-    if app.state.settings.CLUSTERS_KEEPER_TRACING:
+    if settings.CLUSTERS_KEEPER_TRACING:
         initialize_fastapi_app_tracing(
             app, tracing_data=get_tracing_data(app, settings.CLUSTERS_KEEPER_TRACING)
         )

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_thin.py

@@ -13,7 +13,6 @@
     retry_on_errors,
 )
 from servicelib.fastapi.tracing import get_tracing_data
-from servicelib.tracing import TracingData
 from settings_library.tracing import TracingSettings
 
 from ....core.dynamic_services_settings.scheduler import (
@@ -37,9 +36,7 @@ def __init__(self, app: FastAPI):
         tracing_settings: TracingSettings | None = (
             app.state.settings.DIRECTOR_V2_TRACING
         )
-        tracing_data: TracingData | None = None
-        if tracing_settings:
-            tracing_data = get_tracing_data(app, settings.DIRECTOR_V2_TRACING)
+        tracing_data = get_tracing_data(app, tracing_settings)
 
         # timeouts
         self._health_request_timeout = Timeout(1.0, connect=1.0)

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/application.py

@@ -197,7 +197,10 @@ def create_app() -> FastAPI:
 
     if application_settings.DYNAMIC_SIDECAR_TRACING:
         initialize_fastapi_app_tracing(
-            app, tracing_data=get_tracing_data(app, settings.DYNAMIC_SIDECAR_TRACING)
+            app,
+            tracing_data=get_tracing_data(
+                app, application_settings.DYNAMIC_SIDECAR_TRACING
+            ),
         )
 
     # ERROR HANDLERS  ------------

services/efs-guardian/src/simcore_service_efs_guardian/core/application.py

@@ -61,9 +61,9 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
 
     setup_fire_and_forget(app)
 
-    if app.state.settings.EFS_GUARDIAN_TRACING:
+    if app_settings.EFS_GUARDIAN_TRACING:
         initialize_fastapi_app_tracing(
-            app, tracing_data=get_tracing_data(app, settings.EFS_GUARDIAN_TRACING)
+            app, tracing_data=get_tracing_data(app, app_settings.EFS_GUARDIAN_TRACING)
         )
 
     # EVENTS

services/invitations/src/simcore_service_invitations/core/application.py

@@ -48,9 +48,9 @@ def create_app(settings: ApplicationSettings | None = None) -> FastAPI:
     if app.state.settings.INVITATIONS_PROMETHEUS_INSTRUMENTATION_ENABLED:
         setup_prometheus_instrumentation(app)
 
-    if app.state.settings.INVITATIONS_TRACING:
+    if tracing_settings := app.state.settings.INVITATIONS_TRACING:
         initialize_fastapi_app_tracing(
-            app, tracing_data=get_tracing_data(app, settings.INVITATIONS_TRACING)
+            app, tracing_data=get_tracing_data(app, tracing_settings)
         )
 
     # ERROR HANDLERS

services/payments/src/simcore_service_payments/core/application.py

@@ -78,9 +78,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:
+    if app_settings.PAYMENTS_TRACING:
         initialize_fastapi_app_tracing(
-            app, tracing_data=get_tracing_data(app, settings.PAYMENTS_TRACING)
+            app, tracing_data=get_tracing_data(app, app_settings.PAYMENTS_TRACING)
         )
 
     # ERROR HANDLERS

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/core/application.py

@@ -74,10 +74,10 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
 
     setup_process_message_running_service(app)  # Requires Rabbit
 
-    if app.state.settings.RESOURCE_USAGE_TRACKER_TRACING:
+    if tracing_settings := app.state.settings.RESOURCE_USAGE_TRACKER_TRACING:
         initialize_fastapi_app_tracing(
             app,
-            tracing_data=get_tracing_data(app, settings.RESOURCE_USAGE_TRACKER_TRACING),
+            tracing_data=get_tracing_data(app, tracing_settings),
         )
 
     # ERROR HANDLERS