merge

Author: alexander-alderman-webb

sentry_sdk/integrations/flask.py

@@ -8,13 +8,11 @@
     RequestExtractor,
 )
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
-from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.traces import SegmentNameSource
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     ensure_integration_enabled,
     event_from_exception,
-    has_data_collection_enabled,
     package_version,
 )
 
@@ -146,13 +144,7 @@ def _request_started(app: "Flask", **kwargs: "Any") -> None:
 
     scope = sentry_sdk.get_isolation_scope()
 
-    if has_data_collection_enabled(client.options):
-        if client.options["data_collection"]["user_info"]:
-            with capture_internal_exceptions():
-                user_properties = _get_flask_user_properties()
-                if user_properties:
-                    scope.set_user(user_properties)
-    elif should_send_default_pii():
+    if client.options["data_collection"]["user_info"]:
         with capture_internal_exceptions():
             user_properties = _get_flask_user_properties()
             if user_properties:
@@ -205,11 +197,7 @@ def inner(event: "Event", hint: "dict[str, Any]") -> "Event":
             FlaskRequestExtractor(request).extract_into_event(event)
 
         client_options = sentry_sdk.get_client().options
-        if has_data_collection_enabled(client_options):
-            if client_options["data_collection"]["user_info"]:
-                with capture_internal_exceptions():
-                    _add_user_to_event(event)
-        elif should_send_default_pii():
+        if client_options["data_collection"]["user_info"]:
             with capture_internal_exceptions():
                 _add_user_to_event(event)
 

sentry_sdk/integrations/openai_agents/spans/ai_client.py

@@ -15,6 +15,7 @@
         HostedMCPTool,
         ImageGenerationTool,
         LocalShellTool,
+        Model,
         WebSearchTool,
     )
 except ImportError:
@@ -44,7 +45,6 @@
 
 from ..consts import SPAN_ORIGIN
 from ..utils import (
-    _set_agent_data,
     _set_input_data,
     _set_output_data,
     _set_usage_data,
@@ -216,7 +216,20 @@ def ai_client_context(
         },
     )
 
