consistent serialization

Author: sentrivana

sentry_sdk/integrations/clickhouse_driver.py

@@ -123,9 +123,8 @@ def _inner_end(*args: P.args, **kwargs: P.kwargs) -> T:
             data = getattr(connection, "_sentry_db_data", {})
 
             if res is not None and should_send_default_pii():
-                serialized_result = _serialize_span_attribute(res)
-                data["db.result"] = serialized_result
-                span.set_attribute("db.result", serialized_result)
+                data["db.result"] = res
+                span.set_attribute("db.result", _serialize_span_attribute(res))
 
             with capture_internal_exceptions():
                 query = data.pop("db.query.text", None)

tests/integrations/clickhouse_driver/test_clickhouse_driver.py

@@ -194,7 +194,7 @@ def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) ->
                 "db.user": "default",
                 "server.address": "localhost",
                 "server.port": 9000,
-                "db.result": "[[370]]",
+                "db.result": [[370]],
                 "db.params": {"minv": 150},
             },
             "message": "SELECT sum(x) FROM test WHERE x > 150",
@@ -618,7 +618,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
                 "db.user": "default",
                 "server.address": "localhost",
                 "server.port": 9000,
-                "db.result": "[[], []]",
+                "db.result": [[], []],
             },
             "message": "DROP TABLE IF EXISTS test",
             "type": "default",
@@ -631,7 +631,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
                 "db.user": "default",
                 "server.address": "localhost",
                 "server.port": 9000,
-                "db.result": "[[], []]",
+                "db.result": [[], []],
             },
             "message": "CREATE TABLE test (x Int32) ENGINE = Memory",
             "type": "default",
@@ -671,7 +671,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
                 "server.address": "localhost",
                 "server.port": 9000,
                 "db.params": {"minv": 150},
-                "db.result": '[[[370]], [["sum(x)", "Int64"]]]',
+                "db.result": [[["370"]], [["'sum(x)'", "'Int64'"]]],
             },
             "message": "SELECT sum(x) FROM test WHERE x > 150",
             "type": "default",