fix

Author: sentrivana

sentry_sdk/integrations/clickhouse_driver.py

@@ -136,32 +136,33 @@ def _inner_end(*args: P.args, **kwargs: P.kwargs) -> T:
 
             span.finish()
 
+            try:
+                del connection._sentry_db_data
+                del connection._sentry_span
+            except AttributeError:
+                pass
+
         return res
 
     return _inner_end
 
 
 def _wrap_send_data(f: Callable[P, T]) -> Callable[P, T]:
     def _inner_send_data(*args: P.args, **kwargs: P.kwargs) -> T:
-        instance = args[0]  # type: clickhouse_driver.client.Client
+        connection = args[0].connection
         db_params_data = args[2]
-        span = getattr(instance.connection, "_sentry_span", None)
+        span = getattr(connection, "_sentry_span", None)
 
         if span is not None:
-            data = _get_db_data(instance.connection)
+            data = _get_db_data(connection)
             _set_on_span(span, data)
 
             if should_send_default_pii():
-                db_params = (
-                    getattr(instance.connection, "_sentry_db_data", {}).get("db.params")
-                    or []
-                )
+                saved_db_data = getattr(connection, "_sentry_db_data", {})
+                db_params = saved_db_data.get("db.params") or []
                 db_params.extend(db_params_data)
+                saved_db_data["db.params"] = db_params
                 span.set_attribute("db.params", _serialize_span_attribute(db_params))
-                try:
-                    del instance.connection._sentry_db_data
-                except AttributeError:
-                    pass
 
         return f(*args, **kwargs)
 

tests/integrations/clickhouse_driver/test_clickhouse_driver.py

@@ -168,7 +168,7 @@ def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) ->
                 "db.user": "default",
                 "server.address": "localhost",
                 "server.port": 9000,
-                "db.params": '[{"x": 100}]',
+                "db.params": [{"x": 100}],
             },
             "message": "INSERT INTO test (x) VALUES",
             "type": "default",
@@ -181,7 +181,7 @@ def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) ->
                 "db.user": "default",
                 "server.address": "localhost",
                 "server.port": 9000,
-                "db.params": "[[170], [200]]",
+                "db.params": [[170], [200]],
             },
             "message": "INSERT INTO test (x) VALUES",
             "type": "default",
@@ -195,7 +195,7 @@ def test_clickhouse_client_breadcrumbs_with_pii(sentry_init, capture_events) ->
                 "server.address": "localhost",
                 "server.port": 9000,
                 "db.result": "[[370]]",
-                "db.params": '{"minv": 150}',
+                "db.params": {"minv": 150},
             },
             "message": "SELECT sum(x) FROM test WHERE x > 150",
             "type": "default",
@@ -348,9 +348,7 @@ def test_clickhouse_client_spans(
     assert event["spans"] == expected_spans
 
 
-def test_clickhouse_client_spans_with_pii(
-    sentry_init, capture_events, capture_envelopes
-) -> None:
+def test_clickhouse_client_spans_with_pii(sentry_init, capture_events) -> None:
     sentry_init(
         integrations=[ClickhouseDriverIntegration()],
         _experiments={"record_sql_params": True},
@@ -646,7 +644,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
                 "db.user": "default",
                 "server.address": "localhost",
                 "server.port": 9000,
-                "db.params": '[{"x": 100}]',
+                "db.params": [{"x": 100}],
             },
             "message": "INSERT INTO test (x) VALUES",
             "type": "default",
@@ -659,7 +657,7 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
                 "db.user": "default",
                 "server.address": "localhost",
                 "server.port": 9000,
-                "db.params": "[[170], [200]]",
+                "db.params": [[170], [200]],
             },
             "message": "INSERT INTO test (x) VALUES",
             "type": "default",
@@ -672,8 +670,8 @@ def test_clickhouse_dbapi_breadcrumbs_with_pii(sentry_init, capture_events) -> N
                 "db.user": "default",
                 "server.address": "localhost",
                 "server.port": 9000,
-                "db.params": '{"minv": 150}',
-                "db.result": '[[["370"]], [["\'sum(x)\'", "\'Int64\'"]]]',
+                "db.params": {"minv": 150},
+                "db.result": '[[[370]], [["sum(x)", "Int64"]]]',
             },
             "message": "SELECT sum(x) FROM test WHERE x > 150",
             "type": "default",