From d92c6fcfd91b9cf7890b28ea8ede470868e9bf4f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Sun, 17 Jul 2022 16:33:53 +0100 Subject: [PATCH] Fix metrics --- synapse/util/caches/lrucache.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/synapse/util/caches/lrucache.py b/synapse/util/caches/lrucache.py index af38b1c1f5..dd80168c0d 100644 --- a/synapse/util/caches/lrucache.py +++ b/synapse/util/caches/lrucache.py @@ -54,8 +54,10 @@ if TYPE_CHECKING: logger = logging.getLogger(__name__) -doorkeeper_counter = Counter("synapse_lru_cache_doorkeeper_total", "") -doorkeeper_hit_counter = Counter("synapse_lru_cache_doorkeeper_hits", "") +doorkeeper_counter = Counter("synapse_lru_cache_doorkeeper_total", "", ("cache_name",)) +doorkeeper_hit_counter = Counter( + "synapse_lru_cache_doorkeeper_hits", "", ("cache_name",) +) try: from pympler.asizeof import Asizer @@ -513,7 +515,8 @@ class LruCache(Generic[KT, VT]): key: KT, value: VT, callbacks: Collection[Callable[[], None]] = () ) -> None: hash_key = hash(()).to_bytes(8, byteorder="big") - doorkeeper_counter.inc() + if cache_name: + doorkeeper_counter.labels(cache_name).inc() found = self._doorkeeper.contains(hash_key) | self._doorkeeper_2.contains( hash_key ) @@ -521,7 +524,8 @@ class LruCache(Generic[KT, VT]): self._doorkeeper.insert(hash_key) return - doorkeeper_hit_counter.inc() + if cache_name: + doorkeeper_hit_counter.labels(cache_name).inc() node: _Node[KT, VT] = _Node( list_root,