Skip to content

chore(pydantic-ai): Remove transaction-based tracing #7390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexander-alderman-webb wants to merge 3 commits into
base: major/3.0
Choose a base branch
from
Open

chore(pydantic-ai): Remove transaction-based tracing #7390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64bf181
chore(pydantic-ai): Remove transaction-based tracing
alexander-alderman-webb Sep 4, 2026
aba521a
remove start_transaction
alexander-alderman-webb Sep 4, 2026
205ea12
remove manual spans and stop capturing transactions
alexander-alderman-webb Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions sentry_sdk/integrations/pydantic_ai/patches/agent_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
raise DidNotEnable("pydantic-ai not installed")

if TYPE_CHECKING:
from typing import Any, Callable, Optional, Union
from typing import Any, Callable, Optional


class _StreamingContextManagerWrapper:
Expand All @@ -37,7 +37,7 @@ def __init__(
self.model_settings = model_settings
self.is_streaming = is_streaming
self._isolation_scope: "Any" = None
self._span: "Optional[Union[sentry_sdk.tracing.Span, sentry_sdk.traces.StreamedSpan]]" = None
self._span: "Optional[sentry_sdk.traces.StreamedSpan]" = None
self._result: "Any" = None

async def __aenter__(self) -> "Any":
Expand All @@ -53,7 +53,6 @@ async def __aenter__(self) -> "Any":
self.model_settings,
self.is_streaming,
)
self._span.__enter__()

# Push agent to contextvar stack after span is successfully created and entered
# This ensures proper pairing with pop_agent() in __aexit__ even if exceptions occur
Expand Down
89 changes: 27 additions & 62 deletions sentry_sdk/integrations/pydantic_ai/spans/ai_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@
from sentry_sdk.ai.utils import (
normalize_message_roles,
set_data_normalized,
truncate_and_annotate_messages,
)
from sentry_sdk.consts import OP, SPANDATA
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing_utils import (
has_span_streaming_enabled,
)
from sentry_sdk.utils import safe_serialize

