From aa1fedbfddc77e89421dcbae346585aac71c9d70 Mon Sep 17 00:00:00 2001
From: yucheng <yucheng@berri.ai>
Date: Thu, 17 Sep 2026 08:20:50 +0000
Subject: [PATCH] fix(grafana): reset lazy Prometheus collectors in the
 dashboard test fixture and state the overhead panel unit in seconds

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .../grafana_dashboard.json                    |  2 +-
 ...test_prometheus_metric_name_consistency.py | 38 ++++++++-----------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/cookbook/litellm_proxy_server/grafana_dashboard/dashboard_all_metrics/grafana_dashboard.json b/cookbook/litellm_proxy_server/grafana_dashboard/dashboard_all_metrics/grafana_dashboard.json
index 230e1e788fc..671ea14c220 100644
--- a/cookbook/litellm_proxy_server/grafana_dashboard/dashboard_all_metrics/grafana_dashboard.json
+++ b/cookbook/litellm_proxy_server/grafana_dashboard/dashboard_all_metrics/grafana_dashboard.json
@@ -825,7 +825,7 @@
         "type": "prometheus",
         "uid": "${DS_PROMETHEUS}"
       },
-      "description": "Latency overhead (milliseconds) added by LiteLLM processing",
+      "description": "Latency overhead (seconds) added by LiteLLM processing",
       "fieldConfig": {
         "defaults": {
           "color": {
diff --git a/tests/test_litellm/integrations/test_prometheus_metric_name_consistency.py b/tests/test_litellm/integrations/test_prometheus_metric_name_consistency.py
index 61619945c50..a6e32a3c98a 100644
--- a/tests/test_litellm/integrations/test_prometheus_metric_name_consistency.py
+++ b/tests/test_litellm/integrations/test_prometheus_metric_name_consistency.py
@@ -16,10 +16,9 @@ from typing import Final, get_args
 
 import pytest
 from prometheus_client import REGISTRY
-from prometheus_client.registry import Collector
 
 import litellm
-from litellm.caching.redis_cache import _BreakerMetrics
+from litellm.caching.redis_cache import _breaker_metrics
 from litellm.integrations.prometheus import PrometheusLogger
 from litellm.integrations.prometheus_services import PrometheusServicesLogger
 from litellm.proxy.db.db_transaction_queue.spend_log_cleanup_metrics import SpendLogCleanupMetrics
@@ -34,35 +33,28 @@ _BY_CLAUSE_RE: Final = re.compile(r"\bby\s*\([^)]*\)")
 _EXPOSITION_SUFFIXES: Final = ("", "_total", "_bucket", "_sum", "_count", "_created")
 
 
-def _lazily_registered_collectors() -> tuple[Collector, ...]:
-    SpendLogCleanupMetrics._ensure_initialized()
-    collectors: Final = (
-        InFlightRequestsMiddleware._get_gauge(),
-        SpendLogCleanupMetrics.rows_deleted,
-        SpendLogCleanupMetrics.batch_duration,
-        SpendLogCleanupMetrics.rows_remaining,
-        SpendLogCleanupMetrics.batch_failures,
-        SpendLogCleanupMetrics.runs,
-    )
-    assert all(collector is not None for collector in collectors)
-    return tuple(collector for collector in collectors if collector is not None)
+def _reset_default_registry() -> None:
+    for collector in list(REGISTRY._collector_to_names.keys()):
+        REGISTRY.unregister(collector)
+    SpendLogCleanupMetrics._initialized = False
+    InFlightRequestsMiddleware._gauge_init_attempted = False
+    InFlightRequestsMiddleware._gauge = None
+    _breaker_metrics.cache_clear()
 
 
 @pytest.fixture
 def emitted_metric_families(monkeypatch: pytest.MonkeyPatch) -> Iterator[frozenset[str]]:
-    for collector in list(REGISTRY._collector_to_names.keys()):
-        REGISTRY.unregister(collector)
+    _reset_default_registry()
     monkeypatch.setattr(litellm, "prometheus_metrics_config", None)
     PrometheusLogger()
     PrometheusServicesLogger()
-    _BreakerMetrics()
+    SpendLogCleanupMetrics._ensure_initialized()
+    assert SpendLogCleanupMetrics.runs is not None
+    assert InFlightRequestsMiddleware._get_gauge() is not None
+    assert _breaker_metrics()._state_gauge is not None
     assert create_prometheus_admission_metrics() is not None
-    families: Final = frozenset(
-        metric.name for collector in (REGISTRY, *_lazily_registered_collectors()) for metric in collector.collect()
-    )
-    yield families
-    for collector in list(REGISTRY._collector_to_names.keys()):
-        REGISTRY.unregister(collector)
+    yield frozenset(metric.name for metric in REGISTRY.collect())
+    _reset_default_registry()
 
 
 def _dashboard_expressions(path: Path) -> tuple[str, ...]: