ensure prometheus metrics are exposed in correct format

Author: bisgaard-itis

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

@@ -8,7 +8,10 @@
 from fastapi import FastAPI, Request, Response, status
 from fastapi_lifespan_manager import State
 from prometheus_client import CollectorRegistry
-from prometheus_client.exposition import CONTENT_TYPE_LATEST, generate_latest
+from prometheus_client.openmetrics.exposition import (
+    CONTENT_TYPE_LATEST,
+    generate_latest,
+)
 from servicelib.prometheus_metrics import (
     PrometheusMetrics,
     get_prometheus_metrics,

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

@@ -87,6 +87,9 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
 
     setup_rabbitmq(app)
 
+    if app.state.settings.API_SERVER_PROMETHEUS_INSTRUMENTATION_ENABLED:
+        setup_prometheus_instrumentation(app)
+
     if settings.API_SERVER_TRACING:
         initialize_tracing(app, settings.API_SERVER_TRACING, APP_NAME)
 
@@ -118,9 +121,6 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
     if settings.API_SERVER_PROFILING:
         initialize_profiler(app)
 
-    if app.state.settings.API_SERVER_PROMETHEUS_INSTRUMENTATION_ENABLED:
-        setup_prometheus_instrumentation(app)
-
     exceptions.setup_exception_handlers(
         app, is_debug=settings.SC_BOOT_MODE == BootModeEnum.DEBUG
     )