Merge branch 'webb/store-span-on-openai-agents-context-wrapper' into webb/openai-agents-span-management

Author: alexander-alderman-webb

scripts/populate_tox/config.py

@@ -235,7 +235,13 @@
     "litestar": {
         "package": "litestar",
         "deps": {
-            "*": ["pytest-asyncio", "python-multipart", "requests", "cryptography"],
+            "*": [
+                "pytest-asyncio",
+                "python-multipart",
+                "requests",
+                "cryptography",
+                "sniffio",
+            ],
             "<2.7": ["httpx<0.28"],
         },
     },

scripts/populate_tox/package_dependencies.jsonl

@@ -70,6 +70,7 @@
     from sentry_sdk.transport import Transport, Item
     from sentry_sdk._log_batcher import LogBatcher
     from sentry_sdk._metrics_batcher import MetricsBatcher
+    from sentry_sdk.utils import Dsn
 
     I = TypeVar("I", bound=Integration)  # noqa: E741
 
@@ -201,6 +202,11 @@ def dsn(self):
         # type: () -> Optional[str]
         return None
 
+    @property
+    def parsed_dsn(self):
+        # type: () -> Optional[Dsn]
+        return None
+
     def should_send_default_pii(self):
         # type: () -> bool
         return False
@@ -512,6 +518,12 @@ def dsn(self):
         """Returns the configured DSN as string."""
         return self.options["dsn"]
 
