mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 11:49:51 -04:00
Merge pull request #5458 from matrix-org/hawkowl/fix-prometheus
Fix Prometheus erroring after the extremities monitoring
This commit is contained in:
commit
f03f8b7f4c
1
changelog.d/5458.feature
Normal file
1
changelog.d/5458.feature
Normal file
@ -0,0 +1 @@
|
|||||||
|
Statistics on forward extremities per room are now exposed via Prometheus.
|
@ -227,7 +227,7 @@ class BucketCollector(object):
|
|||||||
break
|
break
|
||||||
|
|
||||||
for i in self.buckets:
|
for i in self.buckets:
|
||||||
res.append([i, buckets.get(i, 0)])
|
res.append([str(i), buckets.get(i, 0)])
|
||||||
|
|
||||||
res.append(["+Inf", sum(data.values())])
|
res.append(["+Inf", sum(data.values())])
|
||||||
|
|
||||||
|
@ -13,6 +13,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
from prometheus_client.exposition import generate_latest
|
||||||
|
|
||||||
from synapse.metrics import REGISTRY
|
from synapse.metrics import REGISTRY
|
||||||
from synapse.types import Requester, UserID
|
from synapse.types import Requester, UserID
|
||||||
|
|
||||||
@ -52,46 +54,29 @@ class ExtremStatisticsTestCase(HomeserverTestCase):
|
|||||||
self.reactor.advance(60 * 60 * 1000)
|
self.reactor.advance(60 * 60 * 1000)
|
||||||
self.pump(1)
|
self.pump(1)
|
||||||
|
|
||||||
items = list(
|
items = set(
|
||||||
filter(
|
filter(
|
||||||
lambda x: x.name == "synapse_forward_extremities",
|
lambda x: b"synapse_forward_extremities_" in x,
|
||||||
list(REGISTRY.collect()),
|
generate_latest(REGISTRY).split(b"\n"),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
# Check the values are what we want
|
expected = set([
|
||||||
buckets = {}
|
b'synapse_forward_extremities_bucket{le="1.0"} 0.0',
|
||||||
_count = 0
|
b'synapse_forward_extremities_bucket{le="2.0"} 2.0',
|
||||||
_sum = 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="+Inf"} 3.0',
|
||||||
|
b'synapse_forward_extremities_count 3.0',
|
||||||
|
b'synapse_forward_extremities_sum 10.0',
|
||||||
|
])
|
||||||
|
|
||||||
for i in items[0].samples:
|
self.assertEqual(items, expected)
|
||||||
if i[0].endswith("_bucket"):
|
|
||||||
buckets[i[1]['le']] = i[2]
|
|
||||||
elif i[0].endswith("_count"):
|
|
||||||
_count = i[2]
|
|
||||||
elif i[0].endswith("_sum"):
|
|
||||||
_sum = i[2]
|
|
||||||
|
|
||||||
# 3 buckets, 2 with 2 extrems, 1 with 6 extrems (bucketed as 7), and
|
|
||||||
# +Inf which is all
|
|
||||||
self.assertEqual(
|
|
||||||
buckets,
|
|
||||||
{
|
|
||||||
1.0: 0,
|
|
||||||
2.0: 2,
|
|
||||||
3.0: 0,
|
|
||||||
5.0: 0,
|
|
||||||
7.0: 1,
|
|
||||||
10.0: 0,
|
|
||||||
15.0: 0,
|
|
||||||
20.0: 0,
|
|
||||||
50.0: 0,
|
|
||||||
100.0: 0,
|
|
||||||
200.0: 0,
|
|
||||||
500.0: 0,
|
|
||||||
"+Inf": 3,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
# 3 rooms, with 10 total events
|
|
||||||
self.assertEqual(_count, 3)
|
|
||||||
self.assertEqual(_sum, 10)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user