OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Track DB txn times w/ two counters, not histogram (#13342)

pull/13354/head
David Robertson 2022-07-21 13:23:05 +01:00 committed by GitHub
parent 50122754c8
commit 34949ead1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13342.misc Normal file
View File

@ -0,0 +1 @@
When reporting metrics is enabled, use ~8x less data to describe DB transaction metrics.

8
synapse/storage/database.py
View File

@ -39,7 +39,7 @@ from typing import (
) )
import attr import attr
from prometheus_client import Histogram from prometheus_client import Counter, Histogram
from typing_extensions import Concatenate, Literal, ParamSpec from typing_extensions import Concatenate, Literal, ParamSpec
from twisted.enterprise import adbapi from twisted.enterprise import adbapi
@ -76,7 +76,8 @@ perf_logger = logging.getLogger("synapse.storage.TIME")
sql_scheduling_timer = Histogram("synapse_storage_schedule_time", "sec") sql_scheduling_timer = Histogram("synapse_storage_schedule_time", "sec")
sql_query_timer = Histogram("synapse_storage_query_time", "sec", ["verb"]) sql_query_timer = Histogram("synapse_storage_query_time", "sec", ["verb"])
sql_txn_timer = Histogram("synapse_storage_transaction_time", "sec", ["desc"]) sql_txn_count = Counter("synapse_storage_transaction_time_count", "sec", ["desc"])
sql_txn_duration = Counter("synapse_storage_transaction_time_sum", "sec", ["desc"])
# Unique indexes which have been added in background updates. Maps from table name # Unique indexes which have been added in background updates. Maps from table name
@ -795,7 +796,8 @@ class DatabasePool:
self._current_txn_total_time += duration self._current_txn_total_time += duration
self._txn_perf_counters.update(desc, duration) self._txn_perf_counters.update(desc, duration)
sql_txn_timer.labels(desc).observe(duration) sql_txn_count.labels(desc).inc(1)
sql_txn_duration.labels(desc).inc(duration)
async def runInteraction( async def runInteraction(
self, self,