diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-07 13:33:13 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-07 13:33:13 +0100 |
| commit | 75331c5fca6d2207094b8cbf0b3bb34cc52a4ec4 (patch) | |
| tree | 5ca1c1040ebff08b220095d022fce1fbe543a95b /synapse | |
| parent | Merge pull request #771 from matrix-org/erikj/gc_tick (diff) | |
| download | synapse-75331c5fca6d2207094b8cbf0b3bb34cc52a4ec4.tar.xz | |
Change the way we do stats
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/metrics/__init__.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py index f317034b8f..ef14bcd840 100644 --- a/synapse/metrics/__init__.py +++ b/synapse/metrics/__init__.py @@ -153,11 +153,7 @@ reactor_metrics = get_metrics_for("reactor") tick_time = reactor_metrics.register_distribution("tick_time") pending_calls_metric = reactor_metrics.register_distribution("pending_calls") -gc_time = ( - reactor_metrics.register_distribution("gc_time_gen0"), - reactor_metrics.register_distribution("gc_time_gen2"), - reactor_metrics.register_distribution("gc_time_gen2"), -) +gc_time = reactor_metrics.register_distribution("gc_time", labels=["gen"]) def runUntilCurrentTimer(func): @@ -190,7 +186,7 @@ def runUntilCurrentTimer(func): # one if necessary. threshold = gc.get_threshold() counts = gc.get_count() - for i in [2, 1, 0]: + for i in (0, 1, 2): if threshold[i] < counts[i]: logger.info("Collecting gc %d", i) @@ -198,7 +194,7 @@ def runUntilCurrentTimer(func): gc.collect(i) end = time.time() * 1000 - gc_time[i].inc_by(end - start) + gc_time.inc_by(end - start, i) return ret |