diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-03 17:51:06 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-03 17:51:06 +0100 |
| commit | 651107183702d337328635ce290987a3a8d763fa (patch) | |
| tree | 96b39c8c52c03ab3ab01bf2031433a32bcdd15a5 /synapse/util/metrics.py | |
| parent | Use the right error.... (diff) | |
| parent | add some metrics on the federation sender (#6160) (diff) | |
| download | synapse-651107183702d337328635ce290987a3a8d763fa.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memberships
Diffstat (limited to 'synapse/util/metrics.py')
| -rw-r--r-- | synapse/util/metrics.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/util/metrics.py b/synapse/util/metrics.py index 0910930c21..4b1bcdf23c 100644 --- a/synapse/util/metrics.py +++ b/synapse/util/metrics.py @@ -60,12 +60,14 @@ in_flight = InFlightGauge( ) -def measure_func(name): +def measure_func(name=None): def wrapper(func): + block_name = func.__name__ if name is None else name + @wraps(func) @defer.inlineCallbacks def measured_func(self, *args, **kwargs): - with Measure(self.clock, name): + with Measure(self.clock, block_name): r = yield func(self, *args, **kwargs) return r |