more stuff

Author: sentrivana

sentry_sdk/integrations/asyncpg.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 import contextlib
-import json
 from typing import Any, TypeVar, Callable, Awaitable, Iterator
 
 import sentry_sdk
@@ -9,6 +8,7 @@
 from sentry_sdk.tracing import Span
 from sentry_sdk.tracing_utils import add_query_source, record_sql_queries
 from sentry_sdk.utils import (
+    _serialize_span_attribute,
     ensure_integration_enabled,
     parse_version,
     capture_internal_exceptions,
@@ -148,7 +148,7 @@ def _inner(*args: Any, **kwargs: Any) -> T:  # noqa: N807
         ) as span:
             _set_db_data(span, args[0])
             res = f(*args, **kwargs)
-            span.set_attribute("db.cursor", json.dumps(res))
+            span.set_attribute("db.cursor", _serialize_span_attribute(res))
 
         return res
 

sentry_sdk/integrations/clickhouse_driver.py

@@ -1,11 +1,13 @@
-import json
-
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.tracing import Span
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.utils import capture_internal_exceptions, ensure_integration_enabled
+from sentry_sdk.utils import (
+    _serialize_span_attribute,
+    capture_internal_exceptions,
+    ensure_integration_enabled,
+)
 
 from typing import TYPE_CHECKING, TypeVar
 
@@ -101,7 +103,7 @@ def _inner(*args: P.args, **kwargs: P.kwargs) -> T:
 
         if params and should_send_default_pii():
             connection._sentry_db_params = params
-            span.set_attribute("db.params", json.dumps(params))
+            span.set_attribute("db.params", _serialize_span_attribute(params))
 
         # run the original code
         ret = f(*args, **kwargs)
@@ -119,7 +121,7 @@ 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_attribute("db.result", json.dumps(res))
+                span.set_attribute("db.result", _serialize_span_attribute(res))
 
             with capture_internal_exceptions():
                 query = span.get_attribute("db.query.text")
@@ -161,7 +163,7 @@ def _inner_send_data(*args: P.args, **kwargs: P.kwargs) -> T:
                     getattr(instance.connection, "_sentry_db_params", None) or []
                 )
                 db_params.extend(data)
-                span.set_attribute("db.params", json.dumps(db_params))
+                span.set_attribute("db.params", _serialize_span_attribute(db_params))
                 try:
                     del instance.connection._sentry_db_params
                 except AttributeError:

sentry_sdk/tracing_utils.py

@@ -1,6 +1,5 @@
 import contextlib
 import inspect
-import json
 import os
 import re
 import sys
@@ -24,6 +23,7 @@
     _is_external_source,
     _is_in_project_root,
     _module_in_list,
+    _serialize_span_attribute,
 )
 
 from typing import TYPE_CHECKING
@@ -134,13 +134,13 @@ def record_sql_queries(
 
     data = {}
     if params_list is not None:
-        data["db.params"] = json.dumps(params_list)
+        data["db.params"] = _serialize_span_attribute(params_list)
     if paramstyle is not None:
-        data["db.paramstyle"] = json.dumps(paramstyle)
+        data["db.paramstyle"] = _serialize_span_attribute(paramstyle)
     if executemany:
         data["db.executemany"] = True
     if record_cursor_repr and cursor is not None:
-        data["db.cursor"] = json.dumps(cursor)
+        data["db.cursor"] = _serialize_span_attribute(cursor)
 
     with capture_internal_exceptions():
         sentry_sdk.add_breadcrumb(message=query, category="query", data=data)

sentry_sdk/utils.py

@@ -1843,10 +1843,10 @@ def _serialize_span_attribute(value):
         return value
 
     # lists are allowed too, as long as they don't mix types
-    if isinstance(value, list):
+    if isinstance(value, (list, tuple)):
         for type_ in (int, str, float, bool):
             if all(isinstance(item, type_) for item in value):
-                return value
+                return list(value)
 
     # if this is anything else, just try to coerce to string
     # we prefer json.dumps since this makes things like dictionaries display

tests/test_utils.py

@@ -30,6 +30,7 @@
     _get_installed_modules,
     _generate_installed_modules,
     ensure_integration_enabled,
+    _serialize_span_attribute,
 )
 
 
@@ -901,3 +902,28 @@ def test_format_timestamp_naive():
     # Ensure that some timestamp is returned, without error. We currently treat these as local time, but this is an
     # implementation detail which we should not assert here.
     assert re.fullmatch(timestamp_regex, format_timestamp(datetime_object))
+
+
+@pytest.mark.parametrize(
+    ("value", "result"),
+    (
+        ("meow", "meow"),
+        (1, 1),
+        (47.0, 47.0),
+        (True, True),
+        (["meow", "bark"], ["meow", "bark"]),
+        ([True, False], [True, False]),
+        ([1, 2, 3], [1, 2, 3]),
+        ([46.5, 47.0, 47.5], [46.5, 47.0, 47.5]),
+        (["meow", 47], '["meow", 47]'),  # mixed types not allowed in a list
+        (None, "null"),
+        (
+            {"cat": "meow", "dog": ["bark", "woof"]},
+            '{"cat": "meow", "dog": ["bark", "woof"]}',
+        ),
+        (datetime(2024, 1, 1), "2024-01-01 00:00:00"),
+        (("meow", "purr"), ["meow", "purr"]),
+    ),
+)
+def test_serialize_span_attribute(value, result):
+    assert _serialize_span_attribute(value) == result