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

@@ -217,16 +217,18 @@ def ai_client_context(
         },
     )
 
-    model_name: "Optional[str]" = None
+    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"):
-        model_name = agent.model.model
+        request_model_name = agent.model.model
     elif isinstance(agent.model, str):
-        model_name = agent.model
+        request_model_name = agent.model
     elif hasattr(agent, "_sentry_request_model"):
-        model_name = agent._sentry_request_model
+        request_model_name = agent._sentry_request_model
 
-    if model_name:
-        context.span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
+    if request_model_name:
+        context.span.set_attribute(SPANDATA.GEN_AI_REQUEST_MODEL, request_model_name)
 
     _set_agent_data(context.span, agent)
 

sentry_sdk/integrations/openai_agents/utils.py

@@ -44,9 +44,6 @@ def _capture_exception(exc: "Any") -> None:
 
 
 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)
 

sentry_sdk/integrations/pydantic_ai/spans/ai_client.py

@@ -290,6 +290,17 @@ def ai_client_context(
     )
 
     _set_agent_data(context.span, agent)
+
+    # 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_data(context.span, agent, model, model_settings)
     _set_available_tools(context.span, agent)
 

sentry_sdk/integrations/pydantic_ai/utils.py

@@ -74,10 +74,6 @@ def _set_model_data(
         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: