From 0acb5010eca4a31aad9b3e1537b26c1bb5237c98 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 7 Jun 2021 18:01:32 +0100
Subject: [PATCH] More database opentracing (#10136)
Add a couple of extra logs/spans, to give a bit of a better idea.
---
changelog.d/10136.feature | 1 +
synapse/storage/database.py | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 changelog.d/10136.feature
diff --git a/changelog.d/10136.feature b/changelog.d/10136.feature
new file mode 100644
index 0000000000..2658ab8918
--- /dev/null
+++ b/changelog.d/10136.feature
@@ -0,0 +1 @@
+Report OpenTracing spans for database activity.
diff --git a/synapse/storage/database.py b/synapse/storage/database.py
index 974703d13a..b77368a460 100644
--- a/synapse/storage/database.py
+++ b/synapse/storage/database.py
@@ -541,6 +541,7 @@ class DatabasePool:
},
):
r = func(cursor, *args, **kwargs)
+ opentracing.log_kv({"message": "commit"})
conn.commit()
return r
except self.engine.module.OperationalError as e:
@@ -556,7 +557,8 @@ class DatabasePool:
if i < N:
i += 1
try:
- conn.rollback()
+ with opentracing.start_active_span("db.rollback"):
+ conn.rollback()
except self.engine.module.Error as e1:
transaction_logger.warning("[TXN EROLL] {%s} %s", name, e1)
continue
@@ -569,7 +571,8 @@ class DatabasePool:
if i < N:
i += 1
try:
- conn.rollback()
+ with opentracing.start_active_span("db.rollback"):
+ conn.rollback()
except self.engine.module.Error as e1:
transaction_logger.warning(
"[TXN EROLL] {%s} %s",
--
GitLab