From 2016a7c02d1390ec8e2723ad0994468ba8caa828 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Wed, 23 Sep 2026 10:38:55 +0200 Subject: [PATCH 1/3] ref(arq): Drop support for `send_default_pii` --- sentry_sdk/integrations/arq.py | 4 ---- tests/integrations/arq/test_arq.py | 3 --- 2 files changed, 7 deletions(-) diff --git a/sentry_sdk/integrations/arq.py b/sentry_sdk/integrations/arq.py index f028b938fa..ede5f604c0 100644 --- a/sentry_sdk/integrations/arq.py +++ b/sentry_sdk/integrations/arq.py @@ -4,7 +4,6 @@ from sentry_sdk.consts import OP, SPANDATA 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 ( SENSITIVE_DATA_SUBSTITUTE, @@ -156,9 +155,6 @@ def event_processor(event: "Event", hint: "Hint") -> "Optional[Event]": if client_options["data_collection"]["queues"]: arq_job_dict["args"] = args arq_job_dict["kwargs"] = kwargs - elif should_send_default_pii(): - arq_job_dict["args"] = args - arq_job_dict["kwargs"] = kwargs else: arq_job_dict["args"] = SENSITIVE_DATA_SUBSTITUTE arq_job_dict["kwargs"] = SENSITIVE_DATA_SUBSTITUTE diff --git a/tests/integrations/arq/test_arq.py b/tests/integrations/arq/test_arq.py index c6da088b47..602aba2e63 100644 --- a/tests/integrations/arq/test_arq.py +++ b/tests/integrations/arq/test_arq.py @@ -63,7 +63,6 @@ def inner( sentry_init_kwargs = { "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, - "send_default_pii": True, } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) @@ -111,7 +110,6 @@ def inner( sentry_init_kwargs = { "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, - "send_default_pii": True, } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) @@ -162,7 +160,6 @@ def inner( sentry_init_kwargs = { "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, - "send_default_pii": True, } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) From a916a3d7077df58f37bc1c92251513338b4164e0 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Wed, 23 Sep 2026 10:59:43 +0200 Subject: [PATCH 2/3] . --- sentry_sdk/integrations/arq.py | 12 +++--------- tests/integrations/utils.py | 26 -------------------------- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/sentry_sdk/integrations/arq.py b/sentry_sdk/integrations/arq.py index ede5f604c0..295c3eff0e 100644 --- a/sentry_sdk/integrations/arq.py +++ b/sentry_sdk/integrations/arq.py @@ -6,12 +6,10 @@ from sentry_sdk.integrations.logging import ignore_logger_for_events from sentry_sdk.traces import SegmentNameSource from sentry_sdk.utils import ( - SENSITIVE_DATA_SUBSTITUTE, _register_control_flow_exception, capture_internal_exceptions, ensure_integration_enabled, event_from_exception, - has_data_collection_enabled, parse_version, reraise, ) @@ -151,13 +149,9 @@ def event_processor(event: "Event", hint: "Hint") -> "Optional[Event]": } client_options = sentry_sdk.get_client().options - if has_data_collection_enabled(client_options): - if client_options["data_collection"]["queues"]: - arq_job_dict["args"] = args - arq_job_dict["kwargs"] = kwargs - else: - arq_job_dict["args"] = SENSITIVE_DATA_SUBSTITUTE - arq_job_dict["kwargs"] = SENSITIVE_DATA_SUBSTITUTE + if client_options["data_collection"]["queues"]: + arq_job_dict["args"] = args + arq_job_dict["kwargs"] = kwargs extra["arq-job"] = arq_job_dict diff --git a/tests/integrations/utils.py b/tests/integrations/utils.py index 2f0cbbaff7..db46fac23d 100644 --- a/tests/integrations/utils.py +++ b/tests/integrations/utils.py @@ -1,7 +1,5 @@ import pytest -from sentry_sdk.utils import SENSITIVE_DATA_SUBSTITUTE - # Shared parametrization test matrix exercising the precedence between the legacy # ``send_default_pii`` boolean and the ``data_collection.user_info`` setting. # Each case is ``(init_kwargs, expect_user_info)`` where the second element indicates @@ -93,28 +91,4 @@ None, id="data_collection_queues_off", ), - pytest.param( - {"send_default_pii": False}, - SENSITIVE_DATA_SUBSTITUTE, - SENSITIVE_DATA_SUBSTITUTE, - id="no_pii", - ), - pytest.param( - { - "data_collection": {"queues": False}, - "send_default_pii": False, - }, - None, - None, - id="data_collection_queues_off_with_no_pii", - ), - pytest.param( - { - "data_collection": {"queues": True}, - "send_default_pii": False, - }, - [1], - {"b": 0}, - id="data_collection_queues_on_with_no_pii", - ), ] From ddedd8ede51988089dee13cf9047cbbca6741718 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Wed, 23 Sep 2026 11:51:42 +0200 Subject: [PATCH 3/3] use data_collection default --- tests/integrations/arq/test_arq.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integrations/arq/test_arq.py b/tests/integrations/arq/test_arq.py index 602aba2e63..cdf1723390 100644 --- a/tests/integrations/arq/test_arq.py +++ b/tests/integrations/arq/test_arq.py @@ -63,6 +63,7 @@ def inner( sentry_init_kwargs = { "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, + "data_collection": {}, } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) @@ -110,6 +111,7 @@ def inner( sentry_init_kwargs = { "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, + "data_collection": {}, } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs) @@ -160,6 +162,7 @@ def inner( sentry_init_kwargs = { "integrations": [ArqIntegration()], "traces_sample_rate": 1.0, + "data_collection": {}, } sentry_init_kwargs.update(init_kwargs or {}) sentry_init(**sentry_init_kwargs)