diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 8211273006..2d420a58a2 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -46,10 +46,13 @@ received_pdus_counter = Counter("synapse_federation_server_received_pdus", "")
received_edus_counter = Counter("synapse_federation_server_received_edus", "")
-received_queries_counter = Counter("synapse_federation_server_received_queries", "", ["type"])
+received_queries_counter = Counter(
+ "synapse_federation_server_received_queries", "", ["type"]
+)
class FederationServer(FederationBase):
+
def __init__(self, hs):
super(FederationServer, self).__init__(hs)
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index 2049351fdd..53442688c8 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -28,7 +28,10 @@ from synapse.handlers.presence import format_user_presence_state, get_interested
import synapse.metrics
from synapse.metrics import LaterGauge
from synapse.metrics import (
- sent_edus_counter, sent_transactions_counter, events_processed_counter)
+ sent_edus_counter,
+ sent_transactions_counter,
+ events_processed_counter,
+)
from prometheus_client import Counter
@@ -37,7 +40,9 @@ import logging
logger = logging.getLogger(__name__)
-sent_pdus_destination_dist = Counter("synapse_federation_client_sent_pdu_destinations", "")
+sent_pdus_destination_dist = Counter(
+ "synapse_federation_client_sent_pdu_destinations", ""
+)
class TransactionQueue(object):
@@ -64,7 +69,10 @@ class TransactionQueue(object):
# done
self.pending_transactions = {}
- LaterGauge("synapse_federation_client_pending_destinations", "", [],
+ LaterGauge(
+ "synapse_federation_client_pending_destinations",
+ "",
+ [],
lambda: len(self.pending_transactions),
)
@@ -89,11 +97,15 @@ class TransactionQueue(object):
self.pending_edus_keyed_by_dest = edus_keyed = {}
LaterGauge(
- "synapse_federation_client_pending_pdus", "", [],
+ "synapse_federation_client_pending_pdus",
+ "",
+ [],
lambda: sum(map(len, pdus.values())),
)
LaterGauge(
- "synapse_federation_client_pending_edus", "", [],
+ "synapse_federation_client_pending_edus",
+ "",
+ [],
lambda: (
sum(map(len, edus.values()))
+ sum(map(len, presence.values()))
diff --git a/synapse/http/request_metrics.py b/synapse/http/request_metrics.py
index e7f1bfc4ae..7f11b5c5a4 100644
--- a/synapse/http/request_metrics.py
+++ b/synapse/http/request_metrics.py
@@ -25,47 +25,87 @@ logger = logging.getLogger(__name__)
# total number of responses served, split by method/servlet/tag
-response_count = Counter("synapse_http_server_response_count", "", ["method", "servlet", "tag"])
+response_count = Counter(
+ "synapse_http_server_response_count", "", ["method", "servlet", "tag"]
+)
-requests_counter = Counter("synapse_http_server_requests_received", "", ["method", "servlet"])
+requests_counter = Counter(
+ "synapse_http_server_requests_received", "", ["method", "servlet"]
+)
-outgoing_responses_counter = Counter("synapse_http_server_responses", "", ["method", "code"])
+outgoing_responses_counter = Counter(
+ "synapse_http_server_responses", "", ["method", "code"]
+)
-response_timer = Histogram("synapse_http_server_response_time_seconds", "", ["method", "servlet", "tag"])
+response_timer = Histogram(
+ "synapse_http_server_response_time_seconds", "", ["method", "servlet", "tag"]
+)
-response_ru_utime = Counter("synapse_http_server_response_ru_utime_seconds", "", ["method", "servlet", "tag"])
+response_ru_utime = Counter(
+ "synapse_http_server_response_ru_utime_seconds", "", ["method", "servlet", "tag"]
+)
-response_ru_stime = Counter("synapse_http_server_response_ru_stime_seconds", "", ["method", "servlet", "tag"])
+response_ru_stime = Counter(
+ "synapse_http_server_response_ru_stime_seconds", "", ["method", "servlet", "tag"]
+)
-response_db_txn_count = Counter("synapse_http_server_response_db_txn_count", "", ["method", "servlet", "tag"])
+response_db_txn_count = Counter(
+ "synapse_http_server_response_db_txn_count", "", ["method", "servlet", "tag"]
+)
# seconds spent waiting for db txns, excluding scheduling time, when processing
# this request
-response_db_txn_duration = Counter("synapse_http_server_response_db_txn_duration_seconds", "", ["method", "servlet", "tag"])
+response_db_txn_duration = Counter(
+ "synapse_http_server_response_db_txn_duration_seconds",
+ "",
+ ["method", "servlet", "tag"],
+)
# seconds spent waiting for a db connection, when processing this request
-response_db_sched_duration = Counter("synapse_http_request_response_db_sched_duration_seconds", "", ["method", "servlet", "tag"]
+response_db_sched_duration = Counter(
+ "synapse_http_request_response_db_sched_duration_seconds",
+ "",
+ ["method", "servlet", "tag"],
)
# size in bytes of the response written
-response_size = Counter("synapse_http_request_response_size", "", ["method", "servlet", "tag"]
+response_size = Counter(
+ "synapse_http_request_response_size", "", ["method", "servlet", "tag"]
)
# In flight metrics are incremented while the requests are in flight, rather
# than when the response was written.
-in_flight_requests_ru_utime = Counter("synapse_http_request_in_flight_requests_ru_utime_seconds", "", ["method", "servlet"])
+in_flight_requests_ru_utime = Counter(
+ "synapse_http_request_in_flight_requests_ru_utime_seconds",
+ "",
+ ["method", "servlet"],
+)
-in_flight_requests_ru_stime = Counter("synapse_http_request_in_flight_requests_ru_stime_seconds", "", ["method", "servlet"])
+in_flight_requests_ru_stime = Counter(
+ "synapse_http_request_in_flight_requests_ru_stime_seconds",
+ "",
+ ["method", "servlet"],
+)
-in_flight_requests_db_txn_count = Counter("synapse_http_request_in_flight_requests_db_txn_count", "", ["method", "servlet"])
+in_flight_requests_db_txn_count = Counter(
+ "synapse_http_request_in_flight_requests_db_txn_count", "", ["method", "servlet"]
+)
# seconds spent waiting for db txns, excluding scheduling time, when processing
# this request
-in_flight_requests_db_txn_duration = Counter("synapse_http_request_in_flight_requests_db_txn_duration_seconds", "", ["method", "servlet"])
+in_flight_requests_db_txn_duration = Counter(
+ "synapse_http_request_in_flight_requests_db_txn_duration_seconds",
+ "",
+ ["method", "servlet"],
+)
# seconds spent waiting for a db connection, when processing this request
-in_flight_requests_db_sched_duration = Counter("synapse_http_request_in_flight_requests_db_sched_duration_seconds", "", ["method", "servlet"])
+in_flight_requests_db_sched_duration = Counter(
+ "synapse_http_request_in_flight_requests_db_sched_duration_seconds",
+ "",
+ ["method", "servlet"],
+)
# The set of all in flight requests, set[RequestMetrics]
_in_flight_requests = set()
@@ -91,9 +131,10 @@ def _get_in_flight_counts():
LaterGauge(
- "synapse_http_request_metrics_in_flight_requests_count", "",
+ "synapse_http_request_metrics_in_flight_requests_count",
+ "",
["method", "servlet"],
- _get_in_flight_counts
+ _get_in_flight_counts,
)
@@ -128,16 +169,23 @@ class RequestMetrics(object):
response_count.labels(request.method, self.name, tag).inc()
- response_timer.labels(request.method, self.name, tag).observe(time_msec - self.start)
+ response_timer.labels(request.method, self.name, tag).observe(
+ time_msec - self.start
+ )
ru_utime, ru_stime = context.get_resource_usage()
response_ru_utime.labels(request.method, self.name, tag).inc(ru_utime)
response_ru_stime.labels(request.method, self.name, tag).inc(ru_stime)
- response_db_txn_count.labels(request.method, self.name, tag).inc(context.db_txn_count)
- response_db_txn_duration.labels(request.method, self.name, tag).inc(context.db_txn_duration_ms / 1000.)
+ response_db_txn_count.labels(request.method, self.name, tag).inc(
+ context.db_txn_count
+ )
+ response_db_txn_duration.labels(request.method, self.name, tag).inc(
+ context.db_txn_duration_ms / 1000.
+ )
response_db_sched_duration.labels(request.method, self.name, tag).inc(
- context.db_sched_duration_ms / 1000.)
+ context.db_sched_duration_ms / 1000.
+ )
response_size.labels(request.method, self.name, tag).inc(request.sentLength)
@@ -154,11 +202,17 @@ class RequestMetrics(object):
in_flight_requests_ru_utime.labels(self.method, self.name).inc(diff.ru_utime)
in_flight_requests_ru_stime.labels(self.method, self.name).inc(diff.ru_stime)
- in_flight_requests_db_txn_count.labels(self.method, self.name).inc(diff.db_txn_count)
+ in_flight_requests_db_txn_count.labels(self.method, self.name).inc(
+ diff.db_txn_count
+ )
- in_flight_requests_db_txn_duration.labels(self.method, self.name).inc(diff.db_txn_duration_ms / 1000.)
+ in_flight_requests_db_txn_duration.labels(self.method, self.name).inc(
+ diff.db_txn_duration_ms / 1000.
+ )
- in_flight_requests_db_sched_duration.labels(self.method, self.name).inc(diff.db_sched_duration_ms / 1000.)
+ in_flight_requests_db_sched_duration.labels(self.method, self.name).inc(
+ diff.db_sched_duration_ms / 1000.
+ )
class _RequestStats(object):
@@ -166,12 +220,16 @@ class _RequestStats(object):
"""
__slots__ = [
- "ru_utime", "ru_stime",
- "db_txn_count", "db_txn_duration_ms", "db_sched_duration_ms",
+ "ru_utime",
+ "ru_stime",
+ "db_txn_count",
+ "db_txn_duration_ms",
+ "db_sched_duration_ms",
]
- def __init__(self, ru_utime, ru_stime, db_txn_count,
- db_txn_duration_ms, db_sched_duration_ms):
+ def __init__(
+ self, ru_utime, ru_stime, db_txn_count, db_txn_duration_ms, db_sched_duration_ms
+ ):
self.ru_utime = ru_utime
self.ru_stime = ru_stime
self.db_txn_count = db_txn_count
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 40cc553918..6dce20a284 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -40,7 +40,8 @@ logger = logging.getLogger(__name__)
notified_events_counter = Counter("synapse_notifier_notified_events", "")
-users_woken_by_stream_counter = Counter("synapse_notifier_users_woken_by_stream", "", ["stream"])
+users_woken_by_stream_counter = Counter(
+ "synapse_notifier_users_woken_by_stream", "", ["stream"])
# TODO(paul): Should be shared somewhere
diff --git a/synapse/util/caches/__init__.py b/synapse/util/caches/__init__.py
index 1c511a7072..e0c22df249 100644
--- a/synapse/util/caches/__init__.py
+++ b/synapse/util/caches/__init__.py
@@ -29,13 +29,16 @@ cache_total = Gauge("synapse_util_caches_cache:total", "", ["name"])
response_cache_size = Gauge("synapse_util_caches_response_cache:size", "", ["name"])
response_cache_hits = Gauge("synapse_util_caches_response_cache:hits", "", ["name"])
-response_cache_evicted = Gauge("synapse_util_caches_response_cache:evicted_size", "", ["name"])
+response_cache_evicted = Gauge(
+ "synapse_util_caches_response_cache:evicted_size", "", ["name"]
+)
response_cache_total = Gauge("synapse_util_caches_response_cache:total", "", ["name"])
+
def register_cache(cache_type, cache_name, cache):
# Check if the metric is already registered. Unregister it, if so.
- metric_name = "cache_%s_%s" % (cache_type, cache_name,)
+ metric_name = "cache_%s_%s" % (cache_type, cache_name)
if metric_name in collectors_by_name.keys():
REGISTRY.unregister(collectors_by_name[metric_name])
|
