diff options
| author | Paul Evans <leonerd@leonerd.org.uk> | 2016-10-27 18:27:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 18:27:36 +0100 |
| commit | f9d5b60a2422ed4b7e66d456537c5f0bce51f382 (patch) | |
| tree | b6ae0b9fb42815290f727f98db841d82a04edaf0 /synapse/metrics/process_collector.py | |
| parent | Merge pull request #1183 from matrix-org/erikj/fix_email_update (diff) | |
| parent | Set up the process collector during metrics __init__; that way all split-proc... (diff) | |
| download | synapse-f9d5b60a2422ed4b7e66d456537c5f0bce51f382.tar.xz | |
Merge pull request #1184 from matrix-org/paul/metrics
Bugfix for process-wide metric export on split processes
Diffstat (limited to 'synapse/metrics/process_collector.py')
| -rw-r--r-- | synapse/metrics/process_collector.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/synapse/metrics/process_collector.py b/synapse/metrics/process_collector.py index 1c851d9234..0e95582368 100644 --- a/synapse/metrics/process_collector.py +++ b/synapse/metrics/process_collector.py @@ -20,8 +20,6 @@ import os import stat from resource import getrusage, RUSAGE_SELF -from synapse.metrics import get_metrics_for - TICKS_PER_SEC = 100 BYTES_PER_PAGE = 4096 @@ -111,10 +109,10 @@ def _process_fds(): return counts -def register_process_collector(): +def register_process_collector(process_metrics): # Legacy synapse-invented metric names - resource_metrics = get_metrics_for("process.resource") + resource_metrics = process_metrics.make_subspace("resource") resource_metrics.register_collector(update_resource_metrics) @@ -125,12 +123,10 @@ def register_process_collector(): # kilobytes resource_metrics.register_callback("maxrss", lambda: rusage.ru_maxrss * 1024) - get_metrics_for("process").register_callback("fds", _process_fds, labels=["type"]) + process_metrics.register_callback("fds", _process_fds, labels=["type"]) # New prometheus-standard metric names - process_metrics = get_metrics_for("process") - if HAVE_PROC_SELF_STAT: process_metrics.register_callback( "cpu_user_seconds_total", |