.

Author: alexander-alderman-webb

tests/conftest.py

@@ -476,23 +476,36 @@ def maybe_monkeypatched_threading(request):
 
 @pytest.fixture
 def render_span_tree():
-    def inner(event):
-        assert event["type"] == "transaction"
+    def inner(spans, root_span=None):
+        streamed_spans = False
+        if root_span is None:
+            streamed_spans = True
 
         by_parent = {}
-        for span in event["spans"]:
+        print("spans are", spans)
+        for span in spans:
+            print(span)
+            if "parent_span_id" not in span:
+                root_span = span
+                continue
+
             by_parent.setdefault(span["parent_span_id"], []).append(span)
 
         def render_span(span):
-            yield "- op={}: description={}".format(
-                json.dumps(span.get("op")), json.dumps(span.get("description"))
-            )
+            if streamed_spans:
+                yield "- sentry.op={}: name={}".format(
+                    json.dumps(span["attributes"].get("sentry.op")),
+                    json.dumps(span["name"]),
+                )
+            else:
+                yield "- op={}: description={}".format(
+                    json.dumps(span.get("op")), json.dumps(span.get("description"))
+                )
+
             for subspan in by_parent.get(span["span_id"]) or ():
                 for line in render_span(subspan):
                     yield "  {}".format(line)
 
-        root_span = event["contexts"]["trace"]
-
         return "\n".join(render_span(root_span))
 
     return inner

tests/integrations/sqlalchemy/test_sqlalchemy.py

@@ -63,7 +63,7 @@ class Address(Base):
     assert session.query(Person).first() == bob
 
     if span_streaming:
-        items = capture_items("event", "transaction", "span")
+        items = capture_items("event")
         capture_message("hi")
         (event,) = (item.payload for item in items if item.type == "event")
     else:
@@ -1201,7 +1201,7 @@ def test_span_origin(
         "sqlite:///:memory:", connect_args={"check_same_thread": False}
     )
     if span_streaming:
-        items = capture_items("span", "transaction")
+        items = capture_items("span")
         with sentry_sdk.traces.start_span(name="custom parent"):
             with engine.connect() as con:
                 con.execute(text("SELECT 0"))