update imports prometheus_instrumentation -> monitoring

Author: bisgaard-itis

services/agent/src/simcore_service_agent/services/instrumentation/_setup.py

@@ -1,5 +1,5 @@
 from fastapi import FastAPI
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation,
 )
 from simcore_service_agent.core.settings import ApplicationSettings

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

@@ -9,7 +9,7 @@
 from pydantic import PositiveInt
 from servicelib.async_utils import cancel_wait_task
 from servicelib.background_task import create_periodic_task
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation as setup_rest_instrumentation,
 )
 from servicelib.logging_utils import log_catch

services/autoscaling/src/simcore_service_autoscaling/modules/instrumentation/_core.py

@@ -1,7 +1,7 @@
 from typing import cast
 
 from fastapi import FastAPI
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation as setup_rest_instrumentation,
 )
 

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

@@ -4,10 +4,10 @@
 from fastapi.middleware.gzip import GZipMiddleware
 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 (
+from servicelib.fastapi.monitoring import (
     initialize_prometheus_instrumentation,
 )
+from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import initialize_tracing
 from starlette.middleware.base import BaseHTTPMiddleware
 

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

@@ -3,13 +3,13 @@
 
 from fastapi import FastAPI
 from fastapi_lifespan_manager import LifespanManager, State
-from servicelib.fastapi.postgres_lifespan import (
-    create_postgres_database_input_state,
-)
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     create_prometheus_instrumentationmain_input_state,
     prometheus_instrumentation_lifespan,
 )
+from servicelib.fastapi.postgres_lifespan import (
+    create_postgres_database_input_state,
+)
 
 from .._meta import APP_FINISHED_BANNER_MSG, APP_STARTED_BANNER_MSG
 from ..api.rpc.events import rpc_api_lifespan

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

@@ -1,7 +1,7 @@
 import logging
 
 from fastapi import FastAPI
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation,
 )
 from servicelib.fastapi.tracing import initialize_tracing

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

@@ -6,10 +6,10 @@
 from fastapi_pagination import add_pagination
 from servicelib.fastapi import timing_middleware
 from servicelib.fastapi.http_error import set_app_default_http_error_handlers
-from servicelib.fastapi.openapi import override_fastapi_openapi_method
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation,
 )
+from servicelib.fastapi.openapi import override_fastapi_openapi_method
 from servicelib.fastapi.tracing import initialize_tracing
 from starlette.middleware.base import BaseHTTPMiddleware
 

services/director-v2/src/simcore_service_director_v2/modules/instrumentation/_setup.py

@@ -1,7 +1,7 @@
 from typing import cast
 
 from fastapi import FastAPI
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation,
 )
 

services/director/src/simcore_service_director/instrumentation.py

@@ -3,7 +3,7 @@
 
 from fastapi import FastAPI
 from prometheus_client import CollectorRegistry, Counter
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     setup_prometheus_instrumentation,
 )
 from servicelib.instrumentation import MetricsBase, get_metrics_namespace

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

@@ -1,9 +1,9 @@
 from fastapi import FastAPI
-from servicelib.fastapi.openapi import override_fastapi_openapi_method
-from servicelib.fastapi.profiler import initialize_profiler
-from servicelib.fastapi.prometheus_instrumentation import (
+from servicelib.fastapi.monitoring import (
     initialize_prometheus_instrumentation,
 )
+from servicelib.fastapi.openapi import override_fastapi_openapi_method
+from servicelib.fastapi.profiler import initialize_profiler
 from servicelib.fastapi.tracing import initialize_tracing
 
 from .._meta import API_VERSION, API_VTAG, APP_NAME, PROJECT_NAME, SUMMARY