from ..consts import SPAN_ORIGIN
Expand Down Expand Up @@ -103,9 +99,7 @@ def _get_system_instructions(
return permanent_instructions, current_instructions


def _set_input_messages(
span: "Union[sentry_sdk.tracing.Span, StreamedSpan]", messages: "Any"
) -> None:
def _set_input_messages(span: "StreamedSpan", messages: "Any") -> None:
"""Set input messages data on a span."""
if not _should_send_inputs():
return
Expand All @@ -115,24 +109,14 @@ def _set_input_messages(

permanent_instructions, current_instructions = _get_system_instructions(messages)
if len(permanent_instructions) > 0 or len(current_instructions) > 0:
if isinstance(span, StreamedSpan):
span.set_attribute(
SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS,
json.dumps(
_transform_system_instructions(
permanent_instructions, current_instructions
)
),
)
else:
span.set_data(
SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS,
json.dumps(
_transform_system_instructions(
permanent_instructions, current_instructions
)
),
)
span.set_attribute(
SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS,
json.dumps(
_transform_system_instructions(
permanent_instructions, current_instructions
)
),
)

try:
formatted_messages = []
Expand Down Expand Up @@ -216,23 +200,19 @@ def _set_input_messages(

if formatted_messages:
normalized_messages = normalize_message_roles(formatted_messages)
client = sentry_sdk.get_client()
scope = sentry_sdk.get_current_scope()
messages_data = (
truncate_and_annotate_messages(normalized_messages, span, scope)
if not has_span_streaming_enabled(client.options)
else normalized_messages
)
set_data_normalized(
span, SPANDATA.GEN_AI_REQUEST_MESSAGES, messages_data, unpack=False
span,
SPANDATA.GEN_AI_REQUEST_MESSAGES,
normalized_messages,
unpack=False,
)
except Exception:
# If we fail to format messages, just skip it
pass


def _set_output_data(
span: "Union[sentry_sdk.tracing.Span, StreamedSpan]",
span: "StreamedSpan",
response: "Optional[ModelResponse]",
) -> None:
"""Set output data on a span."""
Expand All @@ -241,10 +221,7 @@ def _set_output_data(
if not response:
return

set_on_span = (
span.set_attribute if isinstance(span, StreamedSpan) else span.set_data
)
set_on_span(SPANDATA.GEN_AI_RESPONSE_MODEL, response.model_name) # type: ignore[arg-type]
span.set_attribute(SPANDATA.GEN_AI_RESPONSE_MODEL, response.model_name) # type: ignore[arg-type]

if not record_outputs:
return
Expand Down Expand Up @@ -280,7 +257,7 @@ def _set_output_data(
parts.append(tool_part)

if parts:
set_on_span(
span.set_attribute(
SPANDATA.GEN_AI_OUTPUT_MESSAGES,
json.dumps([{"role": "assistant", "parts": parts}]),
)
Expand All @@ -292,7 +269,7 @@ def _set_output_data(

def ai_client_span(
messages: "Any", agent: "Any", model: "Any", model_settings: "Any"
) -> "Union[sentry_sdk.tracing.Span, StreamedSpan]":
) -> "StreamedSpan":
"""Create a span for an AI client call (model request).

Args:
Expand All @@ -308,27 +285,15 @@ def ai_client_span(

model_name = _get_model_name(model_obj) or "unknown"

span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
if span_streaming:
span = sentry_sdk.traces.start_span(
name=f"chat {model_name}",
attributes={
"sentry.op": OP.GEN_AI_CHAT,
"sentry.origin": SPAN_ORIGIN,
SPANDATA.GEN_AI_OPERATION_NAME: "chat",
SPANDATA.GEN_AI_RESPONSE_STREAMING: get_is_streaming(),
},
)
else:
span = sentry_sdk.start_span(
op=OP.GEN_AI_CHAT,
name=f"chat {model_name}",
origin=SPAN_ORIGIN,
)

span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "chat")
# Set streaming flag from contextvar
span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, get_is_streaming())
span = sentry_sdk.traces.start_span(
name=f"chat {model_name}",
attributes={
"sentry.op": OP.GEN_AI_CHAT,
"sentry.origin": SPAN_ORIGIN,
SPANDATA.GEN_AI_OPERATION_NAME: "chat",
SPANDATA.GEN_AI_RESPONSE_STREAMING: get_is_streaming(),
},
)

_set_agent_data(span, agent)
_set_model_data(span, model, model_settings)
Expand All @@ -345,7 +310,7 @@ def ai_client_span(


def update_ai_client_span(
span: "Union[sentry_sdk.tracing.Span, StreamedSpan]",
span: "StreamedSpan",
model_response: "Optional[ModelResponse]",
) -> None:
"""Update the AI client span with response data."""
Expand Down
51 changes: 15 additions & 36 deletions sentry_sdk/integrations/pydantic_ai/spans/execute_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
import sentry_sdk
from sentry_sdk.consts import OP, SPANDATA
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing_utils import has_span_streaming_enabled
from sentry_sdk.utils import safe_serialize

from ..consts import SPAN_ORIGIN
from ..utils import _set_agent_data, _should_send_inputs, _should_send_outputs

if TYPE_CHECKING:
from typing import Any, Optional, Union
from typing import Any, Optional

from pydantic_ai._tool_manager import ToolDefinition # type: ignore

Expand All @@ -20,7 +19,7 @@ def execute_tool_span(
tool_args: "Any",
agent: "Any",
tool_definition: "Optional[ToolDefinition]" = None,
) -> "Union[sentry_sdk.tracing.Span, StreamedSpan]":
) -> "StreamedSpan":
"""Create a span for tool execution.

Args:
Expand All @@ -29,56 +28,36 @@ def execute_tool_span(
agent: The agent executing the tool
tool_definition: The definition of the tool, if available
"""
span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
if span_streaming:
span = sentry_sdk.traces.start_span(
name=f"execute_tool {tool_name}",
attributes={
"sentry.op": OP.GEN_AI_EXECUTE_TOOL,
"sentry.origin": SPAN_ORIGIN,
SPANDATA.GEN_AI_OPERATION_NAME: "execute_tool",
SPANDATA.GEN_AI_TOOL_NAME: tool_name,
},
)

set_on_span = span.set_attribute
else:
span = sentry_sdk.start_span(
op=OP.GEN_AI_EXECUTE_TOOL,
name=f"execute_tool {tool_name}",
origin=SPAN_ORIGIN,
)

span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "execute_tool")
span.set_data(SPANDATA.GEN_AI_TOOL_NAME, tool_name)

set_on_span = span.set_data
span = sentry_sdk.traces.start_span(
name=f"execute_tool {tool_name}",
attributes={
"sentry.op": OP.GEN_AI_EXECUTE_TOOL,
"sentry.origin": SPAN_ORIGIN,
SPANDATA.GEN_AI_OPERATION_NAME: "execute_tool",
SPANDATA.GEN_AI_TOOL_NAME: tool_name,
},
)

if tool_definition is not None and hasattr(tool_definition, "description"):
set_on_span(
span.set_attribute(
SPANDATA.GEN_AI_TOOL_DESCRIPTION,
tool_definition.description,
)

_set_agent_data(span, agent)

if _should_send_inputs() and tool_args is not None:
set_on_span(SPANDATA.GEN_AI_TOOL_INPUT, safe_serialize(tool_args))
span.set_attribute(SPANDATA.GEN_AI_TOOL_INPUT, safe_serialize(tool_args))

return span


def update_execute_tool_span(
span: "Union[sentry_sdk.tracing.Span, StreamedSpan]", result: "Any"
) -> None:
def update_execute_tool_span(span: "StreamedSpan", result: "Any") -> None:
"""Update the execute tool span with the result."""
if not span:
return

if not _should_send_outputs() or result is None:
return

if isinstance(span, StreamedSpan):
span.set_attribute(SPANDATA.GEN_AI_TOOL_OUTPUT, safe_serialize(result))
else:
span.set_data(SPANDATA.GEN_AI_TOOL_OUTPUT, safe_serialize(result))
span.set_attribute(SPANDATA.GEN_AI_TOOL_OUTPUT, safe_serialize(result))
56 changes: 16 additions & 40 deletions sentry_sdk/integrations/pydantic_ai/spans/invoke_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@

import sentry_sdk
from sentry_sdk.ai.utils import (
get_start_span_function,
normalize_message_roles,
set_data_normalized,
truncate_and_annotate_messages,
)
from sentry_sdk.consts import OP, SPANDATA
from sentry_sdk.traces import StreamedSpan
from sentry_sdk.tracing_utils import (
has_span_streaming_enabled,
)

from ..consts import SPAN_ORIGIN
from ..utils import (
Expand All @@ -27,7 +22,7 @@
)

if TYPE_CHECKING:
from typing import Any, Union
from typing import Any

try:
from pydantic_ai.messages import BinaryContent, ImageUrl
Expand All @@ -42,31 +37,21 @@ def invoke_agent_span(
model: "Any",
model_settings: "Any",
is_streaming: bool = False,
) -> "Union[sentry_sdk.tracing.Span, StreamedSpan]":
) -> "StreamedSpan":
"""Create a span for invoking the agent."""
# Determine agent name for span
name = "agent"
if agent and getattr(agent, "name", None):
name = agent.name

span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
if span_streaming:
span = sentry_sdk.traces.start_span(
name=f"invoke_agent {name}",
attributes={
"sentry.op": OP.GEN_AI_INVOKE_AGENT,
"sentry.origin": SPAN_ORIGIN,
SPANDATA.GEN_AI_OPERATION_NAME: "invoke_agent",
},
)
else:
span = get_start_span_function()(
op=OP.GEN_AI_INVOKE_AGENT,
name=f"invoke_agent {name}",
origin=SPAN_ORIGIN,
)

span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "invoke_agent")
span = sentry_sdk.traces.start_span(
name=f"invoke_agent {name}",
attributes={
"sentry.op": OP.GEN_AI_INVOKE_AGENT,
"sentry.origin": SPAN_ORIGIN,
SPANDATA.GEN_AI_OPERATION_NAME: "invoke_agent",
},
)

_set_agent_data(span, agent)
_set_model_data(span, model, model_settings)
Expand Down Expand Up @@ -137,22 +122,18 @@ def invoke_agent_span(

if messages:
normalized_messages = normalize_message_roles(messages)
client = sentry_sdk.get_client()
scope = sentry_sdk.get_current_scope()
messages_data = (
truncate_and_annotate_messages(normalized_messages, span, scope)
if not has_span_streaming_enabled(client.options)
else normalized_messages
)
set_data_normalized(
span, SPANDATA.GEN_AI_REQUEST_MESSAGES, messages_data, unpack=False
span,
SPANDATA.GEN_AI_REQUEST_MESSAGES,
normalized_messages,
unpack=False,
)

return span


def update_invoke_agent_span(
span: "Union[sentry_sdk.tracing.Span, StreamedSpan]",
span: "StreamedSpan",
result: "Any",
) -> None:
"""Update and close the invoke agent span."""
Expand All @@ -173,12 +154,7 @@ def update_invoke_agent_span(
try:
response = result.response
if hasattr(response, "model_name") and response.model_name:
if isinstance(span, StreamedSpan):
span.set_attribute(
SPANDATA.GEN_AI_RESPONSE_MODEL, response.model_name
)
else:
span.set_data(SPANDATA.GEN_AI_RESPONSE_MODEL, response.model_name)
span.set_attribute(SPANDATA.GEN_AI_RESPONSE_MODEL, response.model_name)
except Exception:
# If response access fails, continue without setting model name
pass
Loading
Loading