From ba0d69a7c2a5a5b409dddaecef0678789d105432 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Tue, 6 Oct 2026 14:04:05 +0200 Subject: [PATCH 1/3] chore(strawberry): Remove more send_default_pii --- sentry_sdk/integrations/strawberry.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/sentry_sdk/integrations/strawberry.py b/sentry_sdk/integrations/strawberry.py index a2d19dd2f9..14a7ddb060 100644 --- a/sentry_sdk/integrations/strawberry.py +++ b/sentry_sdk/integrations/strawberry.py @@ -5,13 +5,11 @@ from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version from sentry_sdk.integrations.logging import ignore_logger_for_events -from sentry_sdk.scope import should_send_default_pii from sentry_sdk.traces import SegmentNameSource from sentry_sdk.utils import ( capture_internal_exceptions, ensure_integration_enabled, event_from_exception, - has_data_collection_enabled, logger, package_version, ) @@ -168,11 +166,8 @@ def on_operation(self) -> "Generator[None, None, None]": return additional_attributes: "dict[str, Any]" = {} - if has_data_collection_enabled(client.options): - if client.options["data_collection"]["graphql"]["document"]: - additional_attributes["graphql.document"] = self.execution_context.query - elif should_send_default_pii(): + if client.options["data_collection"]["graphql"]["document"]: additional_attributes["graphql.document"] = self.execution_context.query if operation_name: @@ -400,13 +395,9 @@ def _make_response_event_processor( def inner(event: "Event", hint: "dict[str, Any]") -> "Event": client_options = sentry_sdk.get_client().options with capture_internal_exceptions(): - if has_data_collection_enabled(client_options): - collect_response = ( - "outgoing_response" - in client_options["data_collection"]["http_bodies"] - ) - else: - collect_response = should_send_default_pii() + collect_response = ( + "outgoing_response" in client_options["data_collection"]["http_bodies"] + ) if collect_response: contexts = event.setdefault("contexts", {}) From e2ecd35c0a5dde92e33038001c7bcdf21cce2e9f Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Tue, 6 Oct 2026 14:10:42 +0200 Subject: [PATCH 2/3] Update sentry_sdk/integrations/strawberry.py Co-authored-by: Alex Alderman Webb --- sentry_sdk/integrations/strawberry.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sentry_sdk/integrations/strawberry.py b/sentry_sdk/integrations/strawberry.py index 14a7ddb060..a9b840b75f 100644 --- a/sentry_sdk/integrations/strawberry.py +++ b/sentry_sdk/integrations/strawberry.py @@ -395,11 +395,7 @@ def _make_response_event_processor( def inner(event: "Event", hint: "dict[str, Any]") -> "Event": client_options = sentry_sdk.get_client().options with capture_internal_exceptions(): - collect_response = ( - "outgoing_response" in client_options["data_collection"]["http_bodies"] - ) - - if collect_response: +if "outgoing_response" in client_options["data_collection"]["http_bodies"]: contexts = event.setdefault("contexts", {}) contexts["response"] = {"data": response_data} From 071548e57d7e298b3e2b9a883f6b92b7265773e1 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Tue, 6 Oct 2026 14:11:49 +0200 Subject: [PATCH 3/3] indent --- sentry_sdk/integrations/strawberry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry_sdk/integrations/strawberry.py b/sentry_sdk/integrations/strawberry.py index a9b840b75f..c1a545baf6 100644 --- a/sentry_sdk/integrations/strawberry.py +++ b/sentry_sdk/integrations/strawberry.py @@ -395,7 +395,7 @@ def _make_response_event_processor( def inner(event: "Event", hint: "dict[str, Any]") -> "Event": client_options = sentry_sdk.get_client().options with capture_internal_exceptions(): -if "outgoing_response" in client_options["data_collection"]["http_bodies"]: + if "outgoing_response" in client_options["data_collection"]["http_bodies"]: contexts = event.setdefault("contexts", {}) contexts["response"] = {"data": response_data}