sentry-sdk 2.42.0__py2.py3-none-any.whl → 2.43.0__py2.py3-none-any.whl

sentry_sdk/__init__.py

@@ -1,4 +1,5 @@
 from sentry_sdk import profiler
+from sentry_sdk import metrics
 from sentry_sdk.scope import Scope
 from sentry_sdk.transport import Transport, HttpTransport
 from sentry_sdk.client import Client
@@ -48,6 +49,7 @@ __all__ = [  # noqa
     "trace",
     "monitor",
     "logger",
+    "metrics",
     "profiler",
     "start_session",
     "end_session",

sentry_sdk/_metrics_batcher.py

@@ -12,7 +12,7 @@ if TYPE_CHECKING:
 
 
 class MetricsBatcher:
-    MAX_METRICS_BEFORE_FLUSH = 100
+    MAX_METRICS_BEFORE_FLUSH = 1000
     FLUSH_WAIT_TIME = 5.0
 
     def __init__(

sentry_sdk/ai/utils.py

@@ -1,14 +1,18 @@
 import json
-
+from collections import deque
 from typing import TYPE_CHECKING
+from sys import getsizeof
 
 if TYPE_CHECKING:
-    from typing import Any, Callable
+    from typing import Any, Callable, Dict, List, Optional, Tuple
+
     from sentry_sdk.tracing import Span
 
 import sentry_sdk
 from sentry_sdk.utils import logger
 
+MAX_GEN_AI_MESSAGE_BYTES = 20_000  # 20KB
+
 
 class GEN_AI_ALLOWED_MESSAGE_ROLES:
     SYSTEM = "system"
@@ -95,3 +99,46 @@ def get_start_span_function():
         current_span is not None and current_span.containing_transaction is not None
     )
     return sentry_sdk.start_span if transaction_exists else sentry_sdk.start_transaction
+
+
+def _find_truncation_index(messages, max_bytes):
+    # type: (List[Dict[str, Any]], int) -> int
+    """
+    Find the index of the first message that would exceed the max bytes limit.
+    Compute the individual message sizes, and return the index of the first message from the back
+    of the list that would exceed the max bytes limit.
+    """
+    running_sum = 0
+    for idx in range(len(messages) - 1, -1, -1):
+        size = len(json.dumps(messages[idx], separators=(",", ":")).encode("utf-8"))
+        running_sum += size
+        if running_sum > max_bytes:
+            return idx + 1
+
+    return 0
+
+
+def truncate_messages_by_size(messages, max_bytes=MAX_GEN_AI_MESSAGE_BYTES):
+    # type: (List[Dict[str, Any]], int) -> Tuple[List[Dict[str, Any]], int]
+    serialized_json = json.dumps(messages, separators=(",", ":"))
+    current_size = len(serialized_json.encode("utf-8"))
+
+    if current_size <= max_bytes:
+        return messages, 0
+
+    truncation_index = _find_truncation_index(messages, max_bytes)
+    return messages[truncation_index:], truncation_index
+
+
+def truncate_and_annotate_messages(
+    messages, span, scope, max_bytes=MAX_GEN_AI_MESSAGE_BYTES
+):
+    # type: (Optional[List[Dict[str, Any]]], Any, Any, int) -> Optional[List[Dict[str, Any]]]
+    if not messages:
+        return None
+
+    truncated_messages, removed_count = truncate_messages_by_size(messages, max_bytes)
+    if removed_count > 0:
+        scope._gen_ai_original_message_count[span.span_id] = len(messages)
+
+    return truncated_messages

sentry_sdk/client.py

@@ -598,14 +598,31 @@ class _Client(BaseClient):
             if event_scrubber:
                 event_scrubber.scrub_event(event)
 
+        if scope is not None and scope._gen_ai_original_message_count:
+            spans = event.get("spans", [])  # type: List[Dict[str, Any]] | AnnotatedValue
+            if isinstance(spans, list):
+                for span in spans:
+                    span_id = span.get("span_id", None)
+                    span_data = span.get("data", {})
+                    if (
+                        span_id
+                        and span_id in scope._gen_ai_original_message_count
+                        and SPANDATA.GEN_AI_REQUEST_MESSAGES in span_data
+                    ):
+                        span_data[SPANDATA.GEN_AI_REQUEST_MESSAGES] = AnnotatedValue(
+                            span_data[SPANDATA.GEN_AI_REQUEST_MESSAGES],
+                            {"len": scope._gen_ai_original_message_count[span_id]},
+                        )
         if previous_total_spans is not None:
             event["spans"] = AnnotatedValue(
                 event.get("spans", []), {"len": previous_total_spans}
             )
         if previous_total_breadcrumbs is not None:
             event["breadcrumbs"] = AnnotatedValue(
-                event.get("breadcrumbs", []), {"len": previous_total_breadcrumbs}
+                event.get("breadcrumbs", {"values": []}),
+                {"len": previous_total_breadcrumbs},
             )
+
         # Postprocess the event here so that annotated types do
         # generally not surface in before_send
         if event is not None:

sentry_sdk/consts.py

@@ -749,6 +749,90 @@ class SPANDATA:
     Example: "MainThread"
     """
 
+    MCP_TOOL_NAME = "mcp.tool.name"
+    """
+    The name of the MCP tool being called.
+    Example: "get_weather"
+    """
+
+    MCP_PROMPT_NAME = "mcp.prompt.name"
+    """
+    The name of the MCP prompt being retrieved.
+    Example: "code_review"
+    """
+
+    MCP_RESOURCE_URI = "mcp.resource.uri"
+    """
+    The URI of the MCP resource being accessed.
+    Example: "file:///path/to/resource"
+    """
+
+    MCP_METHOD_NAME = "mcp.method.name"
+    """
+    The MCP protocol method name being called.
+    Example: "tools/call", "prompts/get", "resources/read"
+    """
+
+    MCP_REQUEST_ID = "mcp.request.id"
+    """
+    The unique identifier for the MCP request.
+    Example: "req_123abc"
+    """
+
+    MCP_TOOL_RESULT_CONTENT = "mcp.tool.result.content"
+    """
+    The result/output content from an MCP tool execution.
+    Example: "The weather is sunny"
+    """
+
+    MCP_TOOL_RESULT_CONTENT_COUNT = "mcp.tool.result.content_count"
+    """
+    The number of items/keys in the MCP tool result.
+    Example: 5
+    """
+
+    MCP_TOOL_RESULT_IS_ERROR = "mcp.tool.result.is_error"
+    """
+    Whether the MCP tool execution resulted in an error.
+    Example: True
+    """
+
+    MCP_PROMPT_RESULT_MESSAGE_CONTENT = "mcp.prompt.result.message_content"
+    """
+    The message content from an MCP prompt retrieval.
+    Example: "Review the following code..."
+    """
+
+    MCP_PROMPT_RESULT_MESSAGE_ROLE = "mcp.prompt.result.message_role"
+    """
+    The role of the message in an MCP prompt retrieval (only set for single-message prompts).
+    Example: "user", "assistant", "system"
+    """
+
+    MCP_PROMPT_RESULT_MESSAGE_COUNT = "mcp.prompt.result.message_count"
+    """
+    The number of messages in an MCP prompt result.
+    Example: 1, 3
+    """
+
+    MCP_RESOURCE_PROTOCOL = "mcp.resource.protocol"
+    """
+    The protocol/scheme of the MCP resource URI.
+    Example: "file", "http", "https"
+    """
+
+    MCP_TRANSPORT = "mcp.transport"
+    """
+    The transport method used for MCP communication.
+    Example: "pipe" (stdio), "tcp" (HTTP/WebSocket/SSE)
+    """
+
+    MCP_SESSION_ID = "mcp.session.id"
+    """
+    The session identifier for the MCP connection.
+    Example: "a1b2c3d4e5f6"
+    """
+
 
 class SPANSTATUS:
     """
@@ -845,6 +929,7 @@ class OP:
     WEBSOCKET_SERVER = "websocket.server"
     SOCKET_CONNECTION = "socket.connection"
     SOCKET_DNS = "socket.dns"
+    MCP_SERVER = "mcp.server"
 
 
 # This type exists to trick mypy and PyCharm into thinking `init` and `Client`
@@ -909,7 +994,7 @@ class ClientConstructor:
         error_sampler=None,  # type: Optional[Callable[[Event, Hint], Union[float, bool]]]
         enable_db_query_source=True,  # type: bool
         db_query_source_threshold_ms=100,  # type: int
-        enable_http_request_source=False,  # type: bool
+        enable_http_request_source=True,  # type: bool
         http_request_source_threshold_ms=100,  # type: int
         spotlight=None,  # type: Optional[Union[bool, str]]
         cert_file=None,  # type: Optional[str]
@@ -1348,4 +1433,4 @@ DEFAULT_OPTIONS = _get_default_options()
 del _get_default_options
 
 
-VERSION = "2.42.0"
+VERSION = "2.43.0"

sentry_sdk/integrations/__init__.py

@@ -149,9 +149,11 @@ _MIN_VERSIONS = {
     "launchdarkly": (9, 8, 0),
     "litellm": (1, 77, 5),
     "loguru": (0, 7, 0),
+    "mcp": (1, 15, 0),
     "openai": (1, 0, 0),
     "openai_agents": (0, 0, 19),
     "openfeature": (0, 7, 1),
+    "pydantic_ai": (1, 0, 0),
     "quart": (0, 16, 0),
     "ray": (2, 7, 0),
     "requests": (2, 0, 0),

sentry_sdk/integrations/anthropic.py

@@ -6,6 +6,7 @@ from sentry_sdk.ai.monitoring import record_token_usage
 from sentry_sdk.ai.utils import (
     set_data_normalized,
     normalize_message_roles,
+    truncate_and_annotate_messages,
     get_start_span_function,
 )
 from sentry_sdk.consts import OP, SPANDATA, SPANSTATUS
@@ -145,12 +146,14 @@ def _set_input_data(span, kwargs, integration):
                 normalized_messages.append(message)
 
         role_normalized_messages = normalize_message_roles(normalized_messages)
-        set_data_normalized(
-            span,
-            SPANDATA.GEN_AI_REQUEST_MESSAGES,
-            role_normalized_messages,
-            unpack=False,
+        scope = sentry_sdk.get_current_scope()
+        messages_data = truncate_and_annotate_messages(
+            role_normalized_messages, span, scope
         )
+        if messages_data is not None:
+            set_data_normalized(
+                span, SPANDATA.GEN_AI_REQUEST_MESSAGES, messages_data, unpack=False
+            )
 
     set_data_normalized(
         span, SPANDATA.GEN_AI_RESPONSE_STREAMING, kwargs.get("stream", False)

sentry_sdk/integrations/aws_lambda.py

@@ -138,6 +138,8 @@ def _wrap_handler(handler):
                     timeout_thread = TimeoutThread(
                         waiting_time,
                         configured_time / MILLIS_TO_SECONDS,
+                        isolation_scope=scope,
+                        current_scope=sentry_sdk.get_current_scope(),
                     )
 
                     # Starting the thread to raise timeout warning exception

sentry_sdk/integrations/django/caching.py

@@ -45,7 +45,8 @@ def _patch_cache_method(cache, method_name, address, port):
     ):
         # type: (CacheHandler, str, Callable[..., Any], tuple[Any, ...], dict[str, Any], Optional[str], Optional[int]) -> Any
         is_set_operation = method_name.startswith("set")
-        is_get_operation = not is_set_operation
+        is_get_method = method_name == "get"
+        is_get_many_method = method_name == "get_many"
 
         op = OP.CACHE_PUT if is_set_operation else OP.CACHE_GET
         description = _get_span_description(method_name, args, kwargs)
@@ -69,8 +70,20 @@ def _patch_cache_method(cache, method_name, address, port):
                     span.set_data(SPANDATA.CACHE_KEY, key)
 
                 item_size = None
-                if is_get_operation:
-                    if value:
+                if is_get_many_method:
+                    if value != {}:
+                        item_size = len(str(value))
+                        span.set_data(SPANDATA.CACHE_HIT, True)
+                    else:
+                        span.set_data(SPANDATA.CACHE_HIT, False)
+                elif is_get_method:
+                    default_value = None
+                    if len(args) >= 2:
+                        default_value = args[1]
+                    elif "default" in kwargs:
+                        default_value = kwargs["default"]
+
+                    if value != default_value:
                         item_size = len(str(value))
                         span.set_data(SPANDATA.CACHE_HIT, True)
                     else:

sentry_sdk/integrations/gcp.py

@@ -75,7 +75,12 @@ def _wrap_func(func):
                 ):
                     waiting_time = configured_time - TIMEOUT_WARNING_BUFFER
 
-                    timeout_thread = TimeoutThread(waiting_time, configured_time)
+                    timeout_thread = TimeoutThread(
+                        waiting_time,
+                        configured_time,
+                        isolation_scope=scope,
+                        current_scope=sentry_sdk.get_current_scope(),
+                    )
 
                     # Starting the thread to raise timeout warning exception
                     timeout_thread.start()

sentry_sdk/integrations/google_genai/__init__.py

@@ -92,6 +92,7 @@ def _wrap_generate_content_stream(f):
         chat_span.set_data(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
         set_span_data_for_request(chat_span, integration, model_name, contents, kwargs)
         chat_span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, True)
+        chat_span.set_data(SPANDATA.GEN_AI_AGENT_NAME, model_name)
 
         try:
             stream = f(self, *args, **kwargs)
@@ -165,6 +166,7 @@ def _wrap_async_generate_content_stream(f):
         chat_span.set_data(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
         set_span_data_for_request(chat_span, integration, model_name, contents, kwargs)
         chat_span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, True)
+        chat_span.set_data(SPANDATA.GEN_AI_AGENT_NAME, model_name)
 
         try:
             stream = await f(self, *args, **kwargs)
@@ -233,6 +235,7 @@ def _wrap_generate_content(f):
                 chat_span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "chat")
                 chat_span.set_data(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)
                 chat_span.set_data(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
+                chat_span.set_data(SPANDATA.GEN_AI_AGENT_NAME, model_name)
                 set_span_data_for_request(
                     chat_span, integration, model_name, contents, kwargs
                 )

sentry_sdk/integrations/google_genai/utils.py

@@ -15,7 +15,11 @@ from typing import (
 )
 
 import sentry_sdk
-from sentry_sdk.ai.utils import set_data_normalized
+from sentry_sdk.ai.utils import (
+    set_data_normalized,
+    truncate_and_annotate_messages,
+    normalize_message_roles,
+)
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.utils import (
@@ -462,12 +466,18 @@ def set_span_data_for_request(span, integration, model, contents, kwargs):
             messages.append({"role": "user", "content": contents_text})
 
         if messages:
-            set_data_normalized(
-                span,
-                SPANDATA.GEN_AI_REQUEST_MESSAGES,
-                messages,
-                unpack=False,
+            normalized_messages = normalize_message_roles(messages)
+            scope = sentry_sdk.get_current_scope()
+            messages_data = truncate_and_annotate_messages(
+                normalized_messages, span, scope
             )
+            if messages_data is not None:
+                set_data_normalized(
+                    span,
+                    SPANDATA.GEN_AI_REQUEST_MESSAGES,
+                    messages_data,
+                    unpack=False,
+                )
 
     # Extract parameters directly from config (not nested under generation_config)
     for param, span_key in [

sentry_sdk/integrations/langchain.py

@@ -9,6 +9,7 @@ from sentry_sdk.ai.utils import (
     normalize_message_roles,
     set_data_normalized,
     get_start_span_function,
+    truncate_and_annotate_messages,
 )
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration
@@ -49,9 +50,15 @@ except ImportError:
 
 
 try:
-    from langchain.agents import AgentExecutor
+    # >=v1
+    from langchain_classic.agents import AgentExecutor  # type: ignore[import-not-found]
 except ImportError:
-    AgentExecutor = None
+    try:
+        # <v1
+        from langchain.agents import AgentExecutor
+    except ImportError:
+        AgentExecutor = None
+
 
 DATA_FIELDS = {
     "frequency_penalty": SPANDATA.GEN_AI_REQUEST_FREQUENCY_PENALTY,
@@ -221,12 +228,17 @@ class SentryLangchainCallback(BaseCallbackHandler):  # type: ignore[misc]
                     }
                     for prompt in prompts
                 ]
-                set_data_normalized(
-                    span,
-                    SPANDATA.GEN_AI_REQUEST_MESSAGES,
-                    normalized_messages,
-                    unpack=False,
+                scope = sentry_sdk.get_current_scope()
+                messages_data = truncate_and_annotate_messages(
+                    normalized_messages, span, scope
                 )
+                if messages_data is not None:
+                    set_data_normalized(
+                        span,
+                        SPANDATA.GEN_AI_REQUEST_MESSAGES,
+                        messages_data,
+                        unpack=False,
+                    )
 
     def on_chat_model_start(self, serialized, messages, *, run_id, **kwargs):
         # type: (SentryLangchainCallback, Dict[str, Any], List[List[BaseMessage]], UUID, Any) -> Any
@@ -278,13 +290,17 @@ class SentryLangchainCallback(BaseCallbackHandler):  # type: ignore[misc]
                             self._normalize_langchain_message(message)
                         )
                 normalized_messages = normalize_message_roles(normalized_messages)
-
-                set_data_normalized(
-                    span,
-                    SPANDATA.GEN_AI_REQUEST_MESSAGES,
-                    normalized_messages,
-                    unpack=False,
+                scope = sentry_sdk.get_current_scope()
+                messages_data = truncate_and_annotate_messages(
+                    normalized_messages, span, scope
                 )
+                if messages_data is not None:
+                    set_data_normalized(
+                        span,
+                        SPANDATA.GEN_AI_REQUEST_MESSAGES,
+                        messages_data,
+                        unpack=False,
+                    )
 
     def on_chat_model_end(self, response, *, run_id, **kwargs):
         # type: (SentryLangchainCallback, LLMResult, UUID, Any) -> Any
@@ -758,12 +774,17 @@ def _wrap_agent_executor_invoke(f):
                 and integration.include_prompts
             ):
                 normalized_messages = normalize_message_roles([input])
-                set_data_normalized(
-                    span,
-                    SPANDATA.GEN_AI_REQUEST_MESSAGES,
-                    normalized_messages,
-                    unpack=False,
+                scope = sentry_sdk.get_current_scope()
+                messages_data = truncate_and_annotate_messages(
+                    normalized_messages, span, scope
                 )
+                if messages_data is not None:
+                    set_data_normalized(
+                        span,
+                        SPANDATA.GEN_AI_REQUEST_MESSAGES,
+                        messages_data,
+                        unpack=False,
+                    )
 
             output = result.get("output")
             if (
@@ -813,12 +834,17 @@ def _wrap_agent_executor_stream(f):
             and integration.include_prompts
         ):
             normalized_messages = normalize_message_roles([input])
-            set_data_normalized(
-                span,
-                SPANDATA.GEN_AI_REQUEST_MESSAGES,
-                normalized_messages,
-                unpack=False,
+            scope = sentry_sdk.get_current_scope()
+            messages_data = truncate_and_annotate_messages(
+                normalized_messages, span, scope
             )
+            if messages_data is not None:
+                set_data_normalized(
+                    span,
+                    SPANDATA.GEN_AI_REQUEST_MESSAGES,
+                    messages_data,
+                    unpack=False,
+                )
 
         # Run the agent
         result = f(self, *args, **kwargs)

sentry_sdk/integrations/langgraph.py

@@ -2,7 +2,11 @@ from functools import wraps
 from typing import Any, Callable, List, Optional
 
 import sentry_sdk
-from sentry_sdk.ai.utils import set_data_normalized, normalize_message_roles
+from sentry_sdk.ai.utils import (
+    set_data_normalized,
+    normalize_message_roles,
+    truncate_and_annotate_messages,
+)
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.scope import should_send_default_pii
@@ -181,12 +185,17 @@ def _wrap_pregel_invoke(f):
                 input_messages = _parse_langgraph_messages(args[0])
                 if input_messages:
                     normalized_input_messages = normalize_message_roles(input_messages)
-                    set_data_normalized(
-                        span,
-                        SPANDATA.GEN_AI_REQUEST_MESSAGES,
-                        normalized_input_messages,
-                        unpack=False,
+                    scope = sentry_sdk.get_current_scope()
+                    messages_data = truncate_and_annotate_messages(
+                        normalized_input_messages, span, scope
                     )
+                    if messages_data is not None:
+                        set_data_normalized(
+                            span,
+                            SPANDATA.GEN_AI_REQUEST_MESSAGES,
+                            messages_data,
+                            unpack=False,
+                        )
 
             result = f(self, *args, **kwargs)
 
@@ -232,12 +241,17 @@ def _wrap_pregel_ainvoke(f):
                 input_messages = _parse_langgraph_messages(args[0])
                 if input_messages:
                     normalized_input_messages = normalize_message_roles(input_messages)
-                    set_data_normalized(
-                        span,
-                        SPANDATA.GEN_AI_REQUEST_MESSAGES,
-                        normalized_input_messages,
-                        unpack=False,
+                    scope = sentry_sdk.get_current_scope()
+                    messages_data = truncate_and_annotate_messages(
+                        normalized_input_messages, span, scope
                     )
+                    if messages_data is not None:
+                        set_data_normalized(
+                            span,
+                            SPANDATA.GEN_AI_REQUEST_MESSAGES,
+                            messages_data,
+                            unpack=False,
+                        )
 
             result = await f(self, *args, **kwargs)
 

sentry_sdk/integrations/litellm.py

@@ -3,7 +3,11 @@ from typing import TYPE_CHECKING
 import sentry_sdk
 from sentry_sdk import consts
 from sentry_sdk.ai.monitoring import record_token_usage
-from sentry_sdk.ai.utils import get_start_span_function, set_data_normalized
+from sentry_sdk.ai.utils import (
+    get_start_span_function,
+    set_data_normalized,
+    truncate_and_annotate_messages,
+)
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.scope import should_send_default_pii
@@ -48,8 +52,11 @@ def _input_callback(kwargs):
         model = full_model
         provider = "unknown"
 
-    messages = kwargs.get("messages", [])
-    operation = "chat" if messages else "embeddings"
+    call_type = kwargs.get("call_type", None)
+    if call_type == "embedding":
+        operation = "embeddings"
+    else:
+        operation = "chat"
 
     # Start a new span/transaction
     span = get_start_span_function()(
@@ -71,10 +78,14 @@ def _input_callback(kwargs):
     set_data_normalized(span, SPANDATA.GEN_AI_OPERATION_NAME, operation)
 
     # Record messages if allowed
+    messages = kwargs.get("messages", [])
     if messages and should_send_default_pii() and integration.include_prompts:
-        set_data_normalized(
-            span, SPANDATA.GEN_AI_REQUEST_MESSAGES, messages, unpack=False
-        )
+        scope = sentry_sdk.get_current_scope()
+        messages_data = truncate_and_annotate_messages(messages, span, scope)
+        if messages_data is not None:
+            set_data_normalized(
+                span, SPANDATA.GEN_AI_REQUEST_MESSAGES, messages_data, unpack=False
+            )
 
     # Record other parameters
     params = {