diff --git a/sentry_sdk/integrations/clickhouse_driver.py b/sentry_sdk/integrations/clickhouse_driver.py index b2e440a50f..576c6fadd6 100644 --- a/sentry_sdk/integrations/clickhouse_driver.py +++ b/sentry_sdk/integrations/clickhouse_driver.py @@ -161,7 +161,7 @@ def _inner_end(*args: "P.args", **kwargs: "P.kwargs") -> "T": sentry_sdk.get_isolation_scope().add_breadcrumb( message=query, category="query", - data={"db.result": res, **breadcrumb_data}, + data=breadcrumb_data, ) span = getattr(instance.connection, "_sentry_span", None) diff --git a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py index b6d45a2365..8a82f903c1 100644 --- a/tests/integrations/clickhouse_driver/test_clickhouse_driver.py +++ b/tests/integrations/clickhouse_driver/test_clickhouse_driver.py @@ -373,6 +373,7 @@ def test_clickhouse_client_breadcrumbs_with_pii_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [], }, "message": "DROP TABLE IF EXISTS test", "type": "default", @@ -386,6 +387,7 @@ def test_clickhouse_client_breadcrumbs_with_pii_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [], }, "message": "CREATE TABLE test (x Int32) ENGINE = Memory", "type": "default", @@ -425,6 +427,7 @@ def test_clickhouse_client_breadcrumbs_with_pii_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [[370]], }, "message": "SELECT sum(x) FROM test WHERE x > 150", "type": "default", @@ -576,6 +579,7 @@ def test_clickhouse_client_breadcrumbs_with_data_collection_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [], }, "message": "DROP TABLE IF EXISTS test", "type": "default", @@ -589,6 +593,7 @@ def test_clickhouse_client_breadcrumbs_with_data_collection_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [], }, "message": "CREATE TABLE test (x Int32) ENGINE = Memory", "type": "default", @@ -628,6 +633,7 @@ def test_clickhouse_client_breadcrumbs_with_data_collection_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [[370]], }, "message": "SELECT sum(x) FROM test WHERE x > 150", "type": "default", @@ -1179,6 +1185,7 @@ def test_clickhouse_client_breadcrumbs_with_data_collection_default_span_streami "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [], }, "message": "DROP TABLE IF EXISTS test", "type": "default", @@ -1192,6 +1199,7 @@ def test_clickhouse_client_breadcrumbs_with_data_collection_default_span_streami "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [], }, "message": "CREATE TABLE test (x Int32) ENGINE = Memory", "type": "default", @@ -1231,6 +1239,7 @@ def test_clickhouse_client_breadcrumbs_with_data_collection_default_span_streami "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [[370]], }, "message": "SELECT sum(x) FROM test WHERE x > 150", "type": "default", @@ -2289,6 +2298,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [[], []], }, "message": "DROP TABLE IF EXISTS test", "type": "default", @@ -2302,6 +2312,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [[], []], }, "message": "CREATE TABLE test (x Int32) ENGINE = Memory", "type": "default", @@ -2341,6 +2352,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii_span_streaming( "db.user": "default", "server.address": "localhost", "server.port": 9000, + "db.result": [[["370"]], [["'sum(x)'", "'Int64'"]]], }, "message": "SELECT sum(x) FROM test WHERE x > 150", "type": "default",