sentry-sdk 2.39.0__tar.gz → 2.40.0__tar.gz

{sentry_sdk-2.39.0/sentry_sdk.egg-info → sentry_sdk-2.40.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-sdk
-Version: 2.39.0
+Version: 2.40.0
 Summary: Python client for Sentry (https://sentry.io)
 Home-page: https://github.com/getsentry/sentry-python
 Author: Sentry Team and Contributors
@@ -76,6 +76,8 @@ Provides-Extra: langgraph
 Requires-Dist: langgraph>=0.6.6; extra == "langgraph"
 Provides-Extra: launchdarkly
 Requires-Dist: launchdarkly-server-sdk>=9.8.0; extra == "launchdarkly"
+Provides-Extra: litellm
+Requires-Dist: litellm>=1.77.5; extra == "litellm"
 Provides-Extra: litestar
 Requires-Dist: litestar>=2.0.0; extra == "litestar"
 Provides-Extra: loguru

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/pyproject.toml

@@ -1,19 +1,3 @@
-#
-# Tool: Black
-#
-
-[tool.black]
-# 'extend-exclude' excludes files or directories in addition to the defaults
-extend-exclude = '''
-# A regex preceded with ^/ will apply only to files and directories
-# in the root of the project.
-(
-    .*_pb2.py  # exclude autogenerated Protocol Buffer files anywhere in the project
-    | .*_pb2_grpc.py  # exclude autogenerated Protocol Buffer files anywhere in the project
-)
-'''
-
-
 #
 # Tool: Coverage
 #
@@ -195,30 +179,53 @@ ignore_missing_imports = true
 module = "agents.*"
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = "dramatiq.*"
+ignore_missing_imports = true
+
 #
-# Tool: Flake8
+# Tool: Ruff (linting and formatting)
 #
 
-[tool.flake8]
-extend-ignore = [
-  # Handled by black (Whitespace before ':' -- handled by black)
-  "E203",
-  # Handled by black (Line too long)
-  "E501",
-  # Sometimes not possible due to execution order (Module level import is not at top of file)
-  "E402",
-  # I don't care (Do not assign a lambda expression, use a def)
-  "E731",
-  # does not apply to Python 2 (redundant exception types by flake8-bugbear)
-  "B014",
-  # I don't care (Lowercase imported as non-lowercase by pep8-naming)
-  "N812",
-  # is a worse version of and conflicts with B902 (first argument of a classmethod should be named cls)
-  "N804",
+[tool.ruff]
+# Target Python 3.7+ (minimum version supported by ruff)
+target-version = "py37"
+
+# Exclude files and directories
+extend-exclude = [
+    "*_pb2.py",     # Protocol Buffer files (covers all pb2 files including grpc_test_service_pb2.py)
+    "*_pb2_grpc.py", # Protocol Buffer files (covers all pb2_grpc files including grpc_test_service_pb2_grpc.py)
+    "checkouts",    # From flake8
+    "lol*",         # From flake8
+]
+
+[tool.ruff.lint]
+# Match flake8's default rule selection exactly
+# Flake8 by default only enables E and W (pycodestyle) + F (pyflakes)
+select = [
+    "E",   # pycodestyle errors (same as flake8 default)
+    "W",   # pycodestyle warnings (same as flake8 default)
+    "F",   # Pyflakes (same as flake8 default)
+    # Note: B and N rules are NOT enabled by default in flake8
+    # They were only active through the plugins, which may not have been fully enabled
 ]
-extend-exclude = ["checkouts", "lol*"]
-exclude = [
-  # gRCP generated files
-  "grpc_test_service_pb2.py",
-  "grpc_test_service_pb2_grpc.py",
+
+# Use ONLY the same ignores as the original flake8 config + compatibility for this codebase
+ignore = [
+    "E203", # Whitespace before ':'
+    "E501", # Line too long
+    "E402", # Module level import not at top of file
+    "E731", # Do not assign a lambda expression, use a def
+    "B014", # Redundant exception types
+    "N812", # Lowercase imported as non-lowercase
+    "N804", # First argument of classmethod should be named cls
+
+    # Additional ignores for codebase compatibility
+    "F401", # Unused imports - many in TYPE_CHECKING blocks used for type comments
+    "E721", # Use isinstance instead of type() == - existing pattern in this codebase
 ]
+
+[tool.ruff.format]
+# ruff format already excludes the same files as specified in extend-exclude
+# Ensure Python 3.7 compatibility - avoid using Python 3.9+ syntax features
+skip-magic-trailing-comma = false

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/client.py

@@ -178,9 +178,7 @@ class BaseClient:
 
     def __init__(self, options=None):
         # type: (Optional[Dict[str, Any]]) -> None
-        self.options = (
-            options if options is not None else DEFAULT_OPTIONS
-        )  # type: Dict[str, Any]
+        self.options = options if options is not None else DEFAULT_OPTIONS  # type: Dict[str, Any]
 
         self.transport = None  # type: Optional[Transport]
         self.monitor = None  # type: Optional[Monitor]
@@ -956,7 +954,7 @@ class _Client(BaseClient):
         debug = self.options.get("debug", False)
         if debug:
             logger.debug(
-                f'[Sentry Logs] [{log.get("severity_text")}] {log.get("body")}'
+                f"[Sentry Logs] [{log.get('severity_text')}] {log.get('body')}"
             )
 
         before_send_log = get_before_send_log(self.options)
@@ -970,7 +968,8 @@ class _Client(BaseClient):
             self.log_batcher.add(log)
 
     def capture_session(
-        self, session  # type: Session
+        self,
+        session,  # type: Session
     ):
         # type: (...) -> None
         if not session.release:
@@ -991,7 +990,8 @@ class _Client(BaseClient):
             ...
 
     def get_integration(
-        self, name_or_class  # type: Union[str, Type[Integration]]
+        self,
+        name_or_class,  # type: Union[str, Type[Integration]]
     ):
         # type: (...) -> Optional[Integration]
         """Returns the integration for this client by name or class.

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/consts.py

@@ -40,6 +40,7 @@ if TYPE_CHECKING:
     from typing import Any
     from typing import Sequence
     from typing import Tuple
+    from typing import AbstractSet
     from typing_extensions import Literal
     from typing_extensions import TypedDict
 
@@ -838,6 +839,7 @@ class OP:
     QUEUE_TASK_HUEY = "queue.task.huey"
     QUEUE_SUBMIT_RAY = "queue.submit.ray"
     QUEUE_TASK_RAY = "queue.task.ray"
+    QUEUE_TASK_DRAMATIQ = "queue.task.dramatiq"
     SUBPROCESS = "subprocess"
     SUBPROCESS_WAIT = "subprocess.wait"
     SUBPROCESS_COMMUNICATE = "subprocess.communicate"
@@ -852,7 +854,6 @@ class OP:
 # This type exists to trick mypy and PyCharm into thinking `init` and `Client`
 # take these arguments (even though they take opaque **kwargs)
 class ClientConstructor:
-
     def __init__(
         self,
         dsn=None,  # type: Optional[str]
@@ -920,6 +921,7 @@ class ClientConstructor:
         max_stack_frames=DEFAULT_MAX_STACK_FRAMES,  # type: Optional[int]
         enable_logs=False,  # type: bool
         before_send_log=None,  # type: Optional[Callable[[Log, Hint], Optional[Log]]]
+        trace_ignore_status_codes=frozenset(),  # type: AbstractSet[int]
     ):
         # type: (...) -> None
         """Initialize the Sentry SDK with the given parameters. All parameters described here can be used in a call to `sentry_sdk.init()`.
@@ -1308,6 +1310,14 @@ class ClientConstructor:
             function will be retained. If the function returns None, the log will
             not be sent to Sentry.
 
+        :param trace_ignore_status_codes: An optional property that disables tracing for
+            HTTP requests with certain status codes.
+
+            Requests are not traced if the status code is contained in the provided set.
+
+            If `trace_ignore_status_codes` is not provided, requests with any status code
+            may be traced.
+
         :param _experiments:
         """
         pass
@@ -1333,4 +1343,4 @@ DEFAULT_OPTIONS = _get_default_options()
 del _get_default_options
 
 
-VERSION = "2.39.0"
+VERSION = "2.40.0"

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/envelope.py

@@ -57,25 +57,29 @@ class Envelope:
         )
 
     def add_event(
-        self, event  # type: Event
+        self,
+        event,  # type: Event
     ):
         # type: (...) -> None
         self.add_item(Item(payload=PayloadRef(json=event), type="event"))
 
     def add_transaction(
-        self, transaction  # type: Event
+        self,
+        transaction,  # type: Event
     ):
         # type: (...) -> None
         self.add_item(Item(payload=PayloadRef(json=transaction), type="transaction"))
 
     def add_profile(
-        self, profile  # type: Any
+        self,
+        profile,  # type: Any
     ):
         # type: (...) -> None
         self.add_item(Item(payload=PayloadRef(json=profile), type="profile"))
 
     def add_profile_chunk(
-        self, profile_chunk  # type: Any
+        self,
+        profile_chunk,  # type: Any
     ):
         # type: (...) -> None
         self.add_item(
@@ -87,13 +91,15 @@ class Envelope:
         )
 
     def add_checkin(
-        self, checkin  # type: Any
+        self,
+        checkin,  # type: Any
     ):
         # type: (...) -> None
         self.add_item(Item(payload=PayloadRef(json=checkin), type="check_in"))
 
     def add_session(
-        self, session  # type: Union[Session, Any]
+        self,
+        session,  # type: Union[Session, Any]
     ):
         # type: (...) -> None
         if isinstance(session, Session):
@@ -101,13 +107,15 @@ class Envelope:
         self.add_item(Item(payload=PayloadRef(json=session), type="session"))
 
     def add_sessions(
-        self, sessions  # type: Any
+        self,
+        sessions,  # type: Any
     ):
         # type: (...) -> None
         self.add_item(Item(payload=PayloadRef(json=sessions), type="sessions"))
 
     def add_item(
-        self, item  # type: Item
+        self,
+        item,  # type: Item
     ):
         # type: (...) -> None
         self.items.append(item)
@@ -133,7 +141,8 @@ class Envelope:
         return iter(self.items)
 
     def serialize_into(
-        self, f  # type: Any
+        self,
+        f,  # type: Any
     ):
         # type: (...) -> None
         f.write(json_dumps(self.headers))
@@ -149,7 +158,8 @@ class Envelope:
 
     @classmethod
     def deserialize_from(
-        cls, f  # type: Any
+        cls,
+        f,  # type: Any
     ):
         # type: (...) -> Envelope
         headers = parse_json(f.readline())
@@ -163,7 +173,8 @@ class Envelope:
 
     @classmethod
     def deserialize(
-        cls, bytes  # type: bytes
+        cls,
+        bytes,  # type: bytes
     ):
         # type: (...) -> Envelope
         return cls.deserialize_from(io.BytesIO(bytes))
@@ -307,7 +318,8 @@ class Item:
         return None
 
     def serialize_into(
-        self, f  # type: Any
+        self,
+        f,  # type: Any
     ):
         # type: (...) -> None
         headers = dict(self.headers)
@@ -326,7 +338,8 @@ class Item:
 
     @classmethod
     def deserialize_from(
-        cls, f  # type: Any
+        cls,
+        f,  # type: Any
     ):
         # type: (...) -> Optional[Item]
         line = f.readline().rstrip()
@@ -349,7 +362,8 @@ class Item:
 
     @classmethod
     def deserialize(
-        cls, bytes  # type: bytes
+        cls,
+        bytes,  # type: bytes
     ):
         # type: (...) -> Optional[Item]
         return cls.deserialize_from(io.BytesIO(bytes))

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/feature_flags.py

@@ -15,7 +15,6 @@ DEFAULT_FLAG_CAPACITY = 100
 
 
 class FlagBuffer:
-
     def __init__(self, capacity):
         # type: (int) -> None
         self.capacity = capacity

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/hub.py

@@ -205,7 +205,8 @@ class Hub(with_metaclass(HubMeta)):  # type: ignore
         scope._isolation_scope.set(old_isolation_scope)
 
     def run(
-        self, callback  # type: Callable[[], T]
+        self,
+        callback,  # type: Callable[[], T]
     ):
         # type: (...) -> T
         """
@@ -219,7 +220,8 @@ class Hub(with_metaclass(HubMeta)):  # type: ignore
             return callback()
 
     def get_integration(
-        self, name_or_class  # type: Union[str, Type[Integration]]
+        self,
+        name_or_class,  # type: Union[str, Type[Integration]]
     ):
         # type: (...) -> Any
         """
@@ -277,7 +279,8 @@ class Hub(with_metaclass(HubMeta)):  # type: ignore
         return self._last_event_id
 
     def bind_client(
-        self, new  # type: Optional[BaseClient]
+        self,
+        new,  # type: Optional[BaseClient]
     ):
         # type: (...) -> None
         """
@@ -430,7 +433,7 @@ class Hub(with_metaclass(HubMeta)):  # type: ignore
         transaction=None,
         instrumenter=INSTRUMENTER.SENTRY,
         custom_sampling_context=None,
-        **kwargs
+        **kwargs,
     ):
         # type: (Optional[Transaction], str, Optional[SamplingContext], Unpack[TransactionKwargs]) -> Union[Transaction, NoOpSpan]
         """
@@ -487,14 +490,16 @@ class Hub(with_metaclass(HubMeta)):  # type: ignore
 
     @overload
     def push_scope(
-        self, callback=None  # type: Optional[None]
+        self,
+        callback=None,  # type: Optional[None]
     ):
         # type: (...) -> ContextManager[Scope]
         pass
 
     @overload
     def push_scope(  # noqa: F811
-        self, callback  # type: Callable[[Scope], None]
+        self,
+        callback,  # type: Callable[[Scope], None]
     ):
         # type: (...) -> None
         pass
@@ -540,14 +545,16 @@ class Hub(with_metaclass(HubMeta)):  # type: ignore
 
     @overload
     def configure_scope(
-        self, callback=None  # type: Optional[None]
+        self,
+        callback=None,  # type: Optional[None]
     ):
         # type: (...) -> ContextManager[Scope]
         pass
 
     @overload
     def configure_scope(  # noqa: F811
-        self, callback  # type: Callable[[Scope], None]
+        self,
+        callback,  # type: Callable[[Scope], None]
     ):
         # type: (...) -> None
         pass
@@ -587,7 +594,8 @@ class Hub(with_metaclass(HubMeta)):  # type: ignore
         return inner()
 
     def start_session(
-        self, session_mode="application"  # type: str
+        self,
+        session_mode="application",  # type: str
     ):
         # type: (...) -> None
         """

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/integrations/__init__.py

@@ -146,6 +146,7 @@ _MIN_VERSIONS = {
     "langchain": (0, 1, 0),
     "langgraph": (0, 6, 6),
     "launchdarkly": (9, 8, 0),
+    "litellm": (1, 77, 5),
     "loguru": (0, 7, 0),
     "openai": (1, 0, 0),
     "openai_agents": (0, 0, 19),

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/integrations/asgi.py

@@ -233,14 +233,15 @@ class SentryAsgiMiddleware:
                     if transaction:
                         transaction.set_tag("asgi.type", ty)
 
-                    with (
+                    transaction_context = (
                         sentry_sdk.start_transaction(
                             transaction,
                             custom_sampling_context={"asgi_scope": scope},
                         )
                         if transaction is not None
                         else nullcontext()
-                    ):
+                    )
+                    with transaction_context:
                         try:
 
                             async def _sentry_wrapped_send(event):

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/integrations/dramatiq.py

@@ -1,18 +1,31 @@
 import json
 
 import sentry_sdk
-from sentry_sdk.integrations import Integration
+from sentry_sdk.consts import OP, SPANSTATUS
+from sentry_sdk.api import continue_trace, get_baggage, get_traceparent
+from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.integrations._wsgi_common import request_body_within_bounds
+from sentry_sdk.tracing import (
+    BAGGAGE_HEADER_NAME,
+    SENTRY_TRACE_HEADER_NAME,
+    TransactionSource,
+)
 from sentry_sdk.utils import (
     AnnotatedValue,
     capture_internal_exceptions,
     event_from_exception,
 )
+from typing import TypeVar
+
+R = TypeVar("R")
 
-from dramatiq.broker import Broker  # type: ignore
-from dramatiq.message import Message  # type: ignore
-from dramatiq.middleware import Middleware, default_middleware  # type: ignore
-from dramatiq.errors import Retry  # type: ignore
+try:
+    from dramatiq.broker import Broker
+    from dramatiq.middleware import Middleware, default_middleware
+    from dramatiq.errors import Retry
+    from dramatiq.message import Message
+except ImportError:
+    raise DidNotEnable("Dramatiq is not installed")
 
 from typing import TYPE_CHECKING
 
@@ -34,10 +47,12 @@ class DramatiqIntegration(Integration):
     """
 
     identifier = "dramatiq"
+    origin = f"auto.queue.{identifier}"
 
     @staticmethod
     def setup_once():
         # type: () -> None
+
         _patch_dramatiq_broker()
 
 
@@ -85,22 +100,54 @@ class SentryMiddleware(Middleware):  # type: ignore[misc]
     DramatiqIntegration.
     """
 
-    def before_process_message(self, broker, message):
-        # type: (Broker, Message) -> None
+    SENTRY_HEADERS_NAME = "_sentry_headers"
+
+    def before_enqueue(self, broker, message, delay):
+        # type: (Broker, Message[R], int) -> None
         integration = sentry_sdk.get_client().get_integration(DramatiqIntegration)
         if integration is None:
             return
 
-        message._scope_manager = sentry_sdk.new_scope()
-        message._scope_manager.__enter__()
+        message.options[self.SENTRY_HEADERS_NAME] = {
+            BAGGAGE_HEADER_NAME: get_baggage(),
+            SENTRY_TRACE_HEADER_NAME: get_traceparent(),
+        }
+
+    def before_process_message(self, broker, message):
+        # type: (Broker, Message[R]) -> None
+        integration = sentry_sdk.get_client().get_integration(DramatiqIntegration)
+        if integration is None:
+            return
 
-        scope = sentry_sdk.get_current_scope()
-        scope.set_transaction_name(message.actor_name)
+        message._scope_manager = sentry_sdk.isolation_scope()
+        scope = message._scope_manager.__enter__()
+        scope.clear_breadcrumbs()
         scope.set_extra("dramatiq_message_id", message.message_id)
         scope.add_event_processor(_make_message_event_processor(message, integration))
 
+        sentry_headers = message.options.get(self.SENTRY_HEADERS_NAME) or {}
+        if "retries" in message.options:
+            # start new trace in case of retrying
+            sentry_headers = {}
+
+        transaction = continue_trace(
+            sentry_headers,
+            name=message.actor_name,
+            op=OP.QUEUE_TASK_DRAMATIQ,
+            source=TransactionSource.TASK,
+            origin=DramatiqIntegration.origin,
+        )
+        transaction.set_status(SPANSTATUS.OK)
+        sentry_sdk.start_transaction(
+            transaction,
+            name=message.actor_name,
+            op=OP.QUEUE_TASK_DRAMATIQ,
+            source=TransactionSource.TASK,
+        )
+        transaction.__enter__()
+
     def after_process_message(self, broker, message, *, result=None, exception=None):
-        # type: (Broker, Message, Any, Optional[Any], Optional[Exception]) -> None
+        # type: (Broker, Message[R], Optional[Any], Optional[Exception]) -> None
         integration = sentry_sdk.get_client().get_integration(DramatiqIntegration)
         if integration is None:
             return
@@ -108,27 +155,38 @@ class SentryMiddleware(Middleware):  # type: ignore[misc]
         actor = broker.get_actor(message.actor_name)
         throws = message.options.get("throws") or actor.options.get("throws")
 
-        try:
-            if (
-                exception is not None
-                and not (throws and isinstance(exception, throws))
-                and not isinstance(exception, Retry)
-            ):
-                event, hint = event_from_exception(
-                    exception,
-                    client_options=sentry_sdk.get_client().options,
-                    mechanism={
-                        "type": DramatiqIntegration.identifier,
-                        "handled": False,
-                    },
-                )
-                sentry_sdk.capture_event(event, hint=hint)
-        finally:
-            message._scope_manager.__exit__(None, None, None)
+        scope_manager = message._scope_manager
+        transaction = sentry_sdk.get_current_scope().transaction
+        if not transaction:
+            return None
+
+        is_event_capture_required = (
+            exception is not None
+            and not (throws and isinstance(exception, throws))
+            and not isinstance(exception, Retry)
+        )
+        if not is_event_capture_required:
+            # normal transaction finish
+            transaction.__exit__(None, None, None)
+            scope_manager.__exit__(None, None, None)
+            return
+
+        event, hint = event_from_exception(
+            exception,  # type: ignore[arg-type]
+            client_options=sentry_sdk.get_client().options,
+            mechanism={
+                "type": DramatiqIntegration.identifier,
+                "handled": False,
+            },
+        )
+        sentry_sdk.capture_event(event, hint=hint)
+        # transaction error
+        transaction.__exit__(type(exception), exception, None)
+        scope_manager.__exit__(type(exception), exception, None)
 
 
 def _make_message_event_processor(message, integration):
-    # type: (Message, DramatiqIntegration) -> Callable[[Event, Hint], Optional[Event]]
+    # type: (Message[R], DramatiqIntegration) -> Callable[[Event, Hint], Optional[Event]]
 
     def inner(event, hint):
         # type: (Event, Hint) -> Optional[Event]
@@ -142,7 +200,7 @@ def _make_message_event_processor(message, integration):
 
 class DramatiqMessageExtractor:
     def __init__(self, message):
-        # type: (Message) -> None
+        # type: (Message[R]) -> None
         self.message_data = dict(message.asdict())
 
     def content_length(self):

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/integrations/grpc/aio/client.py

@@ -65,7 +65,8 @@ class SentryUnaryUnaryClientInterceptor(ClientInterceptor, UnaryUnaryClientInter
 
 
 class SentryUnaryStreamClientInterceptor(
-    ClientInterceptor, UnaryStreamClientInterceptor  # type: ignore
+    ClientInterceptor,
+    UnaryStreamClientInterceptor,  # type: ignore
 ):
     async def intercept_unary_stream(
         self,

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/integrations/grpc/client.py

@@ -19,7 +19,8 @@ except ImportError:
 
 
 class ClientInterceptor(
-    grpc.UnaryUnaryClientInterceptor, grpc.UnaryStreamClientInterceptor  # type: ignore
+    grpc.UnaryUnaryClientInterceptor,  # type: ignore
+    grpc.UnaryStreamClientInterceptor,  # type: ignore
 ):
     _is_intercepted = False
 
@@ -60,9 +61,7 @@ class ClientInterceptor(
                 client_call_details
             )
 
-            response = continuation(
-                client_call_details, request
-            )  # type: UnaryStreamCall
+            response = continuation(client_call_details, request)  # type: UnaryStreamCall
             # Setting code on unary-stream leads to execution getting stuck
             # span.set_data("code", response.code().name)
 

{sentry_sdk-2.39.0 → sentry_sdk-2.40.0}/sentry_sdk/integrations/langchain.py

@@ -554,7 +554,6 @@ def _simplify_langchain_tools(tools):
     for tool in tools:
         try:
             if isinstance(tool, dict):
-
                 if "function" in tool and isinstance(tool["function"], dict):
                     func = tool["function"]
                     simplified_tool = {