tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge pull request #5461 from matrix-org/erikj/histograms_are_cumalitive

Browse source 
Prometheus histograms are cumalative
This commit is contained in:
Erik Johnston 2019-06-14 18:21:42 +01:00 committed by GitHub
commit 9ca4ae7131
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5461.feature Normal file
View file

@ -0,0 +1 @@
Statistics on forward extremities per room are now exposed via Prometheus.

1
synapse/metrics/__init__.py
View file

@ -224,7 +224,6 @@ class BucketCollector(object):
for i, bound in enumerate(self.buckets): for i, bound in enumerate(self.buckets):
if x <= bound: if x <= bound:
buckets[bound] = buckets.get(bound, 0) + data[x] buckets[bound] = buckets.get(bound, 0) + data[x]
break
for i in self.buckets: for i in self.buckets:
res.append([str(i), buckets.get(i, 0)]) res.append([str(i), buckets.get(i, 0)])

3
synapse/storage/events.py
View file

@ -228,7 +228,8 @@ class EventsStore(
self._state_resolution_handler = hs.get_state_resolution_handler() self._state_resolution_handler = hs.get_state_resolution_handler()
# Collect metrics on the number of forward extremities that exist. # 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( BucketCollector(
"synapse_forward_extremities", "synapse_forward_extremities",

20
tests/storage/test_event_metrics.py
View file

@ -64,16 +64,16 @@ class ExtremStatisticsTestCase(HomeserverTestCase):
expected = set([ expected = set([
b'synapse_forward_extremities_bucket{le="1.0"} 0.0', b'synapse_forward_extremities_bucket{le="1.0"} 0.0',
b'synapse_forward_extremities_bucket{le="2.0"} 2.0', b'synapse_forward_extremities_bucket{le="2.0"} 2.0',
b'synapse_forward_extremities_bucket{le="3.0"} 0.0', b'synapse_forward_extremities_bucket{le="3.0"} 2.0',
b'synapse_forward_extremities_bucket{le="5.0"} 0.0', b'synapse_forward_extremities_bucket{le="5.0"} 2.0',
b'synapse_forward_extremities_bucket{le="7.0"} 1.0', b'synapse_forward_extremities_bucket{le="7.0"} 3.0',
b'synapse_forward_extremities_bucket{le="10.0"} 0.0', b'synapse_forward_extremities_bucket{le="10.0"} 3.0',
b'synapse_forward_extremities_bucket{le="15.0"} 0.0', b'synapse_forward_extremities_bucket{le="15.0"} 3.0',
b'synapse_forward_extremities_bucket{le="20.0"} 0.0', b'synapse_forward_extremities_bucket{le="20.0"} 3.0',
b'synapse_forward_extremities_bucket{le="50.0"} 0.0', b'synapse_forward_extremities_bucket{le="50.0"} 3.0',
b'synapse_forward_extremities_bucket{le="100.0"} 0.0', b'synapse_forward_extremities_bucket{le="100.0"} 3.0',
b'synapse_forward_extremities_bucket{le="200.0"} 0.0', b'synapse_forward_extremities_bucket{le="200.0"} 3.0',
b'synapse_forward_extremities_bucket{le="500.0"} 0.0', b'synapse_forward_extremities_bucket{le="500.0"} 3.0',
b'synapse_forward_extremities_bucket{le="+Inf"} 3.0', b'synapse_forward_extremities_bucket{le="+Inf"} 3.0',
b'synapse_forward_extremities_count 3.0', b'synapse_forward_extremities_count 3.0',
b'synapse_forward_extremities_sum 10.0', b'synapse_forward_extremities_sum 10.0',