From f294b9ea205236140a954816d43eacc420ecca59 Mon Sep 17 00:00:00 2001
From: Erica Pisani <hey@ericapisani.dev>
Date: Mon, 10 Aug 2026 14:58:44 -0400
Subject: [PATCH 1/2] test(django): Drop span_streaming parametrize where the
 arm is inert

These tests are event-only: they capture events, never spans, and the
span_streaming argument was only ever fed to trace_lifecycle. Both arms
therefore exercised identical code paths and asserted identical payloads,
so the parametrize doubled the case count without adding coverage.

Affected: 18 event-only tests in test_basic.py, the 3 cookie-scrubbing
tests in test_data_scrubbing.py, test_set_db_data_custom_backend, and
test_cache_spans_get_span_name (a pure unit test of _get_span_description
that never referenced the argument).

Tests that inspect spans or transactions keep their parametrize.
---
 tests/integrations/django/test_basic.py       | 597 +++++-------------
 .../integrations/django/test_cache_module.py  |   5 +-
 .../django/test_data_scrubbing.py             |   9 -
 3 files changed, 144 insertions(+), 467 deletions(-)

diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 491e185610..a14c6aa113 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -47,50 +47,34 @@ def client():
     return Client(application)
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_view_exceptions(
     sentry_init,
     client,
     capture_exceptions,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
     exceptions = capture_exceptions()
-    if span_streaming:
-        items = capture_items("event")
-        client.get(reverse("view_exc"))
-
-        (error,) = exceptions
-        assert isinstance(error, ZeroDivisionError)
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
-        client.get(reverse("view_exc"))
+    events = capture_events()
+    client.get(reverse("view_exc"))
 
-        (error,) = exceptions
-        assert isinstance(error, ZeroDivisionError)
+    (error,) = exceptions
+    assert isinstance(error, ZeroDivisionError)
 
-        (event,) = events
+    (event,) = events
 
     assert event["exception"]["values"][0]["mechanism"]["type"] == "django"
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
     sentry_init,
     client,
     capture_exceptions,
     capture_events,
-    capture_items,
     settings,
-    span_streaming,
 ):
     """
     Test that ensures if django settings.USE_X_FORWARDED_HOST is set to True
@@ -101,37 +85,24 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
     exceptions = capture_exceptions()
-    if span_streaming:
-        items = capture_items("event")
-        client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
-
-        (error,) = exceptions
-        assert isinstance(error, ZeroDivisionError)
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
-        client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
+    events = capture_events()
+    client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
 
-        (error,) = exceptions
-        assert isinstance(error, ZeroDivisionError)
+    (error,) = exceptions
+    assert isinstance(error, ZeroDivisionError)
 
-        (event,) = events
+    (event,) = events
 
     assert event["request"]["url"] == "http://example.com/view-exc"
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
     sentry_init,
     client,
     capture_exceptions,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     """
     Test that ensures if django settings.USE_X_FORWARDED_HOST is set to False
@@ -140,23 +111,14 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
     exceptions = capture_exceptions()
-    if span_streaming:
-        items = capture_items("event")
-        client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
-
-        (error,) = exceptions
-        assert isinstance(error, ZeroDivisionError)
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
-        client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
+    events = capture_events()
+    client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
 
-        (error,) = exceptions
-        assert isinstance(error, ZeroDivisionError)
-        (event,) = events
+    (error,) = exceptions
+    assert isinstance(error, ZeroDivisionError)
+    (event,) = events
 
     assert event["request"]["url"] == "http://localhost/view-exc"
 
@@ -170,56 +132,30 @@ def test_middleware_exceptions(sentry_init, client, capture_exceptions):
     assert isinstance(error, ZeroDivisionError)
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_request_captured(
     sentry_init,
     client,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
-    if span_streaming:
-        items = capture_items("event")
-        content, status, headers = unpack_werkzeug_response(
-            client.get(reverse("message"))
-        )
-
-        assert content == b"ok"
-
-        (event,) = (item.payload for item in items)
-
-        assert event["transaction"] == "/message"
-        assert event["request"] == {
-            "cookies": {},
-            "env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"},
-            "headers": {"Host": "localhost"},
-            "method": "GET",
-            "query_string": "",
-            "url": "http://localhost/message",
-        }
-    else:
-        events = capture_events()
-        content, status, headers = unpack_werkzeug_response(
-            client.get(reverse("message"))
-        )
+    events = capture_events()
+    content, status, headers = unpack_werkzeug_response(client.get(reverse("message")))
 
-        assert content == b"ok"
+    assert content == b"ok"
 
-        (event,) = events
-        assert event["transaction"] == "/message"
-        assert event["request"] == {
-            "cookies": {},
-            "env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"},
-            "headers": {"Host": "localhost"},
-            "method": "GET",
-            "query_string": "",
-            "url": "http://localhost/message",
-        }
+    (event,) = events
+    assert event["transaction"] == "/message"
+    assert event["request"] == {
+        "cookies": {},
+        "env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"},
+        "headers": {"Host": "localhost"},
+        "method": "GET",
+        "query_string": "",
+        "url": "http://localhost/message",
+    }
 
 
 @pytest.mark.parametrize("span_streaming", [True, False])
@@ -564,39 +500,24 @@ def test_materialized_user_captured(
 
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_queryset_repr(
     sentry_init,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
-        trace_lifecycle="stream" if span_streaming else "static",
     )
 
     User.objects.create_user("john", "lennon@thebeatles.com", "johnpassword")
-    if span_streaming:
-        items = capture_items("event")
-
-        try:
-            my_queryset = User.objects.all()  # noqa
-            1 / 0
-        except Exception:
-            capture_exception()
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        try:
-            my_queryset = User.objects.all()  # noqa
-            1 / 0
-        except Exception:
-            capture_exception()
+    try:
+        my_queryset = User.objects.all()  # noqa
+        1 / 0
+    except Exception:
+        capture_exception()
 
-        (event,) = events
+    (event,) = events
 
     (exception,) = event["exception"]["values"]
     assert exception["type"] == "ZeroDivisionError"
@@ -608,38 +529,23 @@ def test_queryset_repr(
 
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_context_nested_queryset_repr(
     sentry_init,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
-        trace_lifecycle="stream" if span_streaming else "static",
     )
     User.objects.create_user("john", "lennon@thebeatles.com", "johnpassword")
-    if span_streaming:
-        items = capture_items("event")
-
-        try:
-            context = make_context({"entries": User.objects.all()})  # noqa
-            1 / 0
-        except Exception:
-            capture_exception()
+    events = capture_events()
 
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
+    try:
+        context = make_context({"entries": User.objects.all()})  # noqa
+        1 / 0
+    except Exception:
+        capture_exception()
 
-        try:
-            context = make_context({"entries": User.objects.all()})  # noqa
-            1 / 0
-        except Exception:
-            capture_exception()
-
-        (event,) = events
+    (event,) = events
 
     (exception,) = event["exception"]["values"]
     assert exception["type"] == "ZeroDivisionError"
@@ -647,30 +553,19 @@ def test_context_nested_queryset_repr(
     assert "<User: " not in frame["vars"]["context"]
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_custom_error_handler_request_context(
     sentry_init,
     client,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
-        trace_lifecycle="stream" if span_streaming else "static",
     )
-    if span_streaming:
-        items = capture_items("event")
-        content, status, headers = unpack_werkzeug_response(client.post("/404"))
-        assert status.lower() == "404 not found"
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
-        content, status, headers = unpack_werkzeug_response(client.post("/404"))
-        assert status.lower() == "404 not found"
+    events = capture_events()
+    content, status, headers = unpack_werkzeug_response(client.post("/404"))
+    assert status.lower() == "404 not found"
 
-        (event,) = events
+    (event,) = events
 
     assert event["message"] == "not found"
     assert event["level"] == "error"
@@ -705,13 +600,10 @@ def test_management_command_raises():
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
 @pytest.mark.parametrize("with_integration", [True, False])
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_sql_queries(
     sentry_init,
     capture_events,
-    capture_items,
     with_integration,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()] if with_integration else [],
@@ -721,34 +613,19 @@ def test_sql_queries(
 
     from django.db import connection
 
-    if span_streaming:
-        items = capture_items("event")
-
-        sql = connection.cursor()
-
-        sentry_sdk.get_isolation_scope().clear_breadcrumbs()
-
-        with pytest.raises(OperationalError):
-            # table doesn't even exist
-            sql.execute("""SELECT count(*) FROM people_person WHERE foo = %s""", [123])
-
-        capture_message("HI")
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        sql = connection.cursor()
+    sql = connection.cursor()
 
-        sentry_sdk.get_isolation_scope().clear_breadcrumbs()
+    sentry_sdk.get_isolation_scope().clear_breadcrumbs()
 
-        with pytest.raises(OperationalError):
-            # table doesn't even exist
-            sql.execute("""SELECT count(*) FROM people_person WHERE foo = %s""", [123])
+    with pytest.raises(OperationalError):
+        # table doesn't even exist
+        sql.execute("""SELECT count(*) FROM people_person WHERE foo = %s""", [123])
 
-        capture_message("HI")
+    capture_message("HI")
 
-        (event,) = events
+    (event,) = events
 
     if with_integration:
         crumb = event["breadcrumbs"]["values"][-1]
@@ -759,12 +636,9 @@ def test_sql_queries(
 
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_sql_dict_query_params(
     sentry_init,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
@@ -779,32 +653,18 @@ def test_sql_dict_query_params(
 
     sql = connections["postgres"].cursor()
 
-    if span_streaming:
-        items = capture_items("event")
-        sentry_sdk.get_isolation_scope().clear_breadcrumbs()
-
-        with pytest.raises(ProgrammingError):
-            sql.execute(
-                """SELECT count(*) FROM people_person WHERE foo = %(my_foo)s""",
-                {"my_foo": 10},
-            )
-
-        capture_message("HI")
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
-        sentry_sdk.get_isolation_scope().clear_breadcrumbs()
+    events = capture_events()
+    sentry_sdk.get_isolation_scope().clear_breadcrumbs()
 
-        with pytest.raises(ProgrammingError):
-            sql.execute(
-                """SELECT count(*) FROM people_person WHERE foo = %(my_foo)s""",
-                {"my_foo": 10},
-            )
+    with pytest.raises(ProgrammingError):
+        sql.execute(
+            """SELECT count(*) FROM people_person WHERE foo = %(my_foo)s""",
+            {"my_foo": 10},
+        )
 
-        capture_message("HI")
+    capture_message("HI")
 
-        (event,) = events
+    (event,) = events
 
     crumb = event["breadcrumbs"]["values"][-1]
     assert crumb["message"] == (
@@ -868,18 +728,14 @@ def test_response_trace(
 )
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_sql_psycopg2_string_composition(
     sentry_init,
     capture_events,
-    capture_items,
     query,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
         _experiments={
             "record_sql_params": True,
         },
@@ -895,24 +751,14 @@ def test_sql_psycopg2_string_composition(
 
     sentry_sdk.get_isolation_scope().clear_breadcrumbs()
 
-    if span_streaming:
-        items = capture_items("event")
-
-        with pytest.raises(ProgrammingError):
-            sql.execute(query(psycopg2.sql), {"my_param": 10})
-
-        capture_message("HI")
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        with pytest.raises(ProgrammingError):
-            sql.execute(query(psycopg2.sql), {"my_param": 10})
+    with pytest.raises(ProgrammingError):
+        sql.execute(query(psycopg2.sql), {"my_param": 10})
 
-        capture_message("HI")
+    capture_message("HI")
 
-        (event,) = events
+    (event,) = events
 
     crumb = event["breadcrumbs"]["values"][-1]
     assert crumb["message"] == ('SELECT %(my_param)s FROM "foobar"')
@@ -921,17 +767,13 @@ def test_sql_psycopg2_string_composition(
 
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_sql_psycopg2_placeholders(
     sentry_init,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
         _experiments={
             "record_sql_params": True,
         },
@@ -945,52 +787,26 @@ def test_sql_psycopg2_placeholders(
 
     sql = connections["postgres"].cursor()
 
-    if span_streaming:
-        items = capture_items("event")
-        sentry_sdk.get_isolation_scope().clear_breadcrumbs()
-
-        with pytest.raises(DataError):
-            names = ["foo", "bar"]
-            identifiers = [psycopg2.sql.Identifier(name) for name in names]
-            placeholders = [
-                psycopg2.sql.Placeholder(var) for var in ["first_var", "second_var"]
-            ]
-            sql.execute("create table my_test_table (foo text, bar date)")
-
-            query = psycopg2.sql.SQL(
-                "insert into my_test_table ({}) values ({})"
-            ).format(
-                psycopg2.sql.SQL(", ").join(identifiers),
-                psycopg2.sql.SQL(", ").join(placeholders),
-            )
-            sql.execute(query, {"first_var": "fizz", "second_var": "not a date"})
+    events = capture_events()
+    sentry_sdk.get_isolation_scope().clear_breadcrumbs()
 
-        capture_message("HI")
+    with pytest.raises(DataError):
+        names = ["foo", "bar"]
+        identifiers = [psycopg2.sql.Identifier(name) for name in names]
+        placeholders = [
+            psycopg2.sql.Placeholder(var) for var in ["first_var", "second_var"]
+        ]
+        sql.execute("create table my_test_table (foo text, bar date)")
 
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
-        sentry_sdk.get_isolation_scope().clear_breadcrumbs()
-
-        with pytest.raises(DataError):
-            names = ["foo", "bar"]
-            identifiers = [psycopg2.sql.Identifier(name) for name in names]
-            placeholders = [
-                psycopg2.sql.Placeholder(var) for var in ["first_var", "second_var"]
-            ]
-            sql.execute("create table my_test_table (foo text, bar date)")
-
-            query = psycopg2.sql.SQL(
-                "insert into my_test_table ({}) values ({})"
-            ).format(
-                psycopg2.sql.SQL(", ").join(identifiers),
-                psycopg2.sql.SQL(", ").join(placeholders),
-            )
-            sql.execute(query, {"first_var": "fizz", "second_var": "not a date"})
+        query = psycopg2.sql.SQL("insert into my_test_table ({}) values ({})").format(
+            psycopg2.sql.SQL(", ").join(identifiers),
+            psycopg2.sql.SQL(", ").join(placeholders),
+        )
+        sql.execute(query, {"first_var": "fizz", "second_var": "not a date"})
 
-        capture_message("HI")
+    capture_message("HI")
 
-        (event,) = events
+    (event,) = events
 
     for crumb in event["breadcrumbs"]["values"]:
         del crumb["timestamp"]
@@ -1083,12 +899,9 @@ def test_django_connect_trace(
 
 @pytest.mark.forked
 @pytest_mark_django_db_decorator(transaction=True)
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_django_connect_breadcrumbs(
     sentry_init,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     """
     Verify we record a breadcrumb when opening a new database.
@@ -1096,7 +909,6 @@ def test_django_connect_breadcrumbs(
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
 
     from django.db import connections
@@ -1107,24 +919,14 @@ def test_django_connect_breadcrumbs(
     # trigger Django to open a new connection by marking the existing one as None.
     connections["postgres"].connection = None
 
-    if span_streaming:
-        items = capture_items("event")
-
-        cursor = connections["postgres"].cursor()
-        cursor.execute("select 1")
-
-        # trigger recording of event.
-        capture_message("HI")
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        cursor = connections["postgres"].cursor()
-        cursor.execute("select 1")
+    cursor = connections["postgres"].cursor()
+    cursor.execute("select 1")
 
-        # trigger recording of event.
-        capture_message("HI")
-        (event,) = events
+    # trigger recording of event.
+    capture_message("HI")
+    (event,) = events
 
     for crumb in event["breadcrumbs"]["values"]:
         del crumb["timestamp"]
@@ -1213,8 +1015,7 @@ def test_db_connection_span_data(
                 )
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
-def test_set_db_data_custom_backend(span_streaming):
+def test_set_db_data_custom_backend():
     class DummyBackend:
         # https://github.com/mongodb/mongo-python-driver/blob/6ffae5522c960252b8c9adfe2a19b29ff28187cb/pymongo/collection.py#L126
         def __getattr__(self, attr):
@@ -1291,199 +1092,113 @@ def test_transaction_style(
     assert event["transaction"] == expected_transaction
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_request_body(
     sentry_init,
     client,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
-        trace_lifecycle="stream" if span_streaming else "static",
     )
-    if span_streaming:
-        items = capture_items("event")
-        content, status, headers = unpack_werkzeug_response(
-            client.post(reverse("post_echo"), data=b"heyooo", content_type="text/plain")
-        )
-        assert status.lower() == "200 ok"
-        assert content == b"heyooo"
-
-        (event,) = (item.payload for item in items)
-
-        assert event["message"] == "hi"
-        assert event["request"]["data"] == ""
-        assert event["_meta"]["request"]["data"][""] == {
-            "rem": [["!raw", "x"]],
-        }
-
-        del items[:]
-
-        content, status, headers = unpack_werkzeug_response(
-            client.post(
-                reverse("post_echo"),
-                data=b'{"hey": 42}',
-                content_type="application/json",
-            )
-        )
-        assert status.lower() == "200 ok"
-        assert content == b'{"hey": 42}'
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
-        content, status, headers = unpack_werkzeug_response(
-            client.post(reverse("post_echo"), data=b"heyooo", content_type="text/plain")
-        )
-        assert status.lower() == "200 ok"
-        assert content == b"heyooo"
+    events = capture_events()
+    content, status, headers = unpack_werkzeug_response(
+        client.post(reverse("post_echo"), data=b"heyooo", content_type="text/plain")
+    )
+    assert status.lower() == "200 ok"
+    assert content == b"heyooo"
 
-        (event,) = events
+    (event,) = events
 
-        assert event["message"] == "hi"
-        assert event["request"]["data"] == ""
-        assert event["_meta"]["request"]["data"][""] == {
-            "rem": [["!raw", "x"]],
-        }
+    assert event["message"] == "hi"
+    assert event["request"]["data"] == ""
+    assert event["_meta"]["request"]["data"][""] == {
+        "rem": [["!raw", "x"]],
+    }
 
-        del events[:]
+    del events[:]
 
-        content, status, headers = unpack_werkzeug_response(
-            client.post(
-                reverse("post_echo"),
-                data=b'{"hey": 42}',
-                content_type="application/json",
-            )
+    content, status, headers = unpack_werkzeug_response(
+        client.post(
+            reverse("post_echo"),
+            data=b'{"hey": 42}',
+            content_type="application/json",
         )
-        assert status.lower() == "200 ok"
-        assert content == b'{"hey": 42}'
+    )
+    assert status.lower() == "200 ok"
+    assert content == b'{"hey": 42}'
 
-        (event,) = events
+    (event,) = events
 
     assert event["message"] == "hi"
     assert event["request"]["data"] == {"hey": 42}
     assert "" not in event
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_read_request(
     sentry_init,
     client,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
-        trace_lifecycle="stream" if span_streaming else "static",
     )
-    if span_streaming:
-        items = capture_items("event")
-
-        content, status, headers = unpack_werkzeug_response(
-            client.post(
-                reverse("read_body_and_view_exc"),
-                data=b'{"hey": 42}',
-                content_type="application/json",
-            )
-        )
-
-        assert status.lower() == "500 internal server error"
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        content, status, headers = unpack_werkzeug_response(
-            client.post(
-                reverse("read_body_and_view_exc"),
-                data=b'{"hey": 42}',
-                content_type="application/json",
-            )
+    content, status, headers = unpack_werkzeug_response(
+        client.post(
+            reverse("read_body_and_view_exc"),
+            data=b'{"hey": 42}',
+            content_type="application/json",
         )
+    )
 
-        assert status.lower() == "500 internal server error"
+    assert status.lower() == "500 internal server error"
 
-        (event,) = events
+    (event,) = events
 
     assert "data" not in event["request"]
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_request_body_already_read(
     sentry_init,
     client,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
-        trace_lifecycle="stream" if span_streaming else "static",
     )
 
     class MockExtractor(DjangoRequestExtractor):
         def raw_data(self):
             raise RawPostDataException
 
-    if span_streaming:
-        items = capture_items("event")
-
-        with patch(
-            "sentry_sdk.integrations.django.DjangoRequestExtractor", MockExtractor
-        ):
-            client.post(
-                reverse("post_echo"),
-                data=b'{"hey": 42}',
-                content_type="application/json",
-            )
-
-            (event,) = (item.payload for item in items)
-
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        with patch(
-            "sentry_sdk.integrations.django.DjangoRequestExtractor", MockExtractor
-        ):
-            client.post(
-                reverse("post_echo"),
-                data=b'{"hey": 42}',
-                content_type="application/json",
-            )
+    with patch("sentry_sdk.integrations.django.DjangoRequestExtractor", MockExtractor):
+        client.post(
+            reverse("post_echo"),
+            data=b'{"hey": 42}',
+            content_type="application/json",
+        )
 
-            (event,) = events
+        (event,) = events
 
     assert event["message"] == "hi"
     assert "data" not in event["request"]
 
 
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_template_tracing_meta(
     sentry_init,
     client,
     capture_events,
-    capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
-        trace_lifecycle="stream" if span_streaming else "static",
     )
-    if span_streaming:
-        items = capture_items("event")
-
-        content, _, _ = unpack_werkzeug_response(client.get(reverse("template_test3")))
-        rendered_meta = content.decode("utf-8")
-
-        events = [item.payload for item in items]
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        content, _, _ = unpack_werkzeug_response(client.get(reverse("template_test3")))
-        rendered_meta = content.decode("utf-8")
+    content, _, _ = unpack_werkzeug_response(client.get(reverse("template_test3")))
+    rendered_meta = content.decode("utf-8")
 
     traceparent, baggage = events[0]["message"].split("\n")
     assert traceparent != ""
@@ -1501,37 +1216,23 @@ def test_template_tracing_meta(
 
 
 @pytest.mark.parametrize("with_executing_integration", [[], [ExecutingIntegration()]])
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_template_exception(
     sentry_init,
     client,
     capture_events,
-    capture_items,
     with_executing_integration,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()] + with_executing_integration,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
-    if span_streaming:
-        items = capture_items("event")
-
-        content, status, headers = unpack_werkzeug_response(
-            client.get(reverse("template_exc"))
-        )
-        assert status.lower() == "500 internal server error"
-
-        (event,) = (item.payload for item in items)
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        content, status, headers = unpack_werkzeug_response(
-            client.get(reverse("template_exc"))
-        )
-        assert status.lower() == "500 internal server error"
+    content, status, headers = unpack_werkzeug_response(
+        client.get(reverse("template_exc"))
+    )
+    assert status.lower() == "500 internal server error"
 
-        (event,) = events
+    (event,) = events
 
     exception = event["exception"]["values"][-1]
     assert exception["type"] == "TemplateSyntaxError"
@@ -1726,36 +1427,24 @@ def test_rest_framework_authentication_span_without_authenticators(
 @pytest.mark.parametrize(
     "endpoint", ["rest_permission_denied_exc", "permission_denied_exc"]
 )
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_does_not_capture_403(
     sentry_init,
     client,
     capture_events,
-    capture_items,
     endpoint,
-    span_streaming,
 ):
     if endpoint == "rest_permission_denied_exc":
         pytest.importorskip("rest_framework")
 
     sentry_init(
         integrations=[DjangoIntegration()],
-        trace_lifecycle="stream" if span_streaming else "static",
     )
-    if span_streaming:
-        items = capture_items("event", "transaction", "span")
-
-        _, status, _ = unpack_werkzeug_response(client.get(reverse(endpoint)))
-        assert status.lower() == "403 forbidden"
-
-        assert not items
-    else:
-        events = capture_events()
+    events = capture_events()
 
-        _, status, _ = unpack_werkzeug_response(client.get(reverse(endpoint)))
-        assert status.lower() == "403 forbidden"
+    _, status, _ = unpack_werkzeug_response(client.get(reverse(endpoint)))
+    assert status.lower() == "403 forbidden"
 
-        assert not events
+    assert not events
 
 
 @pytest.mark.parametrize("span_streaming", [True, False])
diff --git a/tests/integrations/django/test_cache_module.py b/tests/integrations/django/test_cache_module.py
index b00903104d..a4a4a678cb 100644
--- a/tests/integrations/django/test_cache_module.py
+++ b/tests/integrations/django/test_cache_module.py
@@ -571,10 +571,7 @@ def test_cache_spans_templatetag(
         ),  # this case should never happen, just making sure that we are not raising an exception in that case.
     ],
 )
-@pytest.mark.parametrize("span_streaming", [True, False])
-def test_cache_spans_get_span_name(
-    method_name, args, kwargs, expected_name, span_streaming
-):
+def test_cache_spans_get_span_name(method_name, args, kwargs, expected_name):
     assert _get_span_description(method_name, args, kwargs) == expected_name
 
 
diff --git a/tests/integrations/django/test_data_scrubbing.py b/tests/integrations/django/test_data_scrubbing.py
index 919aa932c3..fa60302850 100644
--- a/tests/integrations/django/test_data_scrubbing.py
+++ b/tests/integrations/django/test_data_scrubbing.py
@@ -22,17 +22,14 @@ def client():
 
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_scrub_django_session_cookies_removed(
     sentry_init,
     client,
     capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=False,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
     items = capture_items("event")
     werkzeug_set_cookie(client, "localhost", "sessionid", "123")
@@ -46,17 +43,14 @@ def test_scrub_django_session_cookies_removed(
 
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_scrub_django_session_cookies_filtered(
     sentry_init,
     client,
     capture_items,
-    span_streaming,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
     items = capture_items("event")
     werkzeug_set_cookie(client, "localhost", "sessionid", "123")
@@ -74,13 +68,11 @@ def test_scrub_django_session_cookies_filtered(
 
 @pytest.mark.forked
 @pytest_mark_django_db_decorator()
-@pytest.mark.parametrize("span_streaming", [True, False])
 def test_scrub_django_custom_session_cookies_filtered(
     sentry_init,
     client,
     capture_items,
     settings,
-    span_streaming,
 ):
     settings.SESSION_COOKIE_NAME = "my_sess"
     settings.CSRF_COOKIE_NAME = "csrf_secret"
@@ -88,7 +80,6 @@ def test_scrub_django_custom_session_cookies_filtered(
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
-        trace_lifecycle="stream" if span_streaming else "static",
     )
     items = capture_items("event")
     werkzeug_set_cookie(client, "localhost", "my_sess", "123")

From 800c001e8dc9f6340d6072ee989d7a818b8073ce Mon Sep 17 00:00:00 2001
From: Erica Pisani <hey@ericapisani.dev>
Date: Tue, 11 Aug 2026 10:08:50 -0400
Subject: [PATCH 2/2] test(django): Replace capture_events fixture with
 capture_items

Update all Django tests to use the `capture_items("event")` fixture API
instead of the `capture_events()` fixture. The new API returns
items with a `.payload` attribute rather than event objects directly.
---
 tests/integrations/django/test_basic.py | 112 ++++++++++++------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index a14c6aa113..83ded9fbdf 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -51,20 +51,20 @@ def test_view_exceptions(
     sentry_init,
     client,
     capture_exceptions,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
     )
     exceptions = capture_exceptions()
-    events = capture_events()
+    items = capture_items("event")
     client.get(reverse("view_exc"))
 
     (error,) = exceptions
     assert isinstance(error, ZeroDivisionError)
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     assert event["exception"]["values"][0]["mechanism"]["type"] == "django"
 
@@ -73,7 +73,7 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
     sentry_init,
     client,
     capture_exceptions,
-    capture_events,
+    capture_items,
     settings,
 ):
     """
@@ -87,13 +87,13 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
         send_default_pii=True,
     )
     exceptions = capture_exceptions()
-    events = capture_events()
+    items = capture_items("event")
     client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
 
     (error,) = exceptions
     assert isinstance(error, ZeroDivisionError)
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     assert event["request"]["url"] == "http://example.com/view-exc"
 
@@ -102,7 +102,7 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
     sentry_init,
     client,
     capture_exceptions,
-    capture_events,
+    capture_items,
 ):
     """
     Test that ensures if django settings.USE_X_FORWARDED_HOST is set to False
@@ -113,12 +113,12 @@ def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
         send_default_pii=True,
     )
     exceptions = capture_exceptions()
-    events = capture_events()
+    items = capture_items("event")
     client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
 
     (error,) = exceptions
     assert isinstance(error, ZeroDivisionError)
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     assert event["request"]["url"] == "http://localhost/view-exc"
 
@@ -135,18 +135,18 @@ def test_middleware_exceptions(sentry_init, client, capture_exceptions):
 def test_request_captured(
     sentry_init,
     client,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
         send_default_pii=True,
     )
-    events = capture_events()
+    items = capture_items("event")
     content, status, headers = unpack_werkzeug_response(client.get(reverse("message")))
 
     assert content == b"ok"
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
     assert event["transaction"] == "/message"
     assert event["request"] == {
         "cookies": {},
@@ -502,14 +502,14 @@ def test_materialized_user_captured(
 @pytest_mark_django_db_decorator()
 def test_queryset_repr(
     sentry_init,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
     )
 
     User.objects.create_user("john", "lennon@thebeatles.com", "johnpassword")
-    events = capture_events()
+    items = capture_items("event")
 
     try:
         my_queryset = User.objects.all()  # noqa
@@ -517,7 +517,7 @@ def test_queryset_repr(
     except Exception:
         capture_exception()
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     (exception,) = event["exception"]["values"]
     assert exception["type"] == "ZeroDivisionError"
@@ -531,13 +531,13 @@ def test_queryset_repr(
 @pytest_mark_django_db_decorator()
 def test_context_nested_queryset_repr(
     sentry_init,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
     )
     User.objects.create_user("john", "lennon@thebeatles.com", "johnpassword")
-    events = capture_events()
+    items = capture_items("event")
 
     try:
         context = make_context({"entries": User.objects.all()})  # noqa
@@ -545,7 +545,7 @@ def test_context_nested_queryset_repr(
     except Exception:
         capture_exception()
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     (exception,) = event["exception"]["values"]
     assert exception["type"] == "ZeroDivisionError"
@@ -556,16 +556,16 @@ def test_context_nested_queryset_repr(
 def test_custom_error_handler_request_context(
     sentry_init,
     client,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
     )
-    events = capture_events()
+    items = capture_items("event")
     content, status, headers = unpack_werkzeug_response(client.post("/404"))
     assert status.lower() == "404 not found"
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     assert event["message"] == "not found"
     assert event["level"] == "error"
@@ -602,7 +602,7 @@ def test_management_command_raises():
 @pytest.mark.parametrize("with_integration", [True, False])
 def test_sql_queries(
     sentry_init,
-    capture_events,
+    capture_items,
     with_integration,
 ):
     sentry_init(
@@ -613,7 +613,7 @@ def test_sql_queries(
 
     from django.db import connection
 
-    events = capture_events()
+    items = capture_items("event")
 
     sql = connection.cursor()
 
@@ -625,7 +625,7 @@ def test_sql_queries(
 
     capture_message("HI")
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     if with_integration:
         crumb = event["breadcrumbs"]["values"][-1]
@@ -638,7 +638,7 @@ def test_sql_queries(
 @pytest_mark_django_db_decorator()
 def test_sql_dict_query_params(
     sentry_init,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
@@ -653,7 +653,7 @@ def test_sql_dict_query_params(
 
     sql = connections["postgres"].cursor()
 
-    events = capture_events()
+    items = capture_items("event")
     sentry_sdk.get_isolation_scope().clear_breadcrumbs()
 
     with pytest.raises(ProgrammingError):
@@ -664,7 +664,7 @@ def test_sql_dict_query_params(
 
     capture_message("HI")
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     crumb = event["breadcrumbs"]["values"][-1]
     assert crumb["message"] == (
@@ -730,7 +730,7 @@ def test_response_trace(
 @pytest_mark_django_db_decorator()
 def test_sql_psycopg2_string_composition(
     sentry_init,
-    capture_events,
+    capture_items,
     query,
 ):
     sentry_init(
@@ -751,14 +751,14 @@ def test_sql_psycopg2_string_composition(
 
     sentry_sdk.get_isolation_scope().clear_breadcrumbs()
 
-    events = capture_events()
+    items = capture_items("event")
 
     with pytest.raises(ProgrammingError):
         sql.execute(query(psycopg2.sql), {"my_param": 10})
 
     capture_message("HI")
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     crumb = event["breadcrumbs"]["values"][-1]
     assert crumb["message"] == ('SELECT %(my_param)s FROM "foobar"')
@@ -769,7 +769,7 @@ def test_sql_psycopg2_string_composition(
 @pytest_mark_django_db_decorator()
 def test_sql_psycopg2_placeholders(
     sentry_init,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
@@ -787,7 +787,7 @@ def test_sql_psycopg2_placeholders(
 
     sql = connections["postgres"].cursor()
 
-    events = capture_events()
+    items = capture_items("event")
     sentry_sdk.get_isolation_scope().clear_breadcrumbs()
 
     with pytest.raises(DataError):
@@ -806,7 +806,7 @@ def test_sql_psycopg2_placeholders(
 
     capture_message("HI")
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     for crumb in event["breadcrumbs"]["values"]:
         del crumb["timestamp"]
@@ -901,7 +901,7 @@ def test_django_connect_trace(
 @pytest_mark_django_db_decorator(transaction=True)
 def test_django_connect_breadcrumbs(
     sentry_init,
-    capture_events,
+    capture_items,
 ):
     """
     Verify we record a breadcrumb when opening a new database.
@@ -919,14 +919,14 @@ def test_django_connect_breadcrumbs(
     # trigger Django to open a new connection by marking the existing one as None.
     connections["postgres"].connection = None
 
-    events = capture_events()
+    items = capture_items("event")
 
     cursor = connections["postgres"].cursor()
     cursor.execute("select 1")
 
     # trigger recording of event.
     capture_message("HI")
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     for crumb in event["breadcrumbs"]["values"]:
         del crumb["timestamp"]
@@ -1095,19 +1095,19 @@ def test_transaction_style(
 def test_request_body(
     sentry_init,
     client,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
     )
-    events = capture_events()
+    items = capture_items("event")
     content, status, headers = unpack_werkzeug_response(
         client.post(reverse("post_echo"), data=b"heyooo", content_type="text/plain")
     )
     assert status.lower() == "200 ok"
     assert content == b"heyooo"
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     assert event["message"] == "hi"
     assert event["request"]["data"] == ""
@@ -1115,7 +1115,7 @@ def test_request_body(
         "rem": [["!raw", "x"]],
     }
 
-    del events[:]
+    del items[:]
 
     content, status, headers = unpack_werkzeug_response(
         client.post(
@@ -1127,7 +1127,7 @@ def test_request_body(
     assert status.lower() == "200 ok"
     assert content == b'{"hey": 42}'
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     assert event["message"] == "hi"
     assert event["request"]["data"] == {"hey": 42}
@@ -1137,12 +1137,12 @@ def test_request_body(
 def test_read_request(
     sentry_init,
     client,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
     )
-    events = capture_events()
+    items = capture_items("event")
 
     content, status, headers = unpack_werkzeug_response(
         client.post(
@@ -1154,7 +1154,7 @@ def test_read_request(
 
     assert status.lower() == "500 internal server error"
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     assert "data" not in event["request"]
 
@@ -1162,7 +1162,7 @@ def test_read_request(
 def test_request_body_already_read(
     sentry_init,
     client,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
@@ -1172,7 +1172,7 @@ class MockExtractor(DjangoRequestExtractor):
         def raw_data(self):
             raise RawPostDataException
 
-    events = capture_events()
+    items = capture_items("event")
 
     with patch("sentry_sdk.integrations.django.DjangoRequestExtractor", MockExtractor):
         client.post(
@@ -1181,7 +1181,7 @@ def raw_data(self):
             content_type="application/json",
         )
 
-        (event,) = events
+        (event,) = (item.payload for item in items)
 
     assert event["message"] == "hi"
     assert "data" not in event["request"]
@@ -1190,17 +1190,17 @@ def raw_data(self):
 def test_template_tracing_meta(
     sentry_init,
     client,
-    capture_events,
+    capture_items,
 ):
     sentry_init(
         integrations=[DjangoIntegration()],
     )
-    events = capture_events()
+    items = capture_items("event")
 
     content, _, _ = unpack_werkzeug_response(client.get(reverse("template_test3")))
     rendered_meta = content.decode("utf-8")
 
-    traceparent, baggage = events[0]["message"].split("\n")
+    traceparent, baggage = items[0].payload["message"].split("\n")
     assert traceparent != ""
     assert baggage != ""
 
@@ -1219,20 +1219,20 @@ def test_template_tracing_meta(
 def test_template_exception(
     sentry_init,
     client,
-    capture_events,
+    capture_items,
     with_executing_integration,
 ):
     sentry_init(
         integrations=[DjangoIntegration()] + with_executing_integration,
     )
-    events = capture_events()
+    items = capture_items("event")
 
     content, status, headers = unpack_werkzeug_response(
         client.get(reverse("template_exc"))
     )
     assert status.lower() == "500 internal server error"
 
-    (event,) = events
+    (event,) = (item.payload for item in items)
 
     exception = event["exception"]["values"][-1]
     assert exception["type"] == "TemplateSyntaxError"
@@ -1430,7 +1430,7 @@ def test_rest_framework_authentication_span_without_authenticators(
 def test_does_not_capture_403(
     sentry_init,
     client,
-    capture_events,
+    capture_items,
     endpoint,
 ):
     if endpoint == "rest_permission_denied_exc":
@@ -1439,12 +1439,12 @@ def test_does_not_capture_403(
     sentry_init(
         integrations=[DjangoIntegration()],
     )
-    events = capture_events()
+    items = capture_items("event")
 
     _, status, _ = unpack_werkzeug_response(client.get(reverse(endpoint)))
     assert status.lower() == "403 forbidden"
 
-    assert not events
+    assert not items
 
 
 @pytest.mark.parametrize("span_streaming", [True, False])