From 142472a00b4b044f53ba55a7f62602e59ff50a5a Mon Sep 17 00:00:00 2001 From: Erica Pisani Date: Tue, 23 Jun 2026 13:16:28 -0400 Subject: [PATCH 1/2] feat(clickhouse_driver): Add db.query.text to streamed query spans When span streaming is enabled, include the query text as a span attribute in the db.query.text field. Update test assertions to verify the attribute is present. Co-Authored-By: Claude Haiku 4.5 --- sentry_sdk/integrations/clickhouse_driver.py | 1 + .../test_clickhouse_driver.py | 21 ++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/sentry_sdk/integrations/clickhouse_driver.py b/sentry_sdk/integrations/clickhouse_driver.py index 730ecf3bf2..e6b3009548 100644 --- a/sentry_sdk/integrations/clickhouse_driver.py +++ b/sentry_sdk/integrations/clickhouse_driver.py @@ -90,6 +90,7 @@ def _inner(*args: "P.args", **kwargs: "P.kwargs") -> "T": attributes={ "sentry.op": OP.DB, "sentry.origin": ClickhouseDriverIntegration.origin, + SPANDATA.DB_QUERY_TEXT: str(query), }, ) else: diff --git a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py index 33b62c7d89..d1388e12d2 100644 --- a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py +++ b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py @@ -234,7 +234,6 @@ def test_clickhouse_client_spans( sentry_init, capture_events, capture_items, - capture_envelopes, span_streaming, ): sentry_init( @@ -278,6 +277,7 @@ def test_clickhouse_client_spans( "db.namespace": "", "db.user": "default", "sentry.op": "db", + "db.query.text": "DROP TABLE IF EXISTS test", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", "server.port": 9000, @@ -293,6 +293,7 @@ def test_clickhouse_client_spans( "db.namespace": "", "db.user": "default", "sentry.op": "db", + "db.query.text": "CREATE TABLE test (x Int32) ENGINE = Memory", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", "server.port": 9000, @@ -308,6 +309,7 @@ def test_clickhouse_client_spans( "db.namespace": "", "db.user": "default", "sentry.op": "db", + "db.query.text": "INSERT INTO test (x) VALUES", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", "server.port": 9000, @@ -323,6 +325,7 @@ def test_clickhouse_client_spans( "db.namespace": "", "db.user": "default", "sentry.op": "db", + "db.query.text": "INSERT INTO test (x) VALUES", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", "server.port": 9000, @@ -338,6 +341,7 @@ def test_clickhouse_client_spans( "db.namespace": "", "db.user": "default", "sentry.op": "db", + "db.query.text": "SELECT sum(x) FROM test WHERE x > %(minv)i", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", "server.port": 9000, @@ -563,6 +567,7 @@ def test_clickhouse_client_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "DROP TABLE IF EXISTS test", "server.address": "localhost", "server.port": 9000, "thread.id": mock.ANY, @@ -577,6 +582,7 @@ def test_clickhouse_client_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "CREATE TABLE test (x Int32) ENGINE = Memory", "server.address": "localhost", "server.port": 9000, "thread.id": mock.ANY, @@ -591,6 +597,7 @@ def test_clickhouse_client_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "INSERT INTO test (x) VALUES", "server.address": "localhost", "server.port": 9000, "thread.id": mock.ANY, @@ -605,6 +612,7 @@ def test_clickhouse_client_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "INSERT INTO test (x) VALUES", "server.address": "localhost", "server.port": 9000, }, @@ -617,6 +625,7 @@ def test_clickhouse_client_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "SELECT sum(x) FROM test WHERE x > %(minv)i", "server.address": "localhost", "server.port": 9000, }, @@ -1012,6 +1021,7 @@ def test_clickhouse_dbapi_spans( "db.driver.name": "clickhouse-driver", "db.namespace": "", "db.user": "default", + "db.query.text": "DROP TABLE IF EXISTS test", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1027,6 +1037,7 @@ def test_clickhouse_dbapi_spans( "db.driver.name": "clickhouse-driver", "db.namespace": "", "db.user": "default", + "db.query.text": "CREATE TABLE test (x Int32) ENGINE = Memory", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1042,6 +1053,7 @@ def test_clickhouse_dbapi_spans( "db.driver.name": "clickhouse-driver", "db.namespace": "", "db.user": "default", + "db.query.text": "INSERT INTO test (x) VALUES", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1057,6 +1069,7 @@ def test_clickhouse_dbapi_spans( "db.driver.name": "clickhouse-driver", "db.namespace": "", "db.user": "default", + "db.query.text": "INSERT INTO test (x) VALUES", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1072,6 +1085,7 @@ def test_clickhouse_dbapi_spans( "db.driver.name": "clickhouse-driver", "db.namespace": "", "db.user": "default", + "db.query.text": "SELECT sum(x) FROM test WHERE x > %(minv)i", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1266,6 +1280,7 @@ def test_clickhouse_dbapi_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "DROP TABLE IF EXISTS test", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1280,6 +1295,7 @@ def test_clickhouse_dbapi_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "CREATE TABLE test (x Int32) ENGINE = Memory", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1294,6 +1310,7 @@ def test_clickhouse_dbapi_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "INSERT INTO test (x) VALUES", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1308,6 +1325,7 @@ def test_clickhouse_dbapi_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "INSERT INTO test (x) VALUES", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1322,6 +1340,7 @@ def test_clickhouse_dbapi_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", + "db.query.text": "SELECT sum(x) FROM test WHERE x > %(minv)i", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", From 34acfc407b01ac01faa8d180549aee75c956440b Mon Sep 17 00:00:00 2001 From: Erica Pisani Date: Tue, 23 Jun 2026 13:29:36 -0400 Subject: [PATCH 2/2] test updates --- .../clickhouse_driver/test_clickhouse_driver.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py index d1388e12d2..57b19badcc 100644 --- a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py +++ b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py @@ -341,7 +341,7 @@ def test_clickhouse_client_spans( "db.namespace": "", "db.user": "default", "sentry.op": "db", - "db.query.text": "SELECT sum(x) FROM test WHERE x > %(minv)i", + "db.query.text": "SELECT sum(x) FROM test WHERE x > 150", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", "server.port": 9000, @@ -625,7 +625,7 @@ def test_clickhouse_client_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", - "db.query.text": "SELECT sum(x) FROM test WHERE x > %(minv)i", + "db.query.text": "SELECT sum(x) FROM test WHERE x > 150", "server.address": "localhost", "server.port": 9000, }, @@ -1085,7 +1085,7 @@ def test_clickhouse_dbapi_spans( "db.driver.name": "clickhouse-driver", "db.namespace": "", "db.user": "default", - "db.query.text": "SELECT sum(x) FROM test WHERE x > %(minv)i", + "db.query.text": "SELECT sum(x) FROM test WHERE x > 150", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost", @@ -1340,7 +1340,7 @@ def test_clickhouse_dbapi_spans_with_pii( "db.system.name": "clickhouse", "db.namespace": "", "db.user": "default", - "db.query.text": "SELECT sum(x) FROM test WHERE x > %(minv)i", + "db.query.text": "SELECT sum(x) FROM test WHERE x > 150", "sentry.op": "db", "sentry.origin": "auto.db.clickhouse_driver", "server.address": "localhost",