.

Author: sentrivana

tests/conftest.py

@@ -331,7 +331,7 @@ class UnwrappedItem:
 def capture_items(monkeypatch):
     """Capture envelope payload, unfurling individual items."""
 
-    def inner(types=None):
+    def inner(*types):
         telemetry = []
         test_client = sentry_sdk.get_client()
         old_capture_envelope = test_client.transport.capture_envelope
@@ -1254,29 +1254,6 @@ def werkzeug_set_cookie(client, servername, key, value):
         client.set_cookie(key, value)
 
 
-def envelopes_to_spans(envelopes):
-    res: "list[dict[str, Any]]" = []
-    for envelope in envelopes:
-        for item in envelope.items:
-            if item.type == "span":
-                for span_json in item.payload.json["items"]:
-                    span = {
-                        "start_timestamp": span_json["start_timestamp"],
-                        "end_timestamp": span_json.get("end_timestamp"),
-                        "trace_id": span_json["trace_id"],
-                        "span_id": span_json["span_id"],
-                        "name": span_json["name"],
-                        "status": span_json["status"],
-                        "is_segment": span_json["is_segment"],
-                        "parent_span_id": span_json.get("parent_span_id"),
-                        "attributes": {
-                            k: v["value"] for (k, v) in span_json["attributes"].items()
-                        },
-                    }
-                    res.append(span)
-    return res
-
-
 @contextmanager
 def patch_start_tracing_child(
     fake_transaction_is_none: bool = False,

tests/integrations/asgi/test_asgi.py

@@ -186,7 +186,7 @@ async def test_capture_transaction(
 
     async with TestClient(app) as client:
         if span_streaming:
-            items = capture_items(["span"])
+            items = capture_items("span")
         else:
             events = capture_events()
         await client.get("/some_url?somevalue=123")
@@ -256,7 +256,7 @@ async def test_capture_transaction_with_error(
     app = SentryAsgiMiddleware(asgi3_app_with_error)
 
     if span_streaming:
-        items = capture_items(["event", "span"])
+        items = capture_items("event", "span")
     else:
         events = capture_events()
 

tests/tracing/test_span_streaming.py

@@ -3,20 +3,43 @@
 import sys
 import time
 from unittest import mock
+from typing import Any
 
 import pytest
 
 import sentry_sdk
 from sentry_sdk.profiler.continuous_profiler import get_profiler_id
 from sentry_sdk.traces import NoOpStreamedSpan, SpanStatus, StreamedSpan
-from tests.conftest import envelopes_to_spans
 
 
 minimum_python_38 = pytest.mark.skipif(
     sys.version_info < (3, 8), reason="Asyncio tests need Python >= 3.8"
 )
 
 
+def envelopes_to_spans(envelopes):
+    res: "list[dict[str, Any]]" = []
+    for envelope in envelopes:
+        for item in envelope.items:
+            if item.type == "span":
+                for span_json in item.payload.json["items"]:
+                    span = {
+                        "start_timestamp": span_json["start_timestamp"],
+                        "end_timestamp": span_json.get("end_timestamp"),
+                        "trace_id": span_json["trace_id"],
+                        "span_id": span_json["span_id"],
+                        "name": span_json["name"],
+                        "status": span_json["status"],
+                        "is_segment": span_json["is_segment"],
+                        "parent_span_id": span_json.get("parent_span_id"),
+                        "attributes": {
+                            k: v["value"] for (k, v) in span_json["attributes"].items()
+                        },
+                    }
+                    res.append(span)
+    return res
+
+
 def test_start_span(sentry_init, capture_envelopes):
     sentry_init(
         traces_sample_rate=1.0,