-    _set_agent_data(context.span, agent)
+    context.span.set_attribute(SPANDATA.GEN_AI_PROVIDER_NAME, "openai")
+
+    request_model_name: "Optional[str]" = None
+    if isinstance(agent.model, Model) and hasattr(agent.model, "model"):
+        request_model_name = agent.model.model
+    elif isinstance(agent.model, str):
+        request_model_name = agent.model
+    elif hasattr(agent, "_sentry_request_model"):
+        request_model_name = agent._sentry_request_model
+
+    if request_model_name:
+        context.span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, request_model_name)
+
+    context.span.set_attribute(SPANDATA.GEN_AI_AGENT_NAME, agent.name)
 
     if agent.model_settings.max_tokens:
         context.span.set_attribute(

sentry_sdk/integrations/openai_agents/spans/execute_tool.py

@@ -5,7 +5,6 @@
 from sentry_sdk.traces import Span, SpanStatus
 
 from ..consts import SPAN_ORIGIN
-from ..utils import _set_agent_data
 
 if TYPE_CHECKING:
     from typing import Any
@@ -36,7 +35,7 @@ def update_execute_tool_span(
 ) -> None:
     client = sentry_sdk.get_client()
 
-    _set_agent_data(span, agent)
+    span.set_attribute(SPANDATA.GEN_AI_AGENT_NAME, agent.name)
 
     if isinstance(result, str) and result.startswith(
         "An error occurred while running the tool"

sentry_sdk/integrations/openai_agents/spans/invoke_agent.py

@@ -10,7 +10,6 @@
 from sentry_sdk.utils import safe_serialize
 
 from ..consts import SPAN_ORIGIN
-from ..utils import _set_agent_data
 
 if TYPE_CHECKING:
     from typing import Any, Optional
@@ -70,7 +69,7 @@ def invoke_agent_span(
                 unpack=False,
             )
 
-    _set_agent_data(span, agent)
+    span.set_attribute(SPANDATA.GEN_AI_AGENT_NAME, agent.name)
 
     return span
 

sentry_sdk/integrations/openai_agents/utils.py

@@ -14,26 +14,19 @@
     set_data_normalized,
 )
 from sentry_sdk.consts import SPANDATA
-from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.traces import Span
 from sentry_sdk.utils import (
     event_from_exception,
     safe_serialize,
 )
 
 if TYPE_CHECKING:
-    from typing import Any, Optional
+    from typing import Any
 
     from agents import TResponseInputItem, Usage
 
     from sentry_sdk._types import TextPart
 
-try:
-    import agents
-    from agents import Model
-except ImportError:
-    raise DidNotEnable("OpenAI Agents not installed")
-
 
 def _capture_exception(exc: "Any") -> None:
     event, hint = event_from_exception(
@@ -44,25 +37,6 @@ def _capture_exception(exc: "Any") -> None:
     sentry_sdk.capture_event(event, hint=hint)
 
 
-def _set_agent_data(span: "Span", agent: "agents.Agent") -> None:
-    span.set_attribute(
-        SPANDATA.GEN_AI_PROVIDER_NAME, "openai"
-    )  # See footnote for  https://opentelemetry.io/docs/specs/semconv/registry/attributes/gen-ai/#gen-ai-system for explanation why.
-
-    span.set_attribute(SPANDATA.GEN_AI_AGENT_NAME, agent.name)
-
-    model_name: "Optional[str]" = None
-    if isinstance(agent.model, Model) and hasattr(agent.model, "model"):
-        model_name = agent.model.model
-    elif isinstance(agent.model, str):
-        model_name = agent.model
-    elif hasattr(agent, "_sentry_request_model"):
-        model_name = agent._sentry_request_model
-
-    if model_name:
-        span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
-
-
 def _set_usage_data(span: "Span", usage: "Usage") -> None:
     span.set_attribute(SPANDATA.GEN_AI_USAGE_INPUT_TOKENS, usage.input_tokens)
     span.set_attribute(

sentry_sdk/integrations/pydantic_ai/__init__.py

@@ -127,7 +127,6 @@ async def sentry_wrap_run(
         with sentry_sdk.isolation_scope(), invoke_agent_span(
             user_prompt=ctx.prompt,
             agent=ctx.agent,
-            model=ctx.model,
             model_settings=ctx.model_settings,
         ) as span:
             try:

sentry_sdk/integrations/pydantic_ai/spans/ai_client.py

@@ -290,7 +290,23 @@ def ai_client_context(
     )
 
     _set_agent_data(context.span, agent)
-    _set_model_data(context.span, agent, model, model_settings)
+
+    # Extract model information
+    model_obj = model
+    if not model_obj and agent and hasattr(agent, "model"):
+        model_obj = agent.model
+
+    if model_obj:
+        # Set system from model
+        if hasattr(model_obj, "system"):
+            context.span.set_attribute(SPANDATA.GEN_AI_PROVIDER_NAME, model_obj.system)
+
+        # Set model name
+        model_name = _get_model_name(model_obj)
+        if model_name:
+            context.span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
+
+    _set_model_data(context.span, agent, model_settings)
     _set_available_tools(context.span, agent)
 
     # Set input messages (full conversation history)

sentry_sdk/integrations/pydantic_ai/spans/invoke_agent.py

@@ -22,7 +22,6 @@
     from typing import Any, Optional, Sequence, Union
 
     from pydantic_ai import Agent, UserContent
-    from pydantic_ai.models import AbstractModel
     from pydantic_ai.realtime.settings import RealtimeModelSettings
     from pydantic_ai.settings import ModelSettings
 
@@ -36,7 +35,6 @@
 def invoke_agent_span(
     user_prompt: "Optional[Union[str, Sequence[UserContent]]]",
     agent: "Optional[Agent]",
-    model: "AbstractModel",
     model_settings: "Optional[Union[ModelSettings, RealtimeModelSettings]]",
 ) -> "Span":
     """Create a span for invoking the agent."""
@@ -55,7 +53,7 @@ def invoke_agent_span(
     )
 
     _set_agent_data(span, agent)
-    _set_model_data(span, agent, model, model_settings)
+    _set_model_data(span, agent, model_settings)
 
     # Add user prompt and system prompts if available and prompts are enabled
     if not sentry_sdk.get_client().options["data_collection"]["gen_ai"]["inputs"]:

sentry_sdk/integrations/pydantic_ai/utils.py

@@ -58,7 +58,6 @@ def _get_model_name(
 def _set_model_data(
     span: "Span",
     agent: "Optional[Agent]",
-    model: "Union[Model, AbstractModel]",
     model_settings: "Optional[Union[ModelSettings, RealtimeModelSettings]]",
 ) -> None:
     """Set model-related data on a span.
@@ -68,21 +67,6 @@ def _set_model_data(
         model: Model object (can be None, will try to get from agent if not provided)
         model_settings: Model settings (can be None, will try to get from agent if not provided)
     """
-    # Extract model information
-    model_obj = model
-    if not model_obj and agent and hasattr(agent, "model"):
-        model_obj = agent.model
-
-    if model_obj:
-        # Set system from model
-        if hasattr(model_obj, "system"):
-            span.set_attribute(SPANDATA.GEN_AI_PROVIDER_NAME, model_obj.system)
-
-        # Set model name
-        model_name = _get_model_name(model_obj)
-        if model_name:
-            span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
-
     # Extract model settings
     settings = model_settings
     if not settings and agent and hasattr(agent, "model_settings"):