|
@@ -18,6 +18,10 @@
|
|
|
from synapse.api.errors import (
|
|
|
cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError, Codes
|
|
|
)
|
|
|
+from synapse.http.request_metrics import (
|
|
|
+ RequestMetrics, requests_counter,
|
|
|
+ outgoing_responses_counter,
|
|
|
+)
|
|
|
from synapse.util.logcontext import LoggingContext, PreserveLoggingContext
|
|
|
from synapse.util.caches import intern_dict
|
|
|
from synapse.util.metrics import Measure
|
|
@@ -41,82 +45,6 @@ import simplejson
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
-metrics = synapse.metrics.get_metrics_for(__name__)
|
|
|
-
|
|
|
-# total number of responses served, split by method/servlet/tag
|
|
|
-response_count = metrics.register_counter(
|
|
|
- "response_count",
|
|
|
- labels=["method", "servlet", "tag"],
|
|
|
- alternative_names=(
|
|
|
- # the following are all deprecated aliases for the same metric
|
|
|
- metrics.name_prefix + x for x in (
|
|
|
- "_requests",
|
|
|
- "_response_time:count",
|
|
|
- "_response_ru_utime:count",
|
|
|
- "_response_ru_stime:count",
|
|
|
- "_response_db_txn_count:count",
|
|
|
- "_response_db_txn_duration:count",
|
|
|
- )
|
|
|
- )
|
|
|
-)
|
|
|
-
|
|
|
-requests_counter = metrics.register_counter(
|
|
|
- "requests_received",
|
|
|
- labels=["method", "servlet", ],
|
|
|
-)
|
|
|
-
|
|
|
-outgoing_responses_counter = metrics.register_counter(
|
|
|
- "responses",
|
|
|
- labels=["method", "code"],
|
|
|
-)
|
|
|
-
|
|
|
-response_timer = metrics.register_counter(
|
|
|
- "response_time_seconds",
|
|
|
- labels=["method", "servlet", "tag"],
|
|
|
- alternative_names=(
|
|
|
- metrics.name_prefix + "_response_time:total",
|
|
|
- ),
|
|
|
-)
|
|
|
-
|
|
|
-response_ru_utime = metrics.register_counter(
|
|
|
- "response_ru_utime_seconds", labels=["method", "servlet", "tag"],
|
|
|
- alternative_names=(
|
|
|
- metrics.name_prefix + "_response_ru_utime:total",
|
|
|
- ),
|
|
|
-)
|
|
|
-
|
|
|
-response_ru_stime = metrics.register_counter(
|
|
|
- "response_ru_stime_seconds", labels=["method", "servlet", "tag"],
|
|
|
- alternative_names=(
|
|
|
- metrics.name_prefix + "_response_ru_stime:total",
|
|
|
- ),
|
|
|
-)
|
|
|
-
|
|
|
-response_db_txn_count = metrics.register_counter(
|
|
|
- "response_db_txn_count", labels=["method", "servlet", "tag"],
|
|
|
- alternative_names=(
|
|
|
- metrics.name_prefix + "_response_db_txn_count:total",
|
|
|
- ),
|
|
|
-)
|
|
|
-
|
|
|
-# 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=(
|
|
|
- metrics.name_prefix + "_response_db_txn_duration:total",
|
|
|
- ),
|
|
|
-)
|
|
|
-
|
|
|
-# 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"]
|
|
|
-)
|
|
|
-
|
|
|
-# size in bytes of the response written
|
|
|
-response_size = metrics.register_counter(
|
|
|
- "response_size", labels=["method", "servlet", "tag"]
|
|
|
-)
|
|
|
|
|
|
_next_request_id = 0
|
|
|
|
|
@@ -386,54 +314,6 @@ def _unrecognised_request_handler(request):
|
|
|
raise UnrecognizedRequestError()
|
|
|
|
|
|
|
|
|
-class RequestMetrics(object):
|
|
|
- def start(self, clock, name):
|
|
|
- self.start = clock.time_msec()
|
|
|
- self.start_context = LoggingContext.current_context()
|
|
|
- self.name = name
|
|
|
-
|
|
|
- def stop(self, clock, request):
|
|
|
- context = LoggingContext.current_context()
|
|
|
-
|
|
|
- tag = ""
|
|
|
- if context:
|
|
|
- tag = context.tag
|
|
|
-
|
|
|
- if context != self.start_context:
|
|
|
- logger.warn(
|
|
|
- "Context have unexpectedly changed %r, %r",
|
|
|
- context, self.start_context
|
|
|
- )
|
|
|
- return
|
|
|
-
|
|
|
- response_count.inc(request.method, self.name, tag)
|
|
|
-
|
|
|
- response_timer.inc_by(
|
|
|
- clock.time_msec() - self.start, request.method,
|
|
|
- self.name, tag
|
|
|
- )
|
|
|
-
|
|
|
- ru_utime, ru_stime = context.get_resource_usage()
|
|
|
-
|
|
|
- response_ru_utime.inc_by(
|
|
|
- ru_utime, request.method, self.name, tag
|
|
|
- )
|
|
|
- response_ru_stime.inc_by(
|
|
|
- ru_stime, request.method, self.name, tag
|
|
|
- )
|
|
|
- response_db_txn_count.inc_by(
|
|
|
- context.db_txn_count, request.method, self.name, tag
|
|
|
- )
|
|
|
- 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
|
|
|
- )
|
|
|
-
|
|
|
- response_size.inc_by(request.sentLength, request.method, self.name, tag)
|
|
|
-
|
|
|
-
|
|
|
class RootRedirect(resource.Resource):
|
|
|
"""Redirects the root '/' path to another path."""
|
|
|
|