mirror of
https://github.com/element-hq/synapse.git
synced 2026-11-04 19:57:45 +00:00
Add a sanity-check test for the thread CPU metrics
Check that `/proc/<tid>/stat` parses correctly (including a thread name with spaces and brackets), that main-thread and registered-thread CPU land under the right `thread_type`, and that the per-thread totals add up to the process's CPU time between two scrapes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SXqkiTqEA9Nb2ycHaArDBb
This commit is contained in:
1 parent
d648a7f32c
commit
5dbf7995e7
1 file changed
+105
@@ -0,0 +1,105 @@
|
||||
#
|
||||
# This file is licensed under the Affero General Public License (AGPL) version 3.
|
||||
#
|
||||
# Copyright (C) 2026 Element Creations Ltd
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# See the GNU Affero General Public License for more details:
|
||||
# <https://www.gnu.org/licenses/agpl-3.0.html>.
|
||||
#
|
||||
|
||||
import os
|
||||
import threading
|
||||
import time
|
||||
|
||||
from synapse.metrics._thread_cpu import ThreadCPUMetrics
|
||||
|
||||
from tests import unittest
|
||||
|
||||
# How much CPU time to burn on each thread, in seconds.
|
||||
BURN_SECONDS = 0.2
|
||||
|
||||
# How far a thread's reported CPU may fall short of its burn. The kernel
|
||||
# reports CPU time in whole ticks, rounded down.
|
||||
TOLERANCE_SECONDS = 0.05
|
||||
|
||||
|
||||
def _burn_cpu() -> None:
|
||||
"""Spin on the calling thread until it has used `BURN_SECONDS` of CPU."""
|
||||
start = time.thread_time()
|
||||
while time.thread_time() - start < BURN_SECONDS:
|
||||
pass
|
||||
|
||||
|
||||
def _collect(metrics: ThreadCPUMetrics) -> dict[str, float]:
|
||||
"""Scrape `metrics` and map each thread type to its CPU seconds.
|
||||
|
||||
User and system time are summed. The kernel splits a thread's CPU time
|
||||
between the two by sampling, so a burn in user code can show up partly as
|
||||
system time.
|
||||
"""
|
||||
totals: dict[str, float] = {}
|
||||
for metric in metrics.collect():
|
||||
for sample in metric.samples:
|
||||
if sample.name == "synapse_thread_cpu_seconds_total":
|
||||
thread_type = sample.labels["thread_type"]
|
||||
totals[thread_type] = totals.get(thread_type, 0.0) + sample.value
|
||||
return totals
|
||||
|
||||
|
||||
class ThreadCPUMetricsTestCase(unittest.TestCase):
|
||||
def test_cpu_adds_up(self) -> None:
|
||||
"""CPU used between two scrapes is reported under the right thread
|
||||
type, and the types add up to the CPU the whole process used.
|
||||
"""
|
||||
if not os.path.isdir("/proc/self/task"):
|
||||
self.skipTest("thread CPU metrics need /proc/self/task (Linux only)")
|
||||
|
||||
# A fresh collector, so threads registered elsewhere don't count. It
|
||||
# reports process-level metrics, so it has no `SERVER_NAME_LABEL`.
|
||||
metrics = ThreadCPUMetrics() # type: ignore[missing-server-name-label]
|
||||
|
||||
before = _collect(metrics)
|
||||
process_before = sum(os.times()[:2])
|
||||
|
||||
# The collector only sees live threads, so the thread waits for
|
||||
# `release` until after the second scrape.
|
||||
burnt = threading.Event()
|
||||
release = threading.Event()
|
||||
|
||||
def run() -> None:
|
||||
_burn_cpu()
|
||||
burnt.set()
|
||||
release.wait(timeout=10)
|
||||
|
||||
# `/proc/<tid>/stat` puts the thread name in brackets. Closing
|
||||
# brackets and spaces in the name check that parsing finds the right
|
||||
# fields. Python passes the name to the kernel from 3.14 onwards.
|
||||
thread = threading.Thread(target=run, name="a) b) (c")
|
||||
thread.start()
|
||||
self.addCleanup(thread.join)
|
||||
self.addCleanup(release.set)
|
||||
metrics.register_thread("test-thread", thread)
|
||||
self.assertTrue(burnt.wait(timeout=10))
|
||||
|
||||
_burn_cpu()
|
||||
|
||||
after = _collect(metrics)
|
||||
process_delta = sum(os.times()[:2]) - process_before
|
||||
|
||||
# The sum over threads can lag the process total by up to a tick per
|
||||
# thread. Allow a couple more ticks for the scrapes themselves.
|
||||
tick = 1 / os.sysconf("SC_CLK_TCK")
|
||||
slack = (len(os.listdir("/proc/self/task")) + 2) * tick
|
||||
|
||||
def delta(thread_type: str) -> float:
|
||||
return after[thread_type] - before.get(thread_type, 0.0)
|
||||
|
||||
threads_delta = sum(after.values()) - sum(before.values())
|
||||
self.assertGreaterEqual(delta("main"), BURN_SECONDS - TOLERANCE_SECONDS)
|
||||
self.assertGreaterEqual(delta("test-thread"), BURN_SECONDS - TOLERANCE_SECONDS)
|
||||
self.assertLessEqual(abs(threads_delta - process_delta), slack)
|
||||
Reference in new issue
Block a user