✨ Refactor: Enhance Prometheus instrumentation integration and update test fixtures for improved clarity

Author: pcrespov

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

@@ -5,6 +5,9 @@
 from models_library.basic_types import BootModeEnum
 from servicelib.fastapi import timing_middleware
 from servicelib.fastapi.openapi import override_fastapi_openapi_method
+from servicelib.fastapi.prometheus_instrumentation import (
+    initialize_prometheus_instrumentation,
+)
 from starlette.middleware.base import BaseHTTPMiddleware
 
 from .._meta import (
@@ -59,6 +62,9 @@ def create_app() -> FastAPI:
     app.state.settings = settings
 
     # MIDDLEWARES
+    if settings.CATALOG_PROMETHEUS_INSTRUMENTATION_ENABLED:
+        initialize_prometheus_instrumentation(app)
+
     if settings.SC_BOOT_MODE != BootModeEnum.PRODUCTION:
         # middleware to time requests (ONLY for development)
         app.add_middleware(

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

@@ -8,7 +8,6 @@
     postgres_lifespan,
 )
 from servicelib.fastapi.prometheus_instrumentation import (
-    initialize_prometheus_instrumentation,
     lifespan_prometheus_instrumentation,
 )
 from servicelib.fastapi.tracing import initialize_tracing
@@ -55,9 +54,8 @@ async def _setup_prometheus_instrumentation_adapter(
 ) -> AsyncIterator[State]:
     enabled = state.get("prometheus_instrumentation_enabled", False)
     if enabled:
-        initialize_prometheus_instrumentation(app)
-        async for _state in lifespan_prometheus_instrumentation(app):
-            yield _state
+        async for prometheus_state in lifespan_prometheus_instrumentation(app):
+            yield prometheus_state
 
 
 def create_app_lifespan():

services/catalog/tests/unit/conftest.py

@@ -216,8 +216,8 @@ def service_caching_disabled(monkeypatch: pytest.MonkeyPatch) -> None:
 
 
 @pytest.fixture
-def postgres_setup_disabled(mocker: MockerFixture) -> MockType:
-    return mocker.patch.object(simcore_service_catalog.core.events, "postgres_lifespan")
+def postgres_setup_disabled(mocker: MockerFixture):
+    mocker.patch.object(simcore_service_catalog.core.events, "postgres_lifespan")
 
 
 @pytest.fixture

services/catalog/tests/unit/test_api_rest.py

@@ -6,11 +6,10 @@
 import httpx
 from fastapi import status
 from fastapi.testclient import TestClient
-from pytest_mock import MockType
 
 
 def test_sync_client(
-    postgres_setup_disabled: MockType,
+    postgres_setup_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,
     director_setup_disabled: None,
@@ -25,7 +24,7 @@ def test_sync_client(
 
 
 async def test_async_client(
-    postgres_setup_disabled: MockType,
+    postgres_setup_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,
     director_setup_disabled: None,

services/catalog/tests/unit/test_services_director.py

@@ -12,7 +12,6 @@
 import pytest
 from fastapi import FastAPI
 from models_library.services_metadata_published import ServiceMetaDataPublished
-from pytest_mock import MockType
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from respx.router import MockRouter
@@ -35,7 +34,7 @@ def app_environment(
 
 
 async def test_director_client_high_level_api(
-    postgres_setup_disabled: MockType,
+    postgres_setup_disabled: None,
     background_tasks_setup_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     expected_director_list_services: list[dict[str, Any]],
@@ -61,7 +60,7 @@ async def test_director_client_high_level_api(
 
 
 async def test_director_client_low_level_api(
-    postgres_setup_disabled: MockType,
+    postgres_setup_disabled: None,
     background_tasks_setup_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api: MockRouter,

services/catalog/tests/unit/test_services_manifest.py

@@ -33,6 +33,7 @@ def app_environment(
 
 
 async def test_services_manifest_api(
+    postgres_setup_disabled: None,
     rabbitmq_and_rpc_setup_disabled: None,
     mocked_director_service_api: MockRouter,
     app: FastAPI,

services/catalog/tests/unit/test_utils_service_extras.py

@@ -8,7 +8,6 @@
 from httpx import AsyncClient
 from models_library.api_schemas_directorv2.services import ServiceExtras
 from pydantic import TypeAdapter
-from pytest_mock import MockType
 from respx import MockRouter
 
 
@@ -18,7 +17,7 @@ def mock_engine(app: FastAPI) -> None:
 
 
 async def test_get_service_extras(
-    postgres_setup_disabled: MockType,
+    postgres_setup_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,

services/catalog/tests/unit/test_utils_service_labels.py

@@ -7,7 +7,6 @@
 import pytest
 from fastapi import FastAPI, status
 from httpx import AsyncClient
-from pytest_mock import MockType
 from respx import MockRouter
 
 
@@ -17,7 +16,7 @@ def mock_engine(app: FastAPI) -> None:
 
 
 async def test_get_service_labels(
-    postgres_setup_disabled: MockType,
+    postgres_setup_disabled: None,
     mocked_director_service_api: MockRouter,
     rabbitmq_and_rpc_setup_disabled: None,
     background_tasks_setup_disabled: None,