Merge branch '7635-add-exemplars-to-prometheus-metrics' of github.com:bisgaard-itis/osparc-simcore into 7635-add-exemplars-to-prometheus-metrics

Author: bisgaard-itis

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

@@ -12,19 +12,19 @@
     generate_latest,
 )
 from prometheus_client.registry import CollectorRegistry
-from servicelib.aiohttp.typing_extension import Handler
-from servicelib.prometheus_metrics import (
-    PrometheusMetrics,
-    get_prometheus_metrics,
-    record_request_metrics,
-    record_response_metrics,
-)
 
 from ..common_headers import (
     UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
     X_SIMCORE_USER_AGENT,
 )
 from ..logging_utils import log_catch
+from ..prometheus_metrics import (
+    PrometheusMetrics,
+    get_prometheus_metrics,
+    record_request_metrics,
+    record_response_metrics,
+)
+from .typing_extension import Handler
 
 log = logging.getLogger(__name__)
 

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

@@ -67,9 +67,6 @@ async def dispatch(
 
 
 def initialize_prometheus_instrumentation(app: FastAPI) -> None:
-    # NOTE: this cannot be ran once the application is started
-
-    # NOTE: use that registry to prevent having a global one
     metrics = get_prometheus_metrics()
     app.state.prometheus_metrics = metrics
     app.add_middleware(PrometheusMiddleware, metrics=metrics)

packages/service-library/tests/fastapi/test_prometheus_middleware.py

@@ -0,0 +1,27 @@
+from collections.abc import AsyncIterable
+
+import pytest
+from asgi_lifespan import LifespanManager
+from fastapi import FastAPI
+from httpx import AsyncClient
+from servicelib.fastapi.monitoring import setup_prometheus_instrumentation
+
+
+@pytest.fixture
+async def app(app: FastAPI) -> AsyncIterable[FastAPI]:
+    """
+    Fixture that sets up the Prometheus middleware in the FastAPI app.
+    """
+    setup_prometheus_instrumentation(app)
+    async with LifespanManager(app):
+        yield app
+
+
+async def test_metrics_endpoint(client: AsyncClient, app: FastAPI):
+    """
+    Test that the /metrics endpoint is available and returns Prometheus metrics.
+    """
+    response = await client.get("/metrics")
+    assert response.status_code == 200
+    assert "# HELP" in response.text
+    assert "# TYPE" in response.text