merge master

Author: alexander-alderman-webb

sentry_sdk/client.py

@@ -360,6 +360,8 @@ def _init_impl(self):
 
         def _capture_envelope(envelope):
             # type: (Envelope) -> None
+            if self.spotlight is not None:
+                self.spotlight.capture_envelope(envelope)
             if self.transport is not None:
                 self.transport.capture_envelope(envelope)
 
@@ -387,6 +389,18 @@ def _record_lost_event(
                 if self.options["enable_backpressure_handling"]:
                     self.monitor = Monitor(self.transport)
 
+            # Setup Spotlight before creating batchers so _capture_envelope can use it.
+            # setup_spotlight handles all config/env var resolution per the SDK spec.
+            from sentry_sdk.spotlight import setup_spotlight
+
+            self.spotlight = setup_spotlight(self.options)
+            if self.spotlight is not None and not self.options["dsn"]:
+                sample_all = lambda *_args, **_kwargs: 1.0
+                self.options["send_default_pii"] = True
+                self.options["error_sampler"] = sample_all
+                self.options["traces_sampler"] = sample_all
+                self.options["profiles_sampler"] = sample_all
+
             self.session_flusher = SessionFlusher(capture_func=_capture_envelope)
 
             self.log_batcher = None
@@ -437,29 +451,6 @@ def _record_lost_event(
                 options=self.options,
             )
 
-            spotlight_config = self.options.get("spotlight")
-            if spotlight_config is None and "SENTRY_SPOTLIGHT" in os.environ:
-                spotlight_env_value = os.environ["SENTRY_SPOTLIGHT"]
-                spotlight_config = env_to_bool(spotlight_env_value, strict=True)
-                self.options["spotlight"] = (
-                    spotlight_config
-                    if spotlight_config is not None
-                    else spotlight_env_value
-                )
-
-            if self.options.get("spotlight"):
-                # This is intentionally here to prevent setting up spotlight
-                # stuff we don't need unless spotlight is explicitly enabled
-                from sentry_sdk.spotlight import setup_spotlight
-
-                self.spotlight = setup_spotlight(self.options)
-                if not self.options["dsn"]:
-                    sample_all = lambda *_args, **_kwargs: 1.0
-                    self.options["send_default_pii"] = True
-                    self.options["error_sampler"] = sample_all
-                    self.options["traces_sampler"] = sample_all
-                    self.options["profiles_sampler"] = sample_all
-
             sdk_name = get_sdk_name(list(self.integrations.keys()))
             SDK_INFO["name"] = sdk_name
             logger.debug("Setting SDK name to '%s'", sdk_name)

sentry_sdk/integrations/anthropic.py

@@ -124,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.
     """
+    set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, "chat")
     system_prompt = kwargs.get("system")
     messages = kwargs.get("messages")
     if (

sentry_sdk/integrations/openai_agents/patches/agent_run.py

@@ -87,6 +87,7 @@ async def patched_run_single_turn(cls, *args, **kwargs):
                     end_invoke_agent_span(context_wrapper, current_agent)
 
             span = _start_invoke_agent_span(context_wrapper, agent, kwargs)
+            agent._sentry_agent_span = span
 
         # Call original method with all the correct parameters
         try:

sentry_sdk/integrations/openai_agents/patches/models.py

@@ -3,6 +3,7 @@
 from sentry_sdk.integrations import DidNotEnable
 
 from ..spans import ai_client_span, update_ai_client_span
+from sentry_sdk.consts import SPANDATA
 
 from typing import TYPE_CHECKING
 
@@ -33,13 +34,37 @@ def wrapped_get_model(cls, agent, run_config):
         model = original_get_model(agent, run_config)
         original_get_response = model.get_response
 
+        # Wrap _fetch_response if it exists (for OpenAI models) to capture raw response model
+        if hasattr(model, "_fetch_response"):
+            original_fetch_response = model._fetch_response
+
+            @wraps(original_fetch_response)
+            async def wrapped_fetch_response(*args, **kwargs):
+                # type: (*Any, **Any) -> Any
+                response = await original_fetch_response(*args, **kwargs)
+                if hasattr(response, "model"):
+                    agent._sentry_raw_response_model = str(response.model)
+                return response
+
+            model._fetch_response = wrapped_fetch_response
+
         @wraps(original_get_response)
         async def wrapped_get_response(*args, **kwargs):
             # type: (*Any, **Any) -> Any
             with ai_client_span(agent, kwargs) as span:
                 result = await original_get_response(*args, **kwargs)
 
-                update_ai_client_span(span, agent, kwargs, result)
+                response_model = getattr(agent, "_sentry_raw_response_model", None)
+                if response_model:
+                    agent_span = getattr(agent, "_sentry_agent_span", None)
+                    if agent_span:
+                        agent_span.set_data(
+                            SPANDATA.GEN_AI_RESPONSE_MODEL, response_model
+                        )
+
+                    delattr(agent, "_sentry_raw_response_model")
+
+                update_ai_client_span(span, agent, kwargs, result, response_model)
 
             return result
 

sentry_sdk/integrations/openai_agents/patches/runner.py

@@ -32,8 +32,10 @@ async def wrapper(*args, **kwargs):
         # Isolate each workflow so that when agents are run in asyncio tasks they
         # don't touch each other's scopes
         with sentry_sdk.isolation_scope():
-            agent = args[0]
+            # Clone agent because agent invocation spans are attached per run.
+            agent = args[0].clone()
             with agent_workflow_span(agent):
+                args = (agent, *args[1:])
                 try:
                     run_result = await original_func(*args, **kwargs)
                 except AgentsException as exc:

sentry_sdk/integrations/openai_agents/spans/ai_client.py

@@ -14,7 +14,7 @@
 
 if TYPE_CHECKING:
     from agents import Agent
-    from typing import Any
+    from typing import Any, Optional
 
 
 def ai_client_span(agent, get_response_kwargs):
@@ -35,8 +35,14 @@ def ai_client_span(agent, get_response_kwargs):
     return span
 
 
-def update_ai_client_span(span, agent, get_response_kwargs, result):
-    # type: (sentry_sdk.tracing.Span, Agent, dict[str, Any], Any) -> None
+def update_ai_client_span(
+    span, agent, get_response_kwargs, result, response_model=None
+):
+    # type: (sentry_sdk.tracing.Span, Agent, dict[str, Any], Any, Optional[str]) -> None
     _set_usage_data(span, result.usage)
     _set_output_data(span, result)
     _create_mcp_execute_tool_spans(span, result)
+
+    # Set response model if captured from raw response
+    if response_model is not None:
+        span.set_data(SPANDATA.GEN_AI_RESPONSE_MODEL, response_model)

sentry_sdk/integrations/openai_agents/spans/invoke_agent.py

@@ -10,7 +10,7 @@
 from sentry_sdk.utils import safe_serialize
 
 from ..consts import SPAN_ORIGIN
-from ..utils import _set_agent_data
+from ..utils import _set_agent_data, _set_usage_data
 
 from typing import TYPE_CHECKING
 
@@ -84,6 +84,10 @@ def update_invoke_agent_span(context, agent, output):
     span = getattr(context, "_sentry_agent_span", None)
 
     if span:
+        # Add aggregated usage data from context_wrapper
+        if hasattr(context, "usage"):
+            _set_usage_data(span, context.usage)
+
         if should_send_default_pii():
             set_data_normalized(
                 span, SPANDATA.GEN_AI_RESPONSE_TEXT, output, unpack=False

sentry_sdk/spotlight.py

@@ -1,6 +1,7 @@
 import io
 import logging
 import os
+import time
 import urllib.parse
 import urllib.request
 import urllib.error
@@ -34,14 +35,37 @@
 
 
 class SpotlightClient:
+    """
+    A client for sending envelopes to Sentry Spotlight.
+
+    Implements exponential backoff retry logic per the SDK spec:
+    - Logs error at least once when server is unreachable
+    - Does not log for every failed envelope
+    - Uses exponential backoff to avoid hammering an unavailable server
+    - Never blocks normal Sentry operation
+    """
+
+    # Exponential backoff settings
+    INITIAL_RETRY_DELAY = 1.0  # Start with 1 second
+    MAX_RETRY_DELAY = 60.0  # Max 60 seconds
+
     def __init__(self, url):
         # type: (str) -> None
         self.url = url
         self.http = urllib3.PoolManager()
-        self.fails = 0
+        self._retry_delay = self.INITIAL_RETRY_DELAY
+        self._last_error_time = 0.0  # type: float
 
     def capture_envelope(self, envelope):
         # type: (Envelope) -> None
+
+        # Check if we're in backoff period - skip sending to avoid blocking
+        if self._last_error_time > 0:
+            time_since_error = time.time() - self._last_error_time
+            if time_since_error < self._retry_delay:
+                # Still in backoff period, skip this envelope
+                return
+
         body = io.BytesIO()
         envelope.serialize_into(body)
         try:
@@ -54,18 +78,23 @@ def capture_envelope(self, envelope):
                 },
             )
             req.close()
-            self.fails = 0
+            # Success - reset backoff state
+            self._retry_delay = self.INITIAL_RETRY_DELAY
+            self._last_error_time = 0.0
         except Exception as e:
-            if self.fails < 2:
-                sentry_logger.warning(str(e))
-                self.fails += 1
-            elif self.fails == 2:
-                self.fails += 1
-                sentry_logger.warning(
-                    "Looks like Spotlight is not running, will keep trying to send events but will not log errors."
-                )
-            # omitting self.fails += 1 in the `else:` case intentionally
-            # to avoid overflowing the variable if Spotlight never becomes reachable
+            self._last_error_time = time.time()
+
+            # Increase backoff delay exponentially first, so logged value matches actual wait
+            self._retry_delay = min(self._retry_delay * 2, self.MAX_RETRY_DELAY)
+
+            # Log error once per backoff cycle (we skip sends during backoff, so only one failure per cycle)
+            sentry_logger.warning(
+                "Failed to send envelope to Spotlight at %s: %s. "
+                "Will retry after %.1f seconds.",
+                self.url,
+                e,
+                self._retry_delay,
+            )
 
 
 try:
@@ -207,20 +236,83 @@ def process_exception(self, _request, exception):
     settings = None
 
 
+def _resolve_spotlight_url(spotlight_config, sentry_logger):
+    # type: (Any, Any) -> Optional[str]
+    """
+    Resolve the Spotlight URL based on config and environment variable.
+
+    Implements precedence rules per the SDK spec:
+    https://develop.sentry.dev/sdk/expected-features/spotlight/
+
+    Returns the resolved URL string, or None if Spotlight should be disabled.
+    """
+    spotlight_env_value = os.environ.get("SENTRY_SPOTLIGHT")
+
+    # Parse env var to determine if it's a boolean or URL
+    spotlight_from_env = None  # type: Optional[bool]
+    spotlight_env_url = None  # type: Optional[str]
+    if spotlight_env_value:
+        parsed = env_to_bool(spotlight_env_value, strict=True)
+        if parsed is None:
+            # It's a URL string
+            spotlight_from_env = True
+            spotlight_env_url = spotlight_env_value
+        else:
+            spotlight_from_env = parsed
+
+    # Apply precedence rules per spec:
+    # https://develop.sentry.dev/sdk/expected-features/spotlight/#precedence-rules
+    if spotlight_config is False:
+        # Config explicitly disables spotlight - warn if env var was set
+        if spotlight_from_env:
+            sentry_logger.warning(
+                "Spotlight is disabled via spotlight=False config option, "
+                "ignoring SENTRY_SPOTLIGHT environment variable."
+            )
+        return None
+    elif spotlight_config is True:
+        # Config enables spotlight with boolean true
+        # If env var has URL, use env var URL per spec
+        if spotlight_env_url:
+            return spotlight_env_url
+        else:
+            return DEFAULT_SPOTLIGHT_URL
+    elif isinstance(spotlight_config, str):
+        # Config has URL string - use config URL, warn if env var differs
+        if spotlight_env_value and spotlight_env_value != spotlight_config:
+            sentry_logger.warning(
+                "Spotlight URL from config (%s) takes precedence over "
+                "SENTRY_SPOTLIGHT environment variable (%s).",
+                spotlight_config,
+                spotlight_env_value,
+            )
+        return spotlight_config
+    elif spotlight_config is None:
+        # No config - use env var
+        if spotlight_env_url:
+            return spotlight_env_url
+        elif spotlight_from_env:
+            return DEFAULT_SPOTLIGHT_URL
+        # else: stays None (disabled)
+
+    return None
+
+
 def setup_spotlight(options):
     # type: (Dict[str, Any]) -> Optional[SpotlightClient]
+    url = _resolve_spotlight_url(options.get("spotlight"), sentry_logger)
+
+    if url is None:
+        return None
+
+    # Only set up logging handler when spotlight is actually enabled
     _handler = logging.StreamHandler(sys.stderr)
     _handler.setFormatter(logging.Formatter(" [spotlight] %(levelname)s: %(message)s"))
     logger.addHandler(_handler)
     logger.setLevel(logging.INFO)
 
-    url = options.get("spotlight")
-
-    if url is True:
-        url = DEFAULT_SPOTLIGHT_URL
-
-    if not isinstance(url, str):
-        return None
+    # Update options with resolved URL for consistency
+    options["spotlight"] = url
 
     with capture_internal_exceptions():
         if (