Merge pull request #2810 from matrix-org/rav/metrics_fixes

Fix bugs in block metrics
This commit is contained in:
Richard van der Hoff 2018-01-18 13:35:28 +00:00 committed by GitHub
commit 5a4da21d58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -28,7 +28,7 @@ logger = logging.getLogger(__name__)
metrics = synapse.metrics.get_metrics_for(__name__)
# total number of times we have hit this block
response_count = metrics.register_counter(
block_counter = metrics.register_counter(
"block_count",
labels=["block_name"],
alternative_names=(
@ -76,7 +76,7 @@ block_db_txn_count = metrics.register_counter(
block_db_txn_duration = metrics.register_counter(
"block_db_txn_duration_seconds", labels=["block_name"],
alternative_names=(
metrics.name_prefix + "_block_db_txn_count:total",
metrics.name_prefix + "_block_db_txn_duration:total",
),
)
@ -131,6 +131,8 @@ class Measure(object):
return
duration = self.clock.time_msec() - self.start
block_counter.inc(self.name)
block_timer.inc_by(duration, self.name)
context = LoggingContext.current_context()