Merge branch 'rav/metrics_fixes' into matrix-org-hotfixes

matrix-org · Jan 18, 2018 · 9249f11 · 9249f11
2 parents 3517ab8 + d57765f
commit 9249f11
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/synapse/util/metrics.py b/synapse/util/metrics.py
@@ -28,7 +28,7 @@
 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_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 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             return
 
         duration = self.clock.time_msec() - self.start
+
+        block_counter.inc(self.name)
         block_timer.inc_by(duration, self.name)
 
         context = LoggingContext.current_context()