Merge branch 'master' of github.com:getsentry/sentry-python into txiao/feat/continuous-profiling-lifecycle

Author: Zylphrex

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
+        uses: actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1.11.2
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

sentry_sdk/integrations/grpc/__init__.py

@@ -81,7 +81,7 @@ def _wrap_channel_async(func: Callable[P, AsyncChannel]) -> Callable[P, AsyncCha
     "Wrapper for asynchronous secure and insecure channel."
 
     @wraps(func)
-    def patched_channel(
+    def patched_channel(  # type: ignore
         *args: P.args,
         interceptors: Optional[Sequence[grpc.aio.ClientInterceptor]] = None,
         **kwargs: P.kwargs,
@@ -100,7 +100,7 @@ def _wrap_sync_server(func: Callable[P, Server]) -> Callable[P, Server]:
     """Wrapper for synchronous server."""
 
     @wraps(func)
-    def patched_server(
+    def patched_server(  # type: ignore
         *args: P.args,
         interceptors: Optional[Sequence[grpc.ServerInterceptor]] = None,
         **kwargs: P.kwargs,
@@ -121,7 +121,7 @@ def _wrap_async_server(func: Callable[P, AsyncServer]) -> Callable[P, AsyncServe
     """Wrapper for asynchronous server."""
 
     @wraps(func)
-    def patched_aio_server(
+    def patched_aio_server(  # type: ignore
         *args: P.args,
         interceptors: Optional[Sequence[grpc.ServerInterceptor]] = None,
         **kwargs: P.kwargs,

sentry_sdk/integrations/litestar.py

@@ -1,6 +1,11 @@
+from collections.abc import Set
 import sentry_sdk
 from sentry_sdk.consts import OP
-from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.integrations import (
+    _DEFAULT_FAILED_REQUEST_STATUS_CODES,
+    DidNotEnable,
+    Integration,
+)
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
 from sentry_sdk.integrations.logging import ignore_logger
 from sentry_sdk.scope import should_send_default_pii
@@ -17,6 +22,7 @@
     from litestar.middleware import DefineMiddleware  # type: ignore
     from litestar.routes.http import HTTPRoute  # type: ignore
     from litestar.data_extractors import ConnectionDataExtractor  # type: ignore
+    from litestar.exceptions import HTTPException  # type: ignore
 except ImportError:
     raise DidNotEnable("Litestar is not installed")
 
@@ -45,6 +51,12 @@ class LitestarIntegration(Integration):
     identifier = "litestar"
     origin = f"auto.http.{identifier}"
 
+    def __init__(
+        self,
+        failed_request_status_codes=_DEFAULT_FAILED_REQUEST_STATUS_CODES,  # type: Set[int]
+    ) -> None:
+        self.failed_request_status_codes = failed_request_status_codes
+
     @staticmethod
     def setup_once():
         # type: () -> None
@@ -277,6 +289,14 @@ def exception_handler(exc, scope):
         sentry_scope = sentry_sdk.get_isolation_scope()
         sentry_scope.set_user(user_info)
 
+    if isinstance(exc, HTTPException):
+        integration = sentry_sdk.get_client().get_integration(LitestarIntegration)
+        if (
+            integration is not None
+            and exc.status_code not in integration.failed_request_status_codes
+        ):
+            return
+
     event, hint = event_from_exception(
         exc,
         client_options=sentry_sdk.get_client().options,

sentry_sdk/integrations/socket.py

@@ -27,15 +27,19 @@ def setup_once():
 
 
 def _get_span_description(host, port):
-    # type: (Union[bytes, str, None], Union[str, int, None]) -> str
+    # type: (Union[bytes, str, None], Union[bytes, str, int, None]) -> str
 
     try:
         host = host.decode()  # type: ignore
     except (UnicodeDecodeError, AttributeError):
         pass
 
-    description = "%s:%s" % (host, port)  # type: ignore
+    try:
+        port = port.decode()  # type: ignore
+    except (UnicodeDecodeError, AttributeError):
+        pass
 
+    description = "%s:%s" % (host, port)  # type: ignore
     return description
 
 
@@ -74,7 +78,7 @@ def _patch_getaddrinfo():
     real_getaddrinfo = socket.getaddrinfo
 
     def getaddrinfo(host, port, family=0, type=0, proto=0, flags=0):
-        # type: (Union[bytes, str, None], Union[str, int, None], int, int, int, int) -> List[Tuple[AddressFamily, SocketKind, int, str, Union[Tuple[str, int], Tuple[str, int, int, int]]]]
+        # type: (Union[bytes, str, None], Union[bytes, str, int, None], int, int, int, int) -> List[Tuple[AddressFamily, SocketKind, int, str, Union[Tuple[str, int], Tuple[str, int, int, int], Tuple[int, bytes]]]]
         integration = sentry_sdk.get_client().get_integration(SocketIntegration)
         if integration is None:
             return real_getaddrinfo(host, port, family, type, proto, flags)
@@ -89,4 +93,4 @@ def getaddrinfo(host, port, family=0, type=0, proto=0, flags=0):
 
             return real_getaddrinfo(host, port, family, type, proto, flags)
 
-    socket.getaddrinfo = getaddrinfo  # type: ignore
+    socket.getaddrinfo = getaddrinfo

sentry_sdk/integrations/tornado.py

@@ -79,7 +79,7 @@ async def sentry_execute_request_handler(self, *args, **kwargs):
         else:
 
             @coroutine  # type: ignore
-            def sentry_execute_request_handler(self, *args, **kwargs):
+            def sentry_execute_request_handler(self, *args, **kwargs):  # type: ignore
                 # type: (RequestHandler, *Any, **Any) -> Any
                 with _handle_request_impl(self):
                     result = yield from old_execute(self, *args, **kwargs)

sentry_sdk/tracing.py

@@ -14,6 +14,7 @@
     is_valid_sample_rate,
     logger,
     nanosecond_time,
+    should_be_treated_as_error,
 )
 
 from typing import TYPE_CHECKING
@@ -378,7 +379,7 @@ def __enter__(self):
 
     def __exit__(self, ty, value, tb):
         # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
-        if value is not None:
+        if value is not None and should_be_treated_as_error(ty, value):
             self.set_status(SPANSTATUS.INTERNAL_ERROR)
 
         scope, old_span = self._context_manager_state

sentry_sdk/utils.py

@@ -1879,3 +1879,12 @@ def get_current_thread_meta(thread=None):
 
     # we've tried everything, time to give up
     return None, None
+
+
+def should_be_treated_as_error(ty, value):
+    # type: (Any, Any) -> bool
+    if ty == SystemExit and hasattr(value, "code") and value.code in (0, None):
+        # https://docs.python.org/3/library/exceptions.html#SystemExit
+        return False
+
+    return True

tests/integrations/conftest.py

@@ -32,3 +32,24 @@ def capture_event_scope(self, event, hint=None, scope=None):
         return errors
 
     return inner
+
+
+parametrize_test_configurable_status_codes = pytest.mark.parametrize(
+    ("failed_request_status_codes", "status_code", "expected_error"),
+    (
+        (None, 500, True),
+        (None, 400, False),
+        ({500, 501}, 500, True),
+        ({500, 501}, 401, False),
+        ({*range(400, 500)}, 401, True),
+        ({*range(400, 500)}, 500, False),
+        ({*range(400, 600)}, 300, False),
+        ({*range(400, 600)}, 403, True),
+        ({*range(400, 600)}, 503, True),
+        ({*range(400, 403), 500, 501}, 401, True),
+        ({*range(400, 403), 500, 501}, 405, False),
+        ({*range(400, 403), 500, 501}, 501, True),
+        ({*range(400, 403), 500, 501}, 503, False),
+        (set(), 500, False),
+    ),
+)

tests/integrations/fastapi/test_fastapi.py

@@ -19,6 +19,7 @@
 
 FASTAPI_VERSION = parse_version(fastapi.__version__)
 
+from tests.integrations.conftest import parametrize_test_configurable_status_codes
 from tests.integrations.starlette import test_starlette
 
 
@@ -650,7 +651,7 @@ def test_transaction_http_method_custom(sentry_init, capture_events):
     assert event2["request"]["method"] == "HEAD"
 
 
-@test_starlette.parametrize_test_configurable_status_codes
+@parametrize_test_configurable_status_codes
 def test_configurable_status_codes(
     sentry_init,
     capture_events,

tests/integrations/litestar/test_litestar.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 import functools
 
+from litestar.exceptions import HTTPException
 import pytest
 
 from sentry_sdk import capture_message
@@ -16,6 +17,8 @@
 from litestar.middleware.session.server_side import ServerSideSessionConfig
 from litestar.testing import TestClient
 
+from tests.integrations.conftest import parametrize_test_configurable_status_codes
+
 
 def litestar_app_factory(middleware=None, debug=True, exception_handlers=None):
     class MyController(Controller):
@@ -396,3 +399,31 @@ async def __call__(self, scope, receive, send):
         }
     else:
         assert "user" not in event
+
+
+@parametrize_test_configurable_status_codes
+def test_configurable_status_codes(
+    sentry_init,
+    capture_events,
+    failed_request_status_codes,
+    status_code,
+    expected_error,
+):
+    integration_kwargs = (
+        {"failed_request_status_codes": failed_request_status_codes}
+        if failed_request_status_codes is not None
+        else {}
+    )
+    sentry_init(integrations=[LitestarIntegration(**integration_kwargs)])
+
+    events = capture_events()
+
+    @get("/error")
+    async def error() -> None:
+        raise HTTPException(status_code=status_code)
+
+    app = Litestar([error])
+    client = TestClient(app)
+    client.get("/error")
+
+    assert len(events) == int(expected_error)