start sorting out order of middlewares

Author: bisgaard-itis

packages/service-library/src/servicelib/fastapi/tracing.py

@@ -101,7 +101,6 @@ def _startup(tracing_settings: TracingSettings, service_name: str) -> None:
     span_processor = BatchSpanProcessor(otlp_exporter)
     global_tracer_provider.add_span_processor(span_processor)
 
-    FastAPIInstrumentor().instrument()
     if HAS_AIOPG:
         with log_context(
             _logger,
@@ -181,14 +180,18 @@ def _shutdown() -> None:
             _logger.exception("Failed to uninstrument RequestsInstrumentor")
 
 
+def setup_fastapi_app_tracing(app: FastAPI):
+    FastAPIInstrumentor.instrument_app(app)
+
+
 def setup_httpx_client_tracing(client: AsyncClient | Client):
     HTTPXClientInstrumentor.instrument_client(client)
 
 
 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.
     _startup(tracing_settings=tracing_settings, service_name=service_name)
 
     def _on_shutdown() -> None:
@@ -200,7 +203,7 @@ def _on_shutdown() -> None:
 def get_tracing_instrumentation_lifespan(
     tracing_settings: TracingSettings, service_name: str
 ):
-
+    # NOTE: This lifespan does not instrument the app itself. Call setup_fastapi_app_tracing to do that.
     _startup(tracing_settings=tracing_settings, service_name=service_name)
 
     async def tracing_instrumentation_lifespan(

services/agent/src/simcore_service_agent/core/application.py

@@ -5,7 +5,7 @@
     get_common_oas_options,
     override_fastapi_openapi_method,
 )
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
 from servicelib.logging_utils import config_all_loggers
 
 from .._meta import (
@@ -66,6 +66,9 @@ def create_app() -> FastAPI:
     setup_rest_api(app)
     setup_rpc_api_routes(app)
 
+    if settings.AGENT_TRACING:
+        setup_fastapi_app_tracing(app)
+
     async def _on_startup() -> None:
         print(APP_STARTED_BANNER_MSG, flush=True)  # noqa: T201
 

services/api-server/src/simcore_service_api_server/core/application.py

@@ -5,7 +5,7 @@
 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_tracing
+from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
 from servicelib.logging_utils import config_all_loggers
 
 from .. import exceptions
@@ -93,6 +93,9 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
     if app.state.settings.API_SERVER_PROMETHEUS_INSTRUMENTATION_ENABLED:
         setup_prometheus_instrumentation(app)
 
+    if settings.API_SERVER_TRACING:
+        setup_fastapi_app_tracing(app)
+
     if settings.API_SERVER_WEBSERVER:
         webserver.setup(
             app,

services/autoscaling/src/simcore_service_autoscaling/core/application.py

@@ -1,7 +1,7 @@
 import logging
 
 from fastapi import FastAPI
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
 
 from .._meta import (
     API_VERSION,
@@ -71,6 +71,9 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_ssm(app)
     setup_redis(app)
 
+    if app.state.settings.AUTOSCALING_TRACING:
+        setup_fastapi_app_tracing(app)
+
     setup_auto_scaler_background_task(app)
     setup_buffer_machines_pool_task(app)
 

services/catalog/src/simcore_service_catalog/core/application.py

@@ -8,7 +8,7 @@
     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, setup_tracing
 from starlette.middleware.base import BaseHTTPMiddleware
 
 from .._meta import (
@@ -68,6 +68,9 @@ def create_app() -> FastAPI:
     if settings.CATALOG_PROMETHEUS_INSTRUMENTATION_ENABLED:
         setup_prometheus_instrumentation(app)
 
+    if settings.CATALOG_TRACING:
+        setup_fastapi_app_tracing(app)
+
     if settings.SC_BOOT_MODE != BootModeEnum.PRODUCTION:
         # middleware to time requests (ONLY for development)
         app.add_middleware(

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

@@ -4,7 +4,7 @@
 from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation,
 )
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
 
 from .._meta import (
     API_VERSION,
@@ -76,6 +76,8 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
     setup_redis(app)
     setup_clusters_management(app)
 
+    if app.state.settings.CLUSTERS_KEEPER_TRACING:
+        setup_fastapi_app_tracing(app)
     # ERROR HANDLERS
 
     # EVENTS

services/datcore-adapter/src/simcore_service_datcore_adapter/core/application.py

@@ -10,7 +10,7 @@
     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, setup_tracing
 from starlette.middleware.base import BaseHTTPMiddleware
 
 from .._meta import API_VERSION, API_VTAG, APP_NAME
@@ -76,6 +76,9 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
         )
     app.add_middleware(GZipMiddleware)
 
+    if app.state.settings.DATCORE_ADAPTER_TRACING:
+        setup_fastapi_app_tracing(app)
+
     # events
     app.add_event_handler("startup", on_startup)
     app.add_event_handler("startup", create_start_app_handler(app))

services/director-v2/src/simcore_service_director_v2/core/application.py

@@ -7,7 +7,7 @@
     override_fastapi_openapi_method,
 )
 from servicelib.fastapi.profiler import initialize_profiler
-from servicelib.fastapi.tracing import setup_tracing
+from servicelib.fastapi.tracing import setup_fastapi_app_tracing, setup_tracing
 from servicelib.logging_utils import config_all_loggers
 
 from .._meta import API_VERSION, API_VTAG, APP_NAME, PROJECT_NAME, SUMMARY
@@ -174,6 +174,9 @@ def init_app(settings: AppSettings | None = None) -> FastAPI:
 
     db.setup(app, settings.POSTGRES)
 
+    if settings.DIRECTOR_V2_TRACING:
+        setup_fastapi_app_tracing(app)
+
     if settings.DYNAMIC_SERVICES.DIRECTOR_V2_DYNAMIC_SERVICES_ENABLED:
         dynamic_services.setup(app, tracing_settings=settings.DIRECTOR_V2_TRACING)
 

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/application.py

@@ -4,6 +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 .._meta import API_VERSION, API_VTAG, PROJECT_NAME, SUMMARY
 from ..api.frontend import initialize_frontend
@@ -27,6 +28,8 @@ 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