Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Prometheus histograms are cumalative #5461

Merged
merged 2 commits into from
Jun 14, 2019
Merged

Prometheus histograms are cumalative #5461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ed595e
Prometheus histograms are cumalative
erikjohnston Jun 14, 2019
9fd4f83
Newsfile
erikjohnston Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5461.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Statistics on forward extremities per room are now exposed via Prometheus.
1 change: 0 additions & 1 deletion synapse/metrics/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ def collect(self):
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)])
Expand Down
3 changes: 2 additions & 1 deletion synapse/storage/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ def __init__(self, db_conn, hs):
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",
Expand Down
20 changes: 10 additions & 10 deletions tests/storage/test_event_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ def test_exposed_to_prometheus(self):
expected = set([
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="3.0"} 0.0',
b'synapse_forward_extremities_bucket{le="5.0"} 0.0',
b'synapse_forward_extremities_bucket{le="7.0"} 1.0',
b'synapse_forward_extremities_bucket{le="10.0"} 0.0',
b'synapse_forward_extremities_bucket{le="15.0"} 0.0',
b'synapse_forward_extremities_bucket{le="20.0"} 0.0',
b'synapse_forward_extremities_bucket{le="50.0"} 0.0',
b'synapse_forward_extremities_bucket{le="100.0"} 0.0',
b'synapse_forward_extremities_bucket{le="200.0"} 0.0',
b'synapse_forward_extremities_bucket{le="500.0"} 0.0',
b'synapse_forward_extremities_bucket{le="3.0"} 2.0',
b'synapse_forward_extremities_bucket{le="5.0"} 2.0',
b'synapse_forward_extremities_bucket{le="7.0"} 3.0',
b'synapse_forward_extremities_bucket{le="10.0"} 3.0',
b'synapse_forward_extremities_bucket{le="15.0"} 3.0',
b'synapse_forward_extremities_bucket{le="20.0"} 3.0',
b'synapse_forward_extremities_bucket{le="50.0"} 3.0',
b'synapse_forward_extremities_bucket{le="100.0"} 3.0',
b'synapse_forward_extremities_bucket{le="200.0"} 3.0',
b'synapse_forward_extremities_bucket{le="500.0"} 3.0',
b'synapse_forward_extremities_bucket{le="+Inf"} 3.0',
b'synapse_forward_extremities_count 3.0',
b'synapse_forward_extremities_sum 10.0',
Expand Down