diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-23 19:21:37 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-23 19:21:37 +0100 |
| commit | adfe29ec0bedf394772e30583c271f142bccd3ba (patch) | |
| tree | ba4759be562a0f9f9cddc514968fd16e7b0faa90 /synapse/util/metrics.py | |
| parent | incorporate review (diff) | |
| parent | Merge pull request #3584 from matrix-org/erikj/use_cached (diff) | |
| download | synapse-adfe29ec0bedf394772e30583c271f142bccd3ba.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/util/metrics.py')
| -rw-r--r-- | synapse/util/metrics.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/synapse/util/metrics.py b/synapse/util/metrics.py index 6ba7107896..97f1267380 100644 --- a/synapse/util/metrics.py +++ b/synapse/util/metrics.py @@ -104,12 +104,19 @@ class Measure(object): logger.warn("Expected context. (%r)", self.name) return - usage = context.get_resource_usage() - self.start_usage - block_ru_utime.labels(self.name).inc(usage.ru_utime) - block_ru_stime.labels(self.name).inc(usage.ru_stime) - block_db_txn_count.labels(self.name).inc(usage.db_txn_count) - block_db_txn_duration.labels(self.name).inc(usage.db_txn_duration_sec) - block_db_sched_duration.labels(self.name).inc(usage.db_sched_duration_sec) + current = context.get_resource_usage() + usage = current - self.start_usage + try: + block_ru_utime.labels(self.name).inc(usage.ru_utime) + block_ru_stime.labels(self.name).inc(usage.ru_stime) + block_db_txn_count.labels(self.name).inc(usage.db_txn_count) + block_db_txn_duration.labels(self.name).inc(usage.db_txn_duration_sec) + block_db_sched_duration.labels(self.name).inc(usage.db_sched_duration_sec) + except ValueError: + logger.warn( + "Failed to save metrics! OLD: %r, NEW: %r", + self.start_usage, current + ) if self.created_context: self.start_context.__exit__(exc_type, exc_val, exc_tb) |