fix(openai-agents): also emit spans for MCP tool calls done by the LLM

Author: constantinius

sentry_sdk/integrations/openai_agents/spans/ai_client.py

@@ -7,6 +7,7 @@
     _set_input_data,
     _set_output_data,
     _set_usage_data,
+    _create_mcp_execute_tool_spans,
 )
 
 from typing import TYPE_CHECKING
@@ -37,3 +38,4 @@ def update_ai_client_span(span, agent, get_response_kwargs, result):
     _set_usage_data(span, result.usage)
     _set_input_data(span, get_response_kwargs)
     _set_output_data(span, result)
+    _create_mcp_execute_tool_spans(span, result)

sentry_sdk/integrations/openai_agents/utils.py

@@ -1,6 +1,6 @@
 import sentry_sdk
 from sentry_sdk.ai.utils import set_data_normalized
-from sentry_sdk.consts import SPANDATA
+from sentry_sdk.consts import SPANDATA, SPANSTATUS, OP
 from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.tracing_utils import set_span_errored
@@ -156,3 +156,21 @@ def _set_output_data(span, result):
         set_data_normalized(
             span, SPANDATA.GEN_AI_RESPONSE_TEXT, output_messages["response"]
         )
+
+
+def _create_mcp_execute_tool_spans(span, result):
+    # type: (sentry_sdk.tracing.Span, agents.Result) -> None
+    for output in result.output:
+        if output.__class__.__name__ == "McpCall":
+            with sentry_sdk.start_span(
+                op=OP.GEN_AI_EXECUTE_TOOL,
+                description=f"execute_tool {output.name}",
+                start_timestamp=span.start_timestamp,
+            ) as span:
+                span.set_tag(SPANDATA.GEN_AI_TOOL_TYPE, "mcp")
+                span.set_tag(SPANDATA.GEN_AI_TOOL_NAME, output.name)
+                if should_send_default_pii():
+                    span.set_data(SPANDATA.GEN_AI_TOOL_INPUT, output.arguments)
+                    span.set_data(SPANDATA.GEN_AI_TOOL_OUTPUT, output.output)
+                if output.error:
+                    span.set_status(SPANSTATUS.ERROR)