Merge branch 'webb/narrow-capture-items' into webb/remove-filters

Author: alexander-alderman-webb

tests/integrations/django/test_basic.py

@@ -1629,7 +1629,7 @@ def test_does_not_capture_403(
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
     if span_streaming:
-        items = capture_items("span")
+        items = capture_items("event", "transaction", "span")
 
         _, status, _ = unpack_werkzeug_response(client.get(reverse(endpoint)))
         assert status.lower() == "403 forbidden"

tests/integrations/langchain/test_langchain.py

@@ -4149,7 +4149,7 @@ def test_langchain_embeddings_span_hierarchy(
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
     if span_streaming:
-        items = capture_items("span", "transaction")
+        items = capture_items("span")
 
         # Mock the actual API call
         with mock.patch.object(

tests/integrations/litellm/test_litellm.py

@@ -1530,7 +1530,7 @@ def test_span_origin(
         request_headers={"X-Stainless-Raw-Response": "true"},
     )
     if span_streaming:
-        items = capture_items("span", "transaction")
+        items = capture_items("span")
 
         with mock.patch.object(
             client.completions._client._client,
@@ -1637,7 +1637,7 @@ def test_multiple_providers(
     )
 
     if span_streaming:
-        items = capture_items("span", "transaction")
+        items = capture_items("span")
 
         with mock.patch.object(
             openai_client.completions._client._client,

tests/integrations/pydantic_ai/test_pydantic_ai.py

@@ -94,7 +94,7 @@ async def test_agent_run_async(
     test_agent = get_test_agent()
 
     if span_streaming:
-        items = capture_items("span", "transaction")
+        items = capture_items("span")
 
         result = await test_agent.run(
             ["Message demonstrating the absence of truncation.", "Test input"]
@@ -314,7 +314,7 @@ def test_agent_run_sync(
     test_agent = get_test_agent()
 
     if span_streaming:
-        items = capture_items("span", "transaction")
+        items = capture_items("span")
 
         result = test_agent.run_sync(
             ["Message demonstrating the absence of truncation.", "Test input"]
@@ -480,7 +480,7 @@ async def test_agent_run_stream(
     test_agent = get_test_agent()
 
     if span_streaming:
-        items = capture_items("span", "transaction")
+        items = capture_items("span")
 
         async with test_agent.run_stream(
             ["Message demonstrating the absence of truncation.", "Test input"]
@@ -633,7 +633,7 @@ async def test_agent_run_stream_events(
     test_agent = get_test_agent()
 
     if span_streaming:
-        items = capture_items("span", "transaction")
+        items = capture_items("span")
 
         if PYDANTIC_AI_VERSION > (2,):
             async with test_agent.run_stream_events(
@@ -1364,7 +1364,7 @@ async def test_error_handling(
     )
 
     if span_streaming:
-        items = capture_items("transaction")
+        items = capture_items("span")
 
         # Simple run that should succeed
         await agent.run("Hello")
@@ -1553,7 +1553,7 @@ async def run_agent(input_text):
         return await test_agent.run(input_text)
 
     if span_streaming:
-        items = capture_items("transaction")
+        items = capture_items("span")
 
         # Run 3 agents concurrently
         results = await asyncio.gather(*[run_agent(f"Input {i}") for i in range(3)])
@@ -2162,7 +2162,7 @@ async def test_invoke_agent_with_list_user_prompt(
     )
 
     if span_streaming:
-        items = capture_items("transaction")
+        items = capture_items("span")
 
         # Use a list as user prompt
         await agent.run(["First part", "Second part"])
@@ -2474,7 +2474,7 @@ async def test_agent_data_from_scope(
     )
 
     if span_streaming:
-        items = capture_items("transaction")
+        items = capture_items("span")
 
         # The integration automatically sets agent in scope during execution
         await agent.run("Test input")
@@ -2795,7 +2795,7 @@ async def test_agent_without_name(
     )
 
     if span_streaming:
-        items = capture_items("transaction")
+        items = capture_items("span")
 
         await agent.run("Test input")
 
@@ -3958,7 +3958,7 @@ async def test_binary_content_encoding_image(
     )
 
     if span_streaming:
-        items = capture_items("transaction")
+        items = capture_items("span")
 
         with sentry_sdk.traces.start_span(
             name="test", attributes={"sentry.op": "test"}
@@ -4045,7 +4045,7 @@ async def test_binary_content_encoding_mixed_content(
     )
 
     if span_streaming:
-        items = capture_items("transaction")
+        items = capture_items("span")
 
         with sentry_sdk.traces.start_span(
             name="test", attributes={"sentry.op": "test"}
@@ -4225,7 +4225,7 @@ async def test_set_usage_data_with_cache_tokens(
     )
 
     if span_streaming:
-        items = capture_items("transaction")
+        items = capture_items("span")
 
         with sentry_sdk.traces.start_span(
             name="test", attributes={"sentry.op": "test"}