diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2016-11-03 16:27:10 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2016-11-03 16:34:16 +0000 |
| commit | c1b077cd194d009470ad081311e2729769c9750a (patch) | |
| tree | e92814f30125d8884f24a110a867a433d727bb6e | |
| parent | Merge pull request #1192 from matrix-org/erikj/postgres_gist (diff) | |
| download | synapse-c1b077cd194d009470ad081311e2729769c9750a.tar.xz | |
Now we have new-style metrics don't bother exporting legacy-named process ones
| -rw-r--r-- | synapse/metrics/process_collector.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/synapse/metrics/process_collector.py b/synapse/metrics/process_collector.py index 0e95582368..4df3a2fa24 100644 --- a/synapse/metrics/process_collector.py +++ b/synapse/metrics/process_collector.py @@ -110,22 +110,7 @@ def _process_fds(): def register_process_collector(process_metrics): - # Legacy synapse-invented metric names - - resource_metrics = process_metrics.make_subspace("resource") - - resource_metrics.register_collector(update_resource_metrics) - - # msecs - resource_metrics.register_callback("utime", lambda: rusage.ru_utime * 1000) - resource_metrics.register_callback("stime", lambda: rusage.ru_stime * 1000) - - # kilobytes - resource_metrics.register_callback("maxrss", lambda: rusage.ru_maxrss * 1024) - - process_metrics.register_callback("fds", _process_fds, labels=["type"]) - - # New prometheus-standard metric names + process_metrics.register_collector(update_resource_metrics) if HAVE_PROC_SELF_STAT: process_metrics.register_callback( |