sentry-sdk 2.69.1__tar.gz → 2.69.2__tar.gz

{sentry_sdk-2.69.1/sentry_sdk.egg-info → sentry_sdk-2.69.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-sdk
-Version: 2.69.1
+Version: 2.69.2
 Summary: Python client for Sentry (https://sentry.io)
 Home-page: https://github.com/getsentry/sentry-python
 Author: Sentry Team and Contributors

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/client.py

@@ -42,7 +42,8 @@ from sentry_sdk.scrubber import EventScrubber
 from sentry_sdk.serializer import serialize
 from sentry_sdk.sessions import SessionFlusher
 from sentry_sdk.traces import SpanStatus, StreamedSpan
-from sentry_sdk.tracing import trace
+from sentry_sdk.traces import trace as streaming_trace
+from sentry_sdk.tracing import trace as legacy_trace
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.transport import (
     AsyncHttpTransport,
@@ -533,8 +534,14 @@ class _Client(BaseClient):
         self, functions_to_trace: "Sequence[Dict[str, str]]"
     ) -> None:
         """
-        Instruments the functions given in the list `functions_to_trace` with the `@sentry_sdk.tracing.trace` decorator.
+        Instruments the functions given in the list `functions_to_trace` with a trace decorator.
         """
+        trace = (
+            streaming_trace
+            if has_span_streaming_enabled(self.options)
+            else legacy_trace
+        )
+
         for function in functions_to_trace:
             class_name = None
             function_qualname = function["qualified_name"]
@@ -776,6 +783,7 @@ class _Client(BaseClient):
             event["timestamp"] = datetime.now(timezone.utc)
 
         is_transaction = event.get("type") == "transaction"
+        is_checkin = event.get("type") == "check_in"
 
         if scope is not None:
             spans_before = len(cast(List[Dict[str, object]], event.get("spans", [])))
@@ -830,6 +838,7 @@ class _Client(BaseClient):
 
         if (
             not is_transaction
+            and not is_checkin
             and self.options["attach_stacktrace"]
             and "exception" not in event
             and "stacktrace" not in event

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/consts.py

@@ -1337,7 +1337,7 @@ class ClientConstructor:
         profile_lifecycle: 'Literal["manual", "trace"]' = "manual",
         profile_session_sample_rate: "Optional[float]" = None,
         auto_enabling_integrations: bool = True,
-        disabled_integrations: "Optional[Sequence[sentry_sdk.integrations.Integration]]" = None,
+        disabled_integrations: "Optional[Sequence[Union[sentry_sdk.integrations.Integration, type[sentry_sdk.integrations.Integration]]]]" = None,
         auto_session_tracking: bool = True,
         send_client_reports: bool = True,
         _experiments: "Experiments" = {},  # noqa: B006
@@ -1848,4 +1848,4 @@ DEFAULT_OPTIONS = _get_default_options()
 del _get_default_options
 
 
-VERSION = "2.69.1"
+VERSION = "2.69.2"

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/integrations/aws_lambda.py

@@ -45,6 +45,27 @@ TIMEOUT_WARNING_BUFFER = 1500  # Buffer time required to send timeout warning to
 MILLIS_TO_SECONDS = 1000.0
 
 
+def _get_user_from_event(aws_event: "dict[str, Any]") -> "dict[str, Any]":
+    if not isinstance(aws_event, dict):
+        return {}
+
+    identity = aws_event.get("requestContext", {}).get("identity")
+    if identity is None:
+        return {}
+
+    user_info: "dict[str, Any]" = {}
+
+    user_arn = identity.get("userArn")
+    if user_arn is not None:
+        user_info["id"] = user_arn
+
+    ip = identity.get("sourceIp")
+    if ip is not None:
+        user_info["ip_address"] = ip
+
+    return user_info
+
+
 def _wrap_init_error(init_error: "F") -> "F":
     @ensure_integration_enabled(AwsLambdaIntegration, init_error)
     def sentry_init_error(*args: "Any", **kwargs: "Any") -> "Any":
@@ -181,6 +202,17 @@ def _wrap_handler(handler: "F") -> "F":
                     elif should_send_default_pii():
                         additional_attributes["url.query"] = urlencode(qs)
 
+            if not scope._user:
+                if has_data_collection_enabled(client.options):
+                    if client.options["data_collection"]["user_info"]:
+                        user_info = _get_user_from_event(request_data)
+                        if user_info:
+                            scope.set_user(user_info)
+                elif should_send_default_pii():
+                    user_info = _get_user_from_event(request_data)
+                    if user_info:
+                        scope.set_user(user_info)
+
             sampling_context = {
                 "aws_event": aws_event,
                 "aws_context": aws_context,
@@ -440,38 +472,22 @@ def _make_request_event_processor(
         client_options = sentry_sdk.get_client().options
         if has_data_collection_enabled(client_options):
             if client_options["data_collection"]["user_info"]:
-                user_info = sentry_event.setdefault("user", {})
-
-                identity = aws_event.get("requestContext", {}).get("identity")
-                if identity is None:
-                    identity = {}
-
-                id = identity.get("userArn")
-                if id is not None:
-                    user_info.setdefault("id", id)
-
-                ip = identity.get("sourceIp")
-                if ip is not None:
-                    user_info.setdefault("ip_address", ip)
+                extracted_user = _get_user_from_event(aws_event)
+                if extracted_user:
+                    user_info = sentry_event.setdefault("user", {})
+                    for key, value in extracted_user.items():
+                        user_info.setdefault(key, value)
 
             if "incoming_request" in client_options["data_collection"]["http_bodies"]:
                 if "body" in aws_event:
                     request["data"] = aws_event.get("body", "")
 
         elif should_send_default_pii():
-            user_info = sentry_event.setdefault("user", {})
-
-            identity = aws_event.get("requestContext", {}).get("identity")
-            if identity is None:
-                identity = {}
-
-            id = identity.get("userArn")
-            if id is not None:
-                user_info.setdefault("id", id)
-
-            ip = identity.get("sourceIp")
-            if ip is not None:
-                user_info.setdefault("ip_address", ip)
+            extracted_user = _get_user_from_event(aws_event)
+            if extracted_user:
+                user_info = sentry_event.setdefault("user", {})
+                for key, value in extracted_user.items():
+                    user_info.setdefault(key, value)
 
             if "body" in aws_event:
                 request["data"] = aws_event.get("body", "")

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/integrations/bottle.py

@@ -75,6 +75,19 @@ class BottleIntegration(Integration):
         version = parse_version(BOTTLE_VERSION)
         _check_minimum_version(BottleIntegration, version)
 
+        # Bottle's Route.__repr__ might lead to a never-terminating while True
+        # loop when attach_stacktrace=True.
+        def _sentry_route_repr(self: "Route") -> str:
+            cb = self.callback
+            return "<%s %s -> %s:%s>" % (
+                self.method,
+                self.rule,
+                getattr(cb, "__module__", "?"),
+                getattr(cb, "__name__", "?"),
+            )
+
+        Route.__sentry_repr__ = _sentry_route_repr
+
         old_app = Bottle.__call__
 
         @ensure_integration_enabled(BottleIntegration, old_app)

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/integrations/clickhouse_driver.py

@@ -161,7 +161,7 @@ def _wrap_end(f: "Callable[P, T]") -> "Callable[P, 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)

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/integrations/google_genai/utils.py

@@ -608,7 +608,7 @@ def extract_tool_calls(
 
     # Extract from candidates, sometimes tool calls are nested under the content.parts object
     candidates = getattr(response, "candidates", [])
-    if response is not None:
+    if candidates and response is not None:
         for candidate in candidates:
             if not hasattr(candidate, "content") or not getattr(
                 candidate.content, "parts", []

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/integrations/pydantic_ai/patches/tools.py

@@ -1,4 +1,5 @@
 import sys
+from contextlib import nullcontext
 from functools import wraps
 from typing import TYPE_CHECKING
 
@@ -60,11 +61,15 @@ def _patch_execute_tool_call() -> None:
             # Create execute_tool span
             # Nesting is handled by isolation_scope() to ensure proper parent-child relationships
             with sentry_sdk.isolation_scope():
-                with execute_tool_span(
-                    name,
-                    args_dict,
-                    agent,
-                    tool_definition=selected_tool_definition,
+                with (
+                    execute_tool_span(
+                        name,
+                        args_dict,
+                        agent,
+                        tool_definition=selected_tool_definition,
+                    )
+                    if validated.args_valid
+                    else nullcontext()
                 ) as span:
                     try:
                         result = await original_execute_tool_call(
@@ -73,7 +78,8 @@ def _patch_execute_tool_call() -> None:
                             *args,
                             **kwargs,
                         )
-                        update_execute_tool_span(span, result)
+                        if span is not None:
+                            update_execute_tool_span(span, result)
                         return result
                     except ToolRetryError as exc:
                         exc_info = sys.exc_info()

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/serializer.py

@@ -43,8 +43,8 @@ MAX_EVENT_BYTES = 10**6
 
 # Maximum depth and breadth of databags. Excess data will be trimmed. If
 # max_request_body_size is "always", request bodies won't be trimmed.
-MAX_DATABAG_DEPTH = 5
-MAX_DATABAG_BREADTH = 10
+MAX_DATABAG_DEPTH: int = 5
+MAX_DATABAG_BREADTH: int = 10
 CYCLE_MARKER = "<cyclic>"
 
 

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/traces.py

@@ -1,10 +1,21 @@
 """
-EXPERIMENTAL. Do not use in production.
+The API in this file is only meant to be used in span streaming mode. It should
+not be mixed with the legacy tracing API (sentry_sdk.start_transaction,
+sentry_sdk.start_span, etc.).
 
-The API in this file is only meant to be used in span streaming mode.
+You can enable span streaming mode via:
 
-You can enable span streaming mode via
-sentry_sdk.init(trace_lifecycle="stream").
+```
+import sentry_sdk
+
+sentry_sdk.init(
+    trace_lifecycle="stream",
+)
+```
+
+See
+https://docs.sentry.io/platforms/python/tracing/streamed-spans/migration-guide/
+for how to migrate to span streaming.
 """
 
 import sys
@@ -110,10 +121,7 @@ def start_span(
     active: bool = True,
 ) -> "StreamedSpan":
     """
-    Start a span.
-
-    EXPERIMENTAL. Use sentry_sdk.start_transaction() and sentry_sdk.start_span()
-    instead.
+    Start a span in streaming mode.
 
     The span's parent, unless provided explicitly via the `parent_span` argument,
     will be the current active span, if any. If there is none, this span will
@@ -185,9 +193,7 @@ def start_span(
 
 def continue_trace(incoming: "dict[str, Any]") -> None:
     """
-    Continue a trace from headers or environment variables.
-
-    EXPERIMENTAL. Use sentry_sdk.continue_trace() instead.
+    Continue a trace from headers or environment variables in streaming mode.
 
     This function sets the propagation context on the scope. Any span started
     in the updated scope will belong under the trace extracted from the
@@ -211,9 +217,7 @@ def continue_trace(incoming: "dict[str, Any]") -> None:
 
 def new_trace() -> None:
     """
-    Resets the propagation context, forcing a new trace.
-
-    EXPERIMENTAL.
+    Resets the propagation context, forcing a new trace, in streaming mode.
 
     This function sets the propagation context on the scope. Any span started
     in the updated scope will start its own trace.
@@ -811,9 +815,7 @@ def trace(
     active: bool = True,
 ) -> "Union[Callable[P, R], Callable[[Callable[P, R]], Callable[P, R]]]":
     """
-    Decorator to start a span around a function call.
-
-    EXPERIMENTAL. Use @sentry_sdk.trace instead.
+    Decorator to start a span around a function call in streaming mode.
 
     This decorator automatically creates a new span when the decorated function
     is called, and finishes the span when the function returns or raises an exception.

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk/utils.py

@@ -1,4 +1,3 @@
-import base64
 import copy
 import json
 import linecache
@@ -85,8 +84,6 @@ logger = logging.getLogger("sentry_sdk.errors")
 
 _installed_modules = None
 
-BASE64_ALPHABET = re.compile(r"^[a-zA-Z0-9/+=]*$")
-
 FALSY_ENV_VALUES = frozenset(("false", "f", "n", "no", "off", "0"))
 TRUTHY_ENV_VALUES = frozenset(("true", "t", "y", "yes", "on", "1"))
 _AWS_SIGV4_SIGNING_ALGORITHMS = frozenset(
@@ -1620,43 +1617,6 @@ class TimeoutThread(threading.Thread):
         )
 
 
-def to_base64(original: str) -> "Optional[str]":
-    """
-    Convert a string to base64, via UTF-8. Returns None on invalid input.
-    """
-    base64_string = None
-
-    try:
-        utf8_bytes = original.encode("UTF-8")
-        base64_bytes = base64.b64encode(utf8_bytes)
-        base64_string = base64_bytes.decode("UTF-8")
-    except Exception as err:
-        logger.warning("Unable to encode {orig} to base64:".format(orig=original), err)
-
-    return base64_string
-
-
-def from_base64(base64_string: str) -> "Optional[str]":
-    """
-    Convert a string from base64, via UTF-8. Returns None on invalid input.
-    """
-    utf8_string = None
-
-    try:
-        only_valid_chars = BASE64_ALPHABET.match(base64_string)
-        assert only_valid_chars
-
-        base64_bytes = base64_string.encode("UTF-8")
-        utf8_bytes = base64.b64decode(base64_bytes)
-        utf8_string = utf8_bytes.decode("UTF-8")
-    except Exception as err:
-        logger.warning(
-            "Unable to decode {b64} from base64:".format(b64=base64_string), err
-        )
-
-    return utf8_string
-
-
 Components = namedtuple("Components", ["scheme", "netloc", "path", "query", "fragment"])
 
 

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2/sentry_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-sdk
-Version: 2.69.1
+Version: 2.69.2
 Summary: Python client for Sentry (https://sentry.io)
 Home-page: https://github.com/getsentry/sentry-python
 Author: Sentry Team and Contributors

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/sentry_sdk.egg-info/SOURCES.txt

@@ -297,6 +297,8 @@ tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStre
 tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreaming/index.py
 tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollection/.gitignore
 tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollection/index.py
+tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOff/index.py
+tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOn/index.py
 tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingPii/.gitignore
 tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingPii/index.py
 tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/RaiseErrorPerformanceDisabled/.gitignore

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/setup.py

@@ -22,7 +22,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.69.1",
+    version="2.69.2",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

sentry_sdk-2.69.2/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOff/index.py

@@ -0,0 +1,20 @@
+import os
+
+import sentry_sdk
+from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
+
+sentry_sdk.init(
+    dsn=os.environ.get("SENTRY_DSN"),
+    traces_sample_rate=1.0,
+    integrations=[AwsLambdaIntegration()],
+    trace_lifecycle="stream",
+    _experiments={
+        "data_collection": {
+            "user_info": False,
+        }
+    },
+)
+
+
+def handler(event, context):
+    return {"event": event}

sentry_sdk-2.69.2/tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/BasicOkSpanStreamingDataCollectionUserInfoOn/index.py

@@ -0,0 +1,20 @@
+import os
+
+import sentry_sdk
+from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
+
+sentry_sdk.init(
+    dsn=os.environ.get("SENTRY_DSN"),
+    traces_sample_rate=1.0,
+    integrations=[AwsLambdaIntegration()],
+    trace_lifecycle="stream",
+    _experiments={
+        "data_collection": {
+            "user_info": True,
+        }
+    },
+)
+
+
+def handler(event, context):
+    return {"event": event}

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/tests/integrations/aws_lambda/test_aws_lambda.py

@@ -1144,6 +1144,80 @@ def test_span_streaming_url_query_params_with_data_collection(
     )
 
 
+def test_span_streaming_user_info_with_send_default_pii(
+    lambda_client, test_environment
+):
+    payload = b"""
+        {
+          "resource": "/asd",
+          "path": "/asd",
+          "httpMethod": "GET",
+          "headers": {
+            "Host": "iwsz2c7uwi.execute-api.us-east-1.amazonaws.com",
+            "User-Agent": "custom",
+            "X-Forwarded-Proto": "https"
+          },
+          "queryStringParameters": {
+            "bonkers": "true"
+          },
+          "pathParameters": null,
+          "stageVariables": null,
+          "requestContext": {
+            "identity": {
+                "sourceIp": "213.47.147.207",
+                "userArn": "42"
+            }
+          },
+          "body": null,
+          "isBase64Encoded": false
+        }
+    """
+
+    lambda_client.invoke(
+        FunctionName="BasicOkSpanStreamingPii",
+        Payload=payload,
+    )
+    span_items = test_environment["server"].span_items
+
+    segment_spans = [s for s in span_items if s.get("is_segment")]
+    assert len(segment_spans) == 1
+    attrs = segment_spans[0]["attributes"]
+
+    assert _get_span_attr(attrs, "user.id") == "42"
+
+
+def test_span_streaming_user_info_with_data_collection_user_info_on(
+    lambda_client, test_environment
+):
+    lambda_client.invoke(
+        FunctionName="BasicOkSpanStreamingDataCollectionUserInfoOn",
+        Payload=USER_INFO_PAYLOAD,
+    )
+    span_items = test_environment["server"].span_items
+
+    segment_spans = [s for s in span_items if s.get("is_segment")]
+    assert len(segment_spans) == 1
+    attrs = segment_spans[0]["attributes"]
+
+    assert _get_span_attr(attrs, "user.id") == "42"
+
+
+def test_span_streaming_user_info_with_data_collection_user_info_off(
+    lambda_client, test_environment
+):
+    lambda_client.invoke(
+        FunctionName="BasicOkSpanStreamingDataCollectionUserInfoOff",
+        Payload=USER_INFO_PAYLOAD,
+    )
+    span_items = test_environment["server"].span_items
+
+    segment_spans = [s for s in span_items if s.get("is_segment")]
+    assert len(segment_spans) == 1
+    attrs = segment_spans[0]["attributes"]
+
+    assert "user.id" not in attrs
+
+
 @pytest.mark.parametrize(
     "lambda_function_name",
     ["RaiseErrorPerformanceEnabled", "RaiseErrorPerformanceDisabled"],

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/tests/integrations/bottle/test_bottle.py

@@ -166,6 +166,39 @@ def test_large_json_request(
         assert len(event["request"]["data"]["foo"]["bar"]) == 1034
 
 
+def test_attach_stacktrace_doesnt_hang(sentry_init, capture_events, app, get_client):
+    sentry_init(
+        integrations=[BottleIntegration()],
+        max_request_body_size="always",
+        attach_stacktrace=True,
+    )
+
+    data = {"foo": {"bar": "a" * (1024)}}
+
+    @app.route("/", method="POST")
+    def index():
+        import bottle
+
+        assert bottle.request.json == data
+        assert bottle.request.body.read() == json.dumps(data).encode("ascii")
+        capture_message("hi")
+        return "ok"
+
+    events = capture_events()
+
+    client = get_client()
+    response = client.get("/")
+
+    response = client.post("/", content_type="application/json", data=json.dumps(data))
+    assert response[1] == "200 OK"
+
+    (event,) = events
+
+    # As long as this test finishes, we're good. It's just making sure we don't
+    # hang.
+    assert event["request"]["data"]
+
+
 @pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
 def test_empty_json_request(sentry_init, capture_events, app, data, get_client):
     sentry_init(integrations=[BottleIntegration()])

{sentry_sdk-2.69.1 → sentry_sdk-2.69.2}/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",