MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-09-27 20:19:03 +02:00
Code Issues Projects Releases Wiki Activity

Fix a memory leak when running the unit tests. (#13798)

Browse source
This commit is contained in:
reivilibre 2022-09-14 15:29:05 +00:00 committed by GitHub
parent eaed4e6113
commit cf65433de2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/13798.misc Normal file
View file

@ -0,0 +1 @@
Fix a memory leak when running the unit tests.

3
synapse/util/caches/__init__.py
View file

@ -205,8 +205,9 @@ def register_cache(
add_resizable_cache(cache_name, resize_callback) add_resizable_cache(cache_name, resize_callback)
metric = CacheMetric(cache, cache_type, cache_name, collect_callback) metric = CacheMetric(cache, cache_type, cache_name, collect_callback)
metric_name = "cache_%s_%s" % (cache_type, cache_name)
caches_by_name[cache_name] = cache caches_by_name[cache_name] = cache
CACHE_METRIC_REGISTRY.register_hook(metric.collect) CACHE_METRIC_REGISTRY.register_hook(metric_name, metric.collect)
return metric return metric

10
synapse/util/metrics.py
View file

@ -15,7 +15,7 @@
import logging import logging
from functools import wraps from functools import wraps
from types import TracebackType from types import TracebackType
from typing import Awaitable, Callable, Generator, List, Optional, Type, TypeVar from typing import Awaitable, Callable, Dict, Generator, Optional, Type, TypeVar
from prometheus_client import CollectorRegistry, Counter, Metric from prometheus_client import CollectorRegistry, Counter, Metric
from typing_extensions import Concatenate, ParamSpec, Protocol from typing_extensions import Concatenate, ParamSpec, Protocol
@ -220,21 +220,21 @@ class DynamicCollectorRegistry(CollectorRegistry):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__() super().__init__()
self._pre_update_hooks: List[Callable[[], None]] = [] self._pre_update_hooks: Dict[str, Callable[[], None]] = {}
def collect(self) -> Generator[Metric, None, None]: def collect(self) -> Generator[Metric, None, None]:
""" """
Collects metrics, calling pre-update hooks first. Collects metrics, calling pre-update hooks first.
""" """
for pre_update_hook in self._pre_update_hooks: for pre_update_hook in self._pre_update_hooks.values():
pre_update_hook() pre_update_hook()
yield from super().collect() yield from super().collect()
def register_hook(self, hook: Callable[[], None]) -> None: def register_hook(self, metric_name: str, hook: Callable[[], None]) -> None:
""" """
Registers a hook that is called before metric collection. Registers a hook that is called before metric collection.
""" """
self._pre_update_hooks.append(hook) self._pre_update_hooks[metric_name] = hook