Merge branch 'master' into potel-base

Author: sentrivana

sentry_sdk/_types.py

@@ -129,7 +129,7 @@ class SDKInfo(TypedDict):
             "contexts": dict[str, dict[str, object]],
             "dist": str,
             "duration": Optional[float],
-            "environment": str,
+            "environment": Optional[str],
             "errors": list[dict[str, Any]],  # TODO: We can expand on this type
             "event_id": str,
             "exception": dict[
@@ -146,7 +146,7 @@ class SDKInfo(TypedDict):
             "monitor_slug": Optional[str],
             "platform": Literal["python"],
             "profile": object,  # Should be sentry_sdk.profiler.Profile, but we can't import that here due to circular imports
-            "release": str,
+            "release": Optional[str],
             "request": dict[str, object],
             "sdk": Mapping[str, object],
             "server_name": str,

sentry_sdk/client.py

@@ -107,7 +107,7 @@ def _get_options(*args, **kwargs):
         rv["environment"] = os.environ.get("SENTRY_ENVIRONMENT") or "production"
 
     if rv["debug"] is None:
-        rv["debug"] = env_to_bool(os.environ.get("SENTRY_DEBUG", "False"), strict=True)
+        rv["debug"] = env_to_bool(os.environ.get("SENTRY_DEBUG"), strict=True) or False
 
     if rv["server_name"] is None and hasattr(socket, "gethostname"):
         rv["server_name"] = socket.gethostname()

sentry_sdk/integrations/_asgi_common.py

@@ -3,7 +3,7 @@
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.integrations._wsgi_common import _filter_headers
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 if TYPE_CHECKING:
     from typing import Any
@@ -37,8 +37,7 @@ def _get_url(asgi_scope, default_scheme=None, host=None):
     """
     Extract URL from the ASGI scope, without also including the querystring.
     """
-    scheme = asgi_scope.get("scheme", default_scheme)
-
+    scheme = cast(str, asgi_scope.get("scheme", default_scheme))
     server = asgi_scope.get("server", None)
     path = asgi_scope.get("root_path", "") + asgi_scope.get("path", "")
 

sentry_sdk/integrations/arq.py

@@ -225,7 +225,8 @@ def _sentry_create_worker(*args, **kwargs):
             ]
         if hasattr(settings_cls, "cron_jobs"):
             settings_cls.cron_jobs = [
-                _get_arq_cron_job(cron_job) for cron_job in settings_cls.cron_jobs
+                _get_arq_cron_job(cron_job)
+                for cron_job in (settings_cls.cron_jobs or [])
             ]
 
         if "functions" in kwargs:

sentry_sdk/integrations/django/asgi.py

@@ -241,9 +241,9 @@ async def __acall__(self, *args, **kwargs):
             middleware_span = _check_middleware_span(old_method=f)
 
             if middleware_span is None:
-                return await f(*args, **kwargs)
+                return await f(*args, **kwargs)  # type: ignore
 
             with middleware_span:
-                return await f(*args, **kwargs)
+                return await f(*args, **kwargs)  # type: ignore
 
     return SentryASGIMixin

sentry_sdk/integrations/grpc/__init__.py

@@ -6,6 +6,7 @@
 from grpc.aio import Server as AsyncServer
 
 from sentry_sdk.integrations import Integration
+from sentry_sdk.utils import parse_version
 
 from .client import ClientInterceptor
 from .server import ServerInterceptor
@@ -41,6 +42,8 @@ def __getitem__(self, _):
 
 P = ParamSpec("P")
 
+GRPC_VERSION = parse_version(grpc.__version__)
+
 
 def _wrap_channel_sync(func: Callable[P, Channel]) -> Callable[P, Channel]:
     "Wrapper for synchronous secure and insecure channel."
@@ -127,7 +130,21 @@ def patched_aio_server(  # type: ignore
         **kwargs: P.kwargs,
     ) -> Server:
         server_interceptor = AsyncServerInterceptor()
-        interceptors = (server_interceptor, *(interceptors or []))
+        interceptors = [
+            server_interceptor,
+            *(interceptors or []),
+        ]  # type: Sequence[grpc.ServerInterceptor]
+
+        try:
+            # We prefer interceptors as a list because of compatibility with
+            # opentelemetry https://github.com/getsentry/sentry-python/issues/4389
+            # However, prior to grpc 1.42.0, only tuples were accepted, so we
+            # have no choice there.
+            if GRPC_VERSION is not None and GRPC_VERSION < (1, 42, 0):
+                interceptors = tuple(interceptors)
+        except Exception:
+            pass
+
         return func(*args, interceptors=interceptors, **kwargs)  # type: ignore
 
     return patched_aio_server  # type: ignore

sentry_sdk/integrations/redis/_async_common.py

@@ -44,13 +44,20 @@ async def _sentry_execute(self, *args, **kwargs):
         ) as span:
             with capture_internal_exceptions():
                 span_data = get_db_data_fn(self)
+
+                try:
+                    command_seq = self._execution_strategy._command_queue
+                except AttributeError:
+                    if is_cluster:
+                        command_seq = self._command_stack
+                    else:
+                        command_seq = self.command_stack
+
                 pipeline_data = _get_pipeline_data(
                     is_cluster=is_cluster,
                     get_command_args_fn=get_command_args_fn,
                     is_transaction=False if is_cluster else self.is_transaction,
-                    command_stack=(
-                        self._command_stack if is_cluster else self.command_stack
-                    ),
+                    command_seq=command_seq,
                 )
                 _update_span(span, span_data, pipeline_data)
                 _create_breadcrumb("redis.pipeline.execute", span_data, pipeline_data)

sentry_sdk/integrations/redis/_sync_common.py

@@ -44,12 +44,17 @@ def sentry_patched_execute(self, *args, **kwargs):
             only_if_parent=True,
         ) as span:
             with capture_internal_exceptions():
+                try:
+                    command_seq = self._execution_strategy.command_queue
+                except AttributeError:
+                    command_seq = self.command_stack
+
                 span_data = get_db_data_fn(self)
                 pipeline_data = _get_pipeline_data(
                     is_cluster=is_cluster,
                     get_command_args_fn=get_command_args_fn,
                     is_transaction=False if is_cluster else self.transaction,
-                    command_stack=self.command_stack,
+                    command_seq=command_seq,
                 )
                 _update_span(span, span_data, pipeline_data)
                 _create_breadcrumb("redis.pipeline.execute", span_data, pipeline_data)

sentry_sdk/integrations/redis/redis_cluster.py

@@ -37,11 +37,17 @@ def _get_async_cluster_db_data(async_redis_cluster_instance):
 def _get_async_cluster_pipeline_db_data(async_redis_cluster_pipeline_instance):
     # type: (AsyncClusterPipeline[Any]) -> dict[str, Any]
     with capture_internal_exceptions():
-        return _get_async_cluster_db_data(
-            # the AsyncClusterPipeline has always had a `_client` attr but it is private so potentially problematic and mypy
-            # does not recognize it - see https://github.com/redis/redis-py/blame/v5.0.0/redis/asyncio/cluster.py#L1386
-            async_redis_cluster_pipeline_instance._client,  # type: ignore[attr-defined]
-        )
+        client = getattr(async_redis_cluster_pipeline_instance, "cluster_client", None)
+        if client is None:
+            # In older redis-py versions, the AsyncClusterPipeline had a `_client`
+            # attr but it is private so potentially problematic and mypy does not
+            # recognize it - see
+            # https://github.com/redis/redis-py/blame/v5.0.0/redis/asyncio/cluster.py#L1386
+            client = (
+                async_redis_cluster_pipeline_instance._client  # type: ignore[attr-defined]
+            )
+
+        return _get_async_cluster_db_data(client)
 
 
 def _get_cluster_db_data(redis_cluster_instance):

sentry_sdk/integrations/redis/utils.py

@@ -147,22 +147,22 @@ def _parse_rediscluster_command(command):
     return command.args
 
 
-def _get_pipeline_data(is_cluster, get_command_args_fn, is_transaction, command_stack):
+def _get_pipeline_data(is_cluster, get_command_args_fn, is_transaction, command_seq):
     # type: (bool, Any, bool, Sequence[Any]) -> dict[str, Any]
     data = {
         "redis.is_cluster": is_cluster,
         "redis.transaction": is_transaction,
     }  # type: dict[str, Any]
 
     commands = []
-    for i, arg in enumerate(command_stack):
+    for i, arg in enumerate(command_seq):
         if i >= _MAX_NUM_COMMANDS:
             break
 
         command = get_command_args_fn(arg)
         commands.append(_get_safe_command(command[0], command[1:]))
 
-    data["redis.commands.count"] = len(command_stack)
+    data["redis.commands.count"] = len(command_seq)
     data["redis.commands.first_ten"] = commands
 
     return data

sentry_sdk/integrations/tornado.py

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

tests/integrations/aiohttp/test_aiohttp.py

@@ -6,11 +6,6 @@
 
 import pytest
 
-try:
-    import pytest_asyncio
-except ImportError:
-    pytest_asyncio = None
-
 from aiohttp import web, ClientSession
 from aiohttp.client import ServerDisconnectedError
 from aiohttp.web_exceptions import (
@@ -26,14 +21,6 @@
 from tests.conftest import ApproxDict
 
 
-if pytest_asyncio is None:
-    # `loop` was deprecated in `pytest-aiohttp`
-    # in favor of `event_loop` from `pytest-asyncio`
-    @pytest.fixture
-    def event_loop(loop):
-        yield loop
-
-
 @pytest.mark.asyncio
 async def test_basic(sentry_init, aiohttp_client, capture_events):
     sentry_init(integrations=[AioHttpIntegration()])
@@ -495,7 +482,7 @@ async def hello(request):
 
 @pytest.mark.asyncio
 async def test_crumb_capture(
-    sentry_init, aiohttp_raw_server, aiohttp_client, event_loop, capture_events
+    sentry_init, aiohttp_raw_server, aiohttp_client, capture_events
 ):
     def before_breadcrumb(crumb, hint):
         crumb["data"]["extra"] = "foo"
@@ -551,7 +538,6 @@ async def test_crumb_capture_client_error(
     sentry_init,
     aiohttp_raw_server,
     aiohttp_client,
-    event_loop,
     capture_events,
     status_code,
     level,