From c072c0b82969879cd08d0d6e669ded509f1e833b Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Wed, 19 Jan 2022 11:50:09 -0500
Subject: [PATCH] Fix mypy for platforms without epoll support. (#11771)
---
changelog.d/11771.misc | 1 +
synapse/metrics/_reactor_metrics.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 changelog.d/11771.misc
diff --git a/changelog.d/11771.misc b/changelog.d/11771.misc
new file mode 100644
index 0000000000..e9d5dae857
--- /dev/null
+++ b/changelog.d/11771.misc
@@ -0,0 +1 @@
+Improve accuracy of `python_twisted_reactor_tick_time` prometheus metric.
diff --git a/synapse/metrics/_reactor_metrics.py b/synapse/metrics/_reactor_metrics.py
index ce0688621c..f38f798313 100644
--- a/synapse/metrics/_reactor_metrics.py
+++ b/synapse/metrics/_reactor_metrics.py
@@ -35,7 +35,7 @@ tick_time = Histogram(
class EpollWrapper:
"""a wrapper for an epoll object which records the time between polls"""
- def __init__(self, poller: "select.epoll"):
+ def __init__(self, poller: "select.epoll"): # type: ignore[name-defined]
self.last_polled = time.time()
self._poller = poller
@@ -71,7 +71,7 @@ try:
# if the reactor has a `_poller` attribute, which is an `epoll` object
# (ie, it's an EPollReactor), we wrap the `epoll` with a thing that will
# measure the time between ticks
- from select import epoll
+ from select import epoll # type: ignore[attr-defined]
poller = reactor._poller # type: ignore[attr-defined]
except (AttributeError, ImportError):
--
GitLab