+    @property
+    def parsed_dsn(self):
+        # type: () -> Optional[Dsn]
+        """Returns the configured parsed DSN object."""
+        return self.transport.parsed_dsn if self.transport else None
+
     def _prepare_event(
         self,
         event,  # type: Event

scripts/populate_tox/releases.jsonl

@@ -1023,6 +1023,7 @@ def __init__(
         trace_ignore_status_codes=frozenset(),  # type: AbstractSet[int]
         enable_metrics=True,  # type: bool
         before_send_metric=None,  # type: Optional[Callable[[Metric, Hint], Optional[Metric]]]
+        org_id=None,  # type: Optional[str]
     ):
         # type: (...) -> None
         """Initialize the Sentry SDK with the given parameters. All parameters described here can be used in a call to `sentry_sdk.init()`.
@@ -1426,6 +1427,10 @@ def __init__(
             If `trace_ignore_status_codes` is not provided, requests with any status code
             may be traced.
 
+        :param org_id: An optional organization ID. The SDK will try to extract if from the DSN in most cases
+            but you can provide it explicitly for self-hosted and Relay setups. This value is used for
+            trace propagation and for features like `strict_trace_continuation`.
+
         :param _experiments:
         """
         pass

sentry_sdk/client.py

@@ -1,9 +1,11 @@
+from collections.abc import Iterable
 from functools import wraps
 from typing import TYPE_CHECKING
 
 import sentry_sdk
 from sentry_sdk.ai.monitoring import record_token_usage
 from sentry_sdk.ai.utils import (
+    GEN_AI_ALLOWED_MESSAGE_ROLES,
     set_data_normalized,
     normalize_message_roles,
     truncate_and_annotate_messages,
@@ -39,7 +41,7 @@
     raise DidNotEnable("Anthropic not installed")
 
 if TYPE_CHECKING:
-    from typing import Any, AsyncIterator, Iterator
+    from typing import Any, AsyncIterator, Iterator, List, Optional, Union
     from sentry_sdk.tracing import Span
 
 
@@ -122,6 +124,7 @@ def _set_input_data(span, kwargs, integration):
     """
     Set input data for the span based on the provided keyword arguments for the anthropic message creation.
     """
+    system_prompt = kwargs.get("system")
     messages = kwargs.get("messages")
     if (
         messages is not None
@@ -130,18 +133,40 @@ def _set_input_data(span, kwargs, integration):
         and integration.include_prompts
     ):
         normalized_messages = []
+        if system_prompt:
+            system_prompt_content = None  # type: Optional[Union[str, List[dict[str, Any]]]]
+            if isinstance(system_prompt, str):
+                system_prompt_content = system_prompt
+            elif isinstance(system_prompt, Iterable):
+                system_prompt_content = []
+                for item in system_prompt:
+                    if (
+                        isinstance(item, dict)
+                        and item.get("type") == "text"
+                        and item.get("text")
+                    ):
+                        system_prompt_content.append(item.copy())
+
+            if system_prompt_content:
+                normalized_messages.append(
+                    {
+                        "role": GEN_AI_ALLOWED_MESSAGE_ROLES.SYSTEM,
+                        "content": system_prompt_content,
+                    }
+                )
+
         for message in messages:
             if (
-                message.get("role") == "user"
+                message.get("role") == GEN_AI_ALLOWED_MESSAGE_ROLES.USER
                 and "content" in message
                 and isinstance(message["content"], (list, tuple))
             ):
                 for item in message["content"]:
                     if item.get("type") == "tool_result":
                         normalized_messages.append(
                             {
-                                "role": "tool",
-                                "content": {
+                                "role": GEN_AI_ALLOWED_MESSAGE_ROLES.TOOL,
+                                "content": {  # type: ignore[dict-item]
                                     "tool_use_id": item.get("tool_use_id"),
                                     "output": item.get("content"),
                                 },

sentry_sdk/consts.py

@@ -442,19 +442,14 @@ def set_span_data_for_request(span, integration, model, contents, kwargs):
     if kwargs.get("stream", False):
         span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, True)
 
-    config = kwargs.get("config")
-
-    if config is None:
-        return
-
-    config = cast(GenerateContentConfig, config)
+    config = kwargs.get("config")  # type: Optional[GenerateContentConfig]
 
     # Set input messages/prompts if PII is allowed
     if should_send_default_pii() and integration.include_prompts:
         messages = []
 
         # Add system instruction if present
-        if hasattr(config, "system_instruction"):
+        if config and hasattr(config, "system_instruction"):
             system_instruction = config.system_instruction
             if system_instruction:
                 system_text = extract_contents_text(system_instruction)
@@ -496,7 +491,7 @@ def set_span_data_for_request(span, integration, model, contents, kwargs):
                 span.set_data(span_key, value)
 
     # Set tools if available
-    if hasattr(config, "tools"):
+    if config is not None and hasattr(config, "tools"):
         tools = config.tools
         if tools:
             formatted_tools = _format_tools_for_span(tools)

sentry_sdk/integrations/anthropic.py

@@ -443,7 +443,9 @@ def on_llm_end(self, response, *, run_id, **kwargs):
 
             if generation is not None:
                 try:
-                    response_model = generation.generation_info.get("model_name")
+                    response_model = generation.message.response_metadata.get(
+                        "model_name"
+                    )
                     if response_model is not None:
                         span.set_data(SPANDATA.GEN_AI_RESPONSE_MODEL, response_model)
                 except AttributeError:

sentry_sdk/integrations/google_genai/utils.py

@@ -23,7 +23,6 @@
 )
 from sentry_sdk.scope import add_global_event_processor
 from sentry_sdk.tracing import Transaction, Span as SentrySpan
-from sentry_sdk.utils import Dsn
 
 from urllib3.util import parse_url as urlparse
 
@@ -113,12 +112,7 @@ def on_start(self, otel_span, parent_context=None):
         # type: (OTelSpan, Optional[context_api.Context]) -> None
         client = get_client()
 
-        if not client.dsn:
-            return
-
-        try:
-            _ = Dsn(client.dsn)
-        except Exception:
+        if not client.parsed_dsn:
             return
 
         if client.options["instrumenter"] != INSTRUMENTER.OTEL:
@@ -233,10 +227,8 @@ def _is_sentry_span(self, otel_span):
             otel_span_url = otel_span.attributes.get(SpanAttributes.HTTP_URL)
         otel_span_url = cast("Optional[str]", otel_span_url)
 
-        dsn_url = None
-        client = get_client()
-        if client.dsn:
-            dsn_url = Dsn(client.dsn).netloc
+        parsed_dsn = get_client().parsed_dsn
+        dsn_url = parsed_dsn.netloc if parsed_dsn else None
 
         if otel_span_url and dsn_url and dsn_url in otel_span_url:
             return True

sentry_sdk/integrations/langchain.py

@@ -664,8 +664,10 @@ def from_options(cls, scope):
         if options.get("release"):
             sentry_items["release"] = options["release"]
 
-        if options.get("dsn"):
-            sentry_items["public_key"] = Dsn(options["dsn"]).public_key
+        if client.parsed_dsn:
+            sentry_items["public_key"] = client.parsed_dsn.public_key
+            if client.parsed_dsn.org_id:
+                sentry_items["org_id"] = client.parsed_dsn.org_id
 
         if options.get("traces_sample_rate"):
             sentry_items["sample_rate"] = str(options["traces_sample_rate"])
@@ -696,8 +698,10 @@ def populate_from_transaction(cls, transaction):
         if options.get("release"):
             sentry_items["release"] = options["release"]
 
-        if options.get("dsn"):
-            sentry_items["public_key"] = Dsn(options["dsn"]).public_key
+        if client.parsed_dsn:
+            sentry_items["public_key"] = client.parsed_dsn.public_key
+            if client.parsed_dsn.org_id:
+                sentry_items["org_id"] = client.parsed_dsn.org_id
 
         if (
             transaction.name