.

Author: alexander-alderman-webb

sentry_sdk/client.py

@@ -245,9 +245,15 @@ def _serialized_v1_span_to_serialized_v2_span(
 
     res["attributes"] = {}
     for key, value in attributes.items():
-        res["attributes"][key] = _serialized_v1_attribute_to_serialized_v2_attribute(
-            value
-        )
+        converted_value = _serialized_v1_attribute_to_serialized_v2_attribute(value)
+        if converted_value is None:
+            continue
+
+        res["attributes"][key] = converted_value
+
+    # Remove redundant attribute, as status is stored in the status field.
+    if "status" in res["attributes"]:
+        del res["attributes"]["status"]
 
     return res
 
@@ -268,6 +274,10 @@ def _split_gen_ai_spans(
     non_gen_ai_spans = []
     gen_ai_spans = []
     for span in spans:
+        if not isinstance(span, dict):
+            non_gen_ai_spans.append(span)
+            continue
+
         span_op = span.get("op")
         if isinstance(span_op, str) and span_op.startswith("gen_ai."):
             gen_ai_spans.append(span)

tests/tracing/test_decorator.py

@@ -121,9 +121,9 @@ async def _some_function_traced(a, b, c):
     )
 
 
-def test_span_templates_ai_dicts(sentry_init, capture_events):
+def test_span_templates_ai_dicts(sentry_init, capture_items):
     sentry_init(traces_sample_rate=1.0)
-    events = capture_events()
+    items = capture_items("span")
 
     @sentry_sdk.trace(template=SPANTEMPLATE.AI_TOOL)
     def my_tool(arg1, arg2):
@@ -166,40 +166,57 @@ def my_agent():
     with sentry_sdk.start_transaction(name="test-transaction"):
         my_agent()
 
-    (event,) = events
-    (agent_span, tool_span, chat_span) = event["spans"]
+    (agent_span, tool_span, chat_span) = (
+        item.payload for item in items if item.type == "span"
+    )
 
-    assert agent_span["op"] == "gen_ai.invoke_agent"
+    assert agent_span["attributes"]["sentry.op"] == "gen_ai.invoke_agent"
     assert (
-        agent_span["description"]
+        agent_span["name"]
         == "invoke_agent test_decorator.test_span_templates_ai_dicts.<locals>.my_agent"
     )
-    assert agent_span["data"] == {
+    assert agent_span["attributes"] == {
         "gen_ai.agent.name": "test_decorator.test_span_templates_ai_dicts.<locals>.my_agent",
         "gen_ai.operation.name": "invoke_agent",
+        "sentry.environment": "production",
+        "sentry.op": "gen_ai.invoke_agent",
+        "sentry.origin": "manual",
+        "sentry.release": mock.ANY,
+        "sentry.sdk.name": "sentry.python",
+        "sentry.sdk.version": mock.ANY,
+        "sentry.segment.id": mock.ANY,
+        "sentry.segment.name": "test-transaction",
         "thread.id": mock.ANY,
         "thread.name": mock.ANY,
     }
 
-    assert tool_span["op"] == "gen_ai.execute_tool"
+    assert tool_span["attributes"]["sentry.op"] == "gen_ai.execute_tool"
     assert (
-        tool_span["description"]
+        tool_span["name"]
         == "execute_tool test_decorator.test_span_templates_ai_dicts.<locals>.my_tool"
     )
-    assert tool_span["data"] == {
+    assert tool_span["attributes"] == {
         "gen_ai.tool.name": "test_decorator.test_span_templates_ai_dicts.<locals>.my_tool",
         "gen_ai.operation.name": "execute_tool",
         "gen_ai.usage.input_tokens": 10,
         "gen_ai.usage.output_tokens": 20,
         "gen_ai.usage.total_tokens": 30,
+        "sentry.environment": "production",
+        "sentry.op": "gen_ai.execute_tool",
+        "sentry.origin": "manual",
+        "sentry.release": mock.ANY,
+        "sentry.sdk.name": "sentry.python",
+        "sentry.sdk.version": mock.ANY,
+        "sentry.segment.id": mock.ANY,
+        "sentry.segment.name": "test-transaction",
         "thread.id": mock.ANY,
         "thread.name": mock.ANY,
     }
-    assert "gen_ai.tool.description" not in tool_span["data"]
+    assert "gen_ai.tool.description" not in tool_span["attributes"]
 
-    assert chat_span["op"] == "gen_ai.chat"
-    assert chat_span["description"] == "chat my-gpt-4o-mini"
-    assert chat_span["data"] == {
+    assert chat_span["attributes"]["sentry.op"] == "gen_ai.chat"
+    assert chat_span["name"] == "chat my-gpt-4o-mini"
+    assert chat_span["attributes"] == {
         "gen_ai.operation.name": "chat",
         "gen_ai.request.frequency_penalty": 1.0,
         "gen_ai.request.max_tokens": 100,
@@ -213,6 +230,14 @@ def my_agent():
         "gen_ai.usage.input_tokens": 11,
         "gen_ai.usage.output_tokens": 22,
         "gen_ai.usage.total_tokens": 33,
+        "sentry.environment": "production",
+        "sentry.op": "gen_ai.chat",
+        "sentry.origin": "manual",
+        "sentry.release": mock.ANY,
+        "sentry.sdk.name": "sentry.python",
+        "sentry.sdk.version": mock.ANY,
+        "sentry.segment.id": mock.ANY,
+        "sentry.segment.name": "test-transaction",
         "thread.id": mock.ANY,
         "thread.name": mock.ANY,
     }

tests/tracing/test_misc.py

@@ -611,11 +611,11 @@ class TestConversationIdPropagation:
     """Tests for conversation_id propagation to AI spans."""
 
     def test_conversation_id_propagates_to_span_with_gen_ai_operation_name(
-        self, sentry_init, capture_events
+        self, sentry_init, capture_items
     ):
         """Span with gen_ai.operation.name data should get conversation_id."""
         sentry_init(traces_sample_rate=1.0)
-        events = capture_events()
+        items = capture_items("span")
 
         scope = sentry_sdk.get_current_scope()
         scope.set_conversation_id("conv-op-name-test")
@@ -624,8 +624,8 @@ def test_conversation_id_propagates_to_span_with_gen_ai_operation_name(
             with start_span(op="http.client") as span:
                 span.set_data("gen_ai.operation.name", "chat")
 
-        (event,) = events
-        span_data = event["spans"][0]["data"]
+        spans = [item.payload for item in items if item.type == "span"]
+        span_data = spans[0]["data"]
         assert span_data.get("gen_ai.conversation.id") == "conv-op-name-test"
 
     def test_conversation_id_propagates_to_span_with_ai_op(