more fixes

Author: sentrivana

MIGRATION_GUIDE.md

@@ -18,6 +18,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 - A `Profile` object does not have a `.hub` property anymore.
 - `sentry_sdk.continue_trace` no longer returns a `Transaction` and is now a context manager.
 - Redis integration: In Redis pipeline spans there is no `span["data"]["redis.commands"]` that contains a dict `{"count": 3, "first_ten": ["cmd1", "cmd2", ...]}` but instead `span["data"]["redis.commands.count"]` (containing `3`) and `span["data"]["redis.commands.first_ten"]` (containing `["cmd1", "cmd2", ...]`).
+- clickhouse-driver integration: The query is now available under the `db.query.text` span attribute (only if `send_default_pii` is `True`).
 
 ### Removed
 

sentry_sdk/integrations/clickhouse_driver.py

@@ -91,13 +91,14 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> T:
 
         _set_db_data(span, connection)
 
-        span.set_data("db.query.text", query)
+        if should_send_default_pii():
+            span.set_data("db.query.text", query)
 
         if query_id:
             span.set_data("db.query_id", query_id)
 
         if params and should_send_default_pii():
-            span.set_data("db.params", params)
+            span.set_data("db.params", str(params))
 
         # run the original code
         ret = f(*args, **kwargs)
@@ -115,24 +116,24 @@ def _inner_end(*args: P.args, **kwargs: P.kwargs) -> T:
 
         if span is not None:
             if res is not None and should_send_default_pii():
-                span.set_data("db.result", res)
+                span.set_data("db.result", str(res))
 
             with capture_internal_exceptions():
                 query = span.get_attribute("db.query.text")
-                data = {}
-                for attr in (
-                    "db.query_id",
-                    "db.params",
-                    "db.result",
-                    "db.system",
-                    "db.user",
-                    "server.address",
-                    "server.port",
-                ):
-                    if span.get_attribute(attr):
-                        data[attr] = span.get_attribute(attr)
-
                 if query:
+                    data = {}
+                    for attr in (
+                        "db.query_id",
+                        "db.params",
+                        "db.result",
+                        "db.system",
+                        "db.user",
+                        "server.address",
+                        "server.port",
+                    ):
+                        if span.get_attribute(attr):
+                            data[attr] = span.get_attribute(attr)
+
                     sentry_sdk.add_breadcrumb(
                         message=query, category="query", data=data
                     )