diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2018-01-17 14:29:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 14:29:37 +0000 |
| commit | a7e4ff9ccaad33c7a193fd2bf233260ada10f3e9 (patch) | |
| tree | 0bb7d6f5f5bdeb7081e810bc119820b36b51d943 /synapse/http | |
| parent | Merge pull request #2797 from matrix-org/rav/user_id_checking (diff) | |
| parent | Merge remote-tracking branch 'origin/develop' into rav/track_db_scheduling (diff) | |
| download | synapse-a7e4ff9ccaad33c7a193fd2bf233260ada10f3e9.tar.xz | |
Merge pull request #2795 from matrix-org/rav/track_db_scheduling
Track DB scheduling delay per-request
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/server.py | 7 | ||||
| -rw-r--r-- | synapse/http/site.py | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 9edb957ec2..165c684d0d 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -102,6 +102,10 @@ response_db_txn_duration = metrics.register_counter( ), ) +# seconds spent waiting for a db connection, when processing this request +response_db_sched_duration = metrics.register_counter( + "response_db_sched_duration_seconds", labels=["method", "servlet", "tag"] +) _next_request_id = 0 @@ -372,6 +376,9 @@ class RequestMetrics(object): response_db_txn_duration.inc_by( context.db_txn_duration_ms / 1000., request.method, self.name, tag ) + response_db_sched_duration.inc_by( + context.db_sched_duration_ms / 1000., request.method, self.name, tag + ) class RootRedirect(resource.Resource): diff --git a/synapse/http/site.py b/synapse/http/site.py index dc64f0f6f5..e422c8dfae 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -67,13 +67,14 @@ class SynapseRequest(Request): ru_utime, ru_stime = context.get_resource_usage() db_txn_count = context.db_txn_count db_txn_duration_ms = context.db_txn_duration_ms + db_sched_duration_ms = context.db_sched_duration_ms except Exception: ru_utime, ru_stime = (0, 0) db_txn_count, db_txn_duration_ms = (0, 0) self.site.access_logger.info( "%s - %s - {%s}" - " Processed request: %dms (%dms, %dms) (%dms/%d)" + " Processed request: %dms (%dms, %dms) (%dms/%dms/%d)" " %sB %s \"%s %s %s\" \"%s\"", self.getClientIP(), self.site.site_tag, @@ -81,6 +82,7 @@ class SynapseRequest(Request): int(time.time() * 1000) - self.start_time, int(ru_utime * 1000), int(ru_stime * 1000), + db_sched_duration_ms, db_txn_duration_ms, int(db_txn_count), self.sentLength, |