diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-01-16 17:09:15 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-01-16 17:09:15 +0000 |
| commit | 0f5d2cc37c3ce42b449e1b9cc6276d909232c4ad (patch) | |
| tree | e3a40dbbd61e86d3d7e29a5ecdb72a91a4fe475c /synapse/http | |
| parent | rework runInteraction in terms of runConnection (diff) | |
| parent | Track db txn time in millisecs (diff) | |
| download | synapse-0f5d2cc37c3ce42b449e1b9cc6276d909232c4ad.tar.xz | |
Merge branch 'rav/db_txn_time_in_millis' into rav/track_db_scheduling
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/server.py | 4 | ||||
| -rw-r--r-- | synapse/http/site.py | 6 |
2 files changed, 6 insertions, 4 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 ) diff --git a/synapse/http/site.py b/synapse/http/site.py index cd1492b1c3..dc64f0f6f5 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -66,10 +66,10 @@ class SynapseRequest(Request): context = LoggingContext.current_context() ru_utime, ru_stime = context.get_resource_usage() db_txn_count = context.db_txn_count - db_txn_duration = context.db_txn_duration + db_txn_duration_ms = context.db_txn_duration_ms except Exception: ru_utime, ru_stime = (0, 0) - db_txn_count, db_txn_duration = (0, 0) + db_txn_count, db_txn_duration_ms = (0, 0) self.site.access_logger.info( "%s - %s - {%s}" @@ -81,7 +81,7 @@ class SynapseRequest(Request): int(time.time() * 1000) - self.start_time, int(ru_utime * 1000), int(ru_stime * 1000), - int(db_txn_duration * 1000), + db_txn_duration_ms, int(db_txn_count), self.sentLength, self.code, |