From a189f032a987cd385084ec4f212f17eb041dc787 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 5 Nov 2026 16:39:31 +0000
Subject: [PATCH] Rename thread_cpu -> _thread_cpu

---
 synapse/logging/opentracing.py                    | 2 +-
 synapse/metrics/__init__.py                       | 2 +-
 synapse/metrics/{_thread_cpu.py => thread_cpu.py} | 0
 synapse/module_api/__init__.py                    | 2 +-
 tests/metrics/test_thread_cpu.py                  | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename synapse/metrics/{_thread_cpu.py => thread_cpu.py} (100%)

diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py
index b4010197e2..2fe713a6b5 100644
--- a/synapse/logging/opentracing.py
+++ b/synapse/logging/opentracing.py
@@ -202,7 +202,7 @@ from twisted.web.http import Request
 from twisted.web.http_headers import Headers
 
 from synapse.config import ConfigError
-from synapse.metrics._thread_cpu import thread_cpu_metrics
+from synapse.metrics.thread_cpu import thread_cpu_metrics
 from synapse.util.json import json_decoder, json_encoder
 
 if TYPE_CHECKING:
diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py
index dcfea587d7..8e04dbf423 100644
--- a/synapse/metrics/__init__.py
+++ b/synapse/metrics/__init__.py
@@ -61,8 +61,8 @@ from twisted.web.server import Request
 # This module is imported for its side effects; flake8 needn't warn that it's unused.
 import synapse.metrics._reactor_metrics  # noqa: F401
 from synapse.metrics._gc import MIN_TIME_BETWEEN_GCS, install_gc_manager
-from synapse.metrics._thread_cpu import thread_cpu_metrics
 from synapse.metrics._types import Collector
+from synapse.metrics.thread_cpu import thread_cpu_metrics
 from synapse.synapse_rust import get_rustc_version
 from synapse.types import StrSequence
 from synapse.util import SYNAPSE_VERSION
diff --git a/synapse/metrics/_thread_cpu.py b/synapse/metrics/thread_cpu.py
similarity index 100%
rename from synapse/metrics/_thread_cpu.py
rename to synapse/metrics/thread_cpu.py
diff --git a/synapse/module_api/__init__.py b/synapse/module_api/__init__.py
index 47ec15e3d5..24b80c2dbd 100644
--- a/synapse/module_api/__init__.py
+++ b/synapse/module_api/__init__.py
@@ -79,10 +79,10 @@ from synapse.logging.context import (
     make_deferred_yieldable,
     run_in_background,
 )
-from synapse.metrics._thread_cpu import thread_cpu_metrics
 from synapse.metrics.background_process_metrics import (
     run_as_background_process as _run_as_background_process,
 )
+from synapse.metrics.thread_cpu import thread_cpu_metrics
 from synapse.module_api.callbacks.account_validity_callbacks import (
     IS_USER_EXPIRED_CALLBACK,
     ON_LEGACY_ADMIN_REQUEST,
diff --git a/tests/metrics/test_thread_cpu.py b/tests/metrics/test_thread_cpu.py
index 6b697e7a11..7d255bf9e7 100644
--- a/tests/metrics/test_thread_cpu.py
+++ b/tests/metrics/test_thread_cpu.py
@@ -16,7 +16,7 @@ import os
 import threading
 import time
 
-from synapse.metrics._thread_cpu import ThreadCPUMetrics
+from synapse.metrics.thread_cpu import ThreadCPUMetrics
 from synapse.util.duration import Duration
 
 from tests import unittest