Register the media threadpool with our metrics (#17566)

anoadragon453 · web-flow · commit fae75b03765d · 2024-08-14T15:11:22.000+01:00
diff --git a/changelog.d/17566.misc b/changelog.d/17566.misc
@@ -0,0 +1 @@
+Speed up responding to media requests.
diff --git a/synapse/server.py b/synapse/server.py
@@ -124,6 +124,7 @@
 )
 from synapse.http.matrixfederationclient import MatrixFederationHttpClient
 from synapse.media.media_repository import MediaRepository
+from synapse.metrics import register_threadpool
 from synapse.metrics.common_usage_metrics import CommonUsageMetricsManager
 from synapse.module_api import ModuleApi
 from synapse.module_api.callbacks import ModuleApiCallbacks
@@ -959,4 +960,7 @@ def get_media_sender_thread_pool(self) -> ThreadPool:
             "during", "shutdown", media_threadpool.stop
         )
 
+        # Register the threadpool with our metrics.
+        register_threadpool("media", media_threadpool)
+
         return media_threadpool

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@`
`124`	`124`	`)`
`125`	`125`	`from synapse.http.matrixfederationclient import MatrixFederationHttpClient`
`126`	`126`	`from synapse.media.media_repository import MediaRepository`
	`127`	`+from synapse.metrics import register_threadpool`
`127`	`128`	`from synapse.metrics.common_usage_metrics import CommonUsageMetricsManager`
`128`	`129`	`from synapse.module_api import ModuleApi`
`129`	`130`	`from synapse.module_api.callbacks import ModuleApiCallbacks`
`@@ -959,4 +960,7 @@ def get_media_sender_thread_pool(self) -> ThreadPool:`
`959`	`960`	`"during", "shutdown", media_threadpool.stop`
`960`	`961`	`)`
`961`	`962`
	`963`	`+ # Register the threadpool with our metrics.`
	`964`	`+ register_threadpool("media", media_threadpool)`
	`965`	`+`
`962`	`966`	`return media_threadpool`