From 61e28c41cdf8b2e2b75ae950ee63b6ea223ba16c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 8 Nov 2021 14:33:58 +0000
Subject: Fixup

---
 synapse/metrics/__init__.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py
index d7475ddf12..98db75192e 100644
--- a/synapse/metrics/__init__.py
+++ b/synapse/metrics/__init__.py
@@ -586,9 +586,7 @@ _last_gc = [0.0, 0.0, 0.0]
 
 def callFromThreadTimer(func):
     @functools.wraps(func)
-    def callFromThread(
-        self, f: Callable[..., Any], *args: object, **kwargs: object
-    ) -> None:
+    def callFromThread(f: Callable[..., Any], *args: object, **kwargs: object) -> None:
         @functools.wraps(f)
         def g(*args, **kwargs):
             start = time.time()
@@ -604,7 +602,7 @@ def callFromThreadTimer(func):
 
             return r
 
-        func(f, args, kwargs)
+        func(g, args, kwargs)
 
     return callFromThread
 
-- 
cgit 1.4.1