diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-14 18:21:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 18:21:42 +0100 |
| commit | 9ca4ae71314e177210f858819c76ed0fa2f40d15 (patch) | |
| tree | e889b4147b41f2e7ec453e4df748b1feed711469 /synapse | |
| parent | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-9ca4ae71314e177210f858819c76ed0fa2f40d15.tar.xz | |
Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive
Prometheus histograms are cumalative
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/metrics/__init__.py | 1 | ||||
| -rw-r--r-- | synapse/storage/events.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py index 0d3ae1a43d..8aee14a8a8 100644 --- a/synapse/metrics/__init__.py +++ b/synapse/metrics/__init__.py @@ -224,7 +224,6 @@ class BucketCollector(object): for i, bound in enumerate(self.buckets): if x <= bound: buckets[bound] = buckets.get(bound, 0) + data[x] - break for i in self.buckets: res.append([str(i), buckets.get(i, 0)]) diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 1578403f79..f631fb1733 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -228,7 +228,8 @@ class EventsStore( self._state_resolution_handler = hs.get_state_resolution_handler() # Collect metrics on the number of forward extremities that exist. - self._current_forward_extremities_amount = {} + # Counter of number of extremities to count + self._current_forward_extremities_amount = c_counter() BucketCollector( "synapse_forward_extremities", |