summary refs log tree commit diff
path: root/synapse/http/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-16 17:09:15 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-16 17:09:15 +0000
commit0f5d2cc37c3ce42b449e1b9cc6276d909232c4ad (patch)
treee3a40dbbd61e86d3d7e29a5ecdb72a91a4fe475c /synapse/http/server.py
parentrework runInteraction in terms of runConnection (diff)
parentTrack db txn time in millisecs (diff)
downloadsynapse-0f5d2cc37c3ce42b449e1b9cc6276d909232c4ad.tar.xz
Merge branch 'rav/db_txn_time_in_millis' into rav/track_db_scheduling
Diffstat (limited to 'synapse/http/server.py')
-rw-r--r--synapse/http/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py
index 269b65ca41..0f30e6fd56 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -93,6 +93,8 @@ response_db_txn_count = metrics.register_counter(
     ),
 )
 
+# seconds spent waiting for db txns, excluding scheduling time, when processing
+# this request
 response_db_txn_duration = metrics.register_counter(
     "response_db_txn_duration_seconds", labels=["method", "servlet", "tag"],
     alternative_names=(
@@ -377,7 +379,7 @@ class RequestMetrics(object):
             context.db_txn_count, request.method, self.name, tag
         )
         response_db_txn_duration.inc_by(
-            context.db_txn_duration, request.method, self.name, tag
+            context.db_txn_duration_ms / 1000., request.method, self.name, tag
         )