feat(strawberry): Support Strawberry 0.239.1

Author: szokeasaurusrex

sentry_sdk/integrations/strawberry.py

@@ -14,6 +14,7 @@
     logger,
     package_version,
     _get_installed_modules,
+    async_any,
 )
 
 try:
@@ -35,16 +36,17 @@
         SentryTracingExtensionSync as StrawberrySentrySyncExtension,
     )
     from strawberry.http import async_base_view, sync_base_view  # type: ignore
+    from strawberry.types import ExecutionContext, ExecutionResult  # type: ignore[import-not-found]
 except ImportError:
     raise DidNotEnable("strawberry-graphql is not installed")
 
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Generator, List, Optional
+    from typing import Any, Callable, Generator, List, Optional, Union
     from graphql import GraphQLError, GraphQLResolveInfo  # type: ignore
     from strawberry.http import GraphQLHTTPResponse
-    from strawberry.types import ExecutionContext, ExecutionResult  # type: ignore
+    from strawberry.types import SubscriptionExecutionResult
     from sentry_sdk._types import Event, EventProcessor
 
 
@@ -291,13 +293,17 @@ def _patch_execute():
     old_execute_sync = strawberry_schema.execute_sync
 
     async def _sentry_patched_execute_async(*args, **kwargs):
-        # type: (Any, Any) -> ExecutionResult
+        # type: (Any, Any) -> Union[ExecutionResult, SubscriptionExecutionResult]
         result = await old_execute_async(*args, **kwargs)
 
         if sentry_sdk.get_client().get_integration(StrawberryIntegration) is None:
             return result
 
-        if "execution_context" in kwargs and result.errors:
+        if "execution_context" in kwargs and (
+            result.errors
+            if isinstance(result, ExecutionResult)
+            else await async_any(r.errors async for r in result)
+        ):
             scope = sentry_sdk.get_isolation_scope()
             event_processor = _make_request_event_processor(kwargs["execution_context"])
             scope.add_event_processor(event_processor)

sentry_sdk/utils.py

@@ -31,7 +31,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from collections.abc import Awaitable
+    from collections.abc import Awaitable, AsyncIterable, AsyncIterator
 
     from types import FrameType, TracebackType
     from typing import (
@@ -1910,3 +1910,17 @@ def get_current_thread_meta(thread=None):
 
     # we've tried everything, time to give up
     return None, None
+
+
+if TYPE_CHECKING:
+    A = TypeVar("A")
+
+
+async def async_any(async_iterable):
+    # type: (Union[AsyncIterable[A], AsyncIterator[A]]) -> bool
+    """Given an async iterable, return True if any of the items are truthy, otherwise False."""
+    async for item in async_iterable:
+        if item:
+            return True
+
+    return False