From 27e891b5bab94255b3ed2a561383a8274b9518c4 Mon Sep 17 00:00:00 2001 From: Pablo Deputter Date: Mon, 28 Sep 2026 13:44:17 +0200 Subject: [PATCH 1/4] ref(rq): Drop `send_default_pii` support --- sentry_sdk/integrations/rq.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py index 5098026293..1b49f64c61 100644 --- a/sentry_sdk/integrations/rq.py +++ b/sentry_sdk/integrations/rq.py @@ -5,14 +5,12 @@ 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 Scope, should_send_default_pii +from sentry_sdk.scope import Scope from sentry_sdk.traces import SegmentNameSource from sentry_sdk.utils import ( - SENSITIVE_DATA_SUBSTITUTE, capture_internal_exceptions, event_from_exception, format_timestamp, - has_data_collection_enabled, parse_version, ) @@ -161,16 +159,9 @@ def event_processor(event: "Event", hint: "dict[str, Any]") -> "Event": } client_options = sentry_sdk.get_client().options - if has_data_collection_enabled(client_options): - if client_options["data_collection"]["queues"]: - rq_job["args"] = job.args - rq_job["kwargs"] = job.kwargs - elif should_send_default_pii(): + if client_options["data_collection"]["queues"]: rq_job["args"] = job.args rq_job["kwargs"] = job.kwargs - else: - rq_job["args"] = SENSITIVE_DATA_SUBSTITUTE - rq_job["kwargs"] = SENSITIVE_DATA_SUBSTITUTE if job.enqueued_at: rq_job["enqueued_at"] = format_timestamp(job.enqueued_at) From 92a9d0a93a83e82febdfb66c7f4d0b8dd73337ad Mon Sep 17 00:00:00 2001 From: Pablo Deputter Date: Mon, 28 Sep 2026 13:48:28 +0200 Subject: [PATCH 2/4] tests(rq): Drop `send_default_pii` support --- tests/integrations/rq/test_rq.py | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py index dc566a3e26..1aeecf2ec8 100644 --- a/tests/integrations/rq/test_rq.py +++ b/tests/integrations/rq/test_rq.py @@ -7,8 +7,8 @@ import sentry_sdk from sentry_sdk.consts import SPANDATA from sentry_sdk.integrations.rq import RqIntegration -from sentry_sdk.utils import SENSITIVE_DATA_SUBSTITUTE, parse_version -from tests.integrations.utils import DATA_COLLECTION_QUEUES_CASES_LEGACY +from sentry_sdk.utils import parse_version +from tests.integrations.utils import DATA_COLLECTION_QUEUES_CASES @pytest.fixture(autouse=True) @@ -47,15 +47,13 @@ def do_trick(dog, trick): return "{}, can you {}? Good dog!".format(dog, trick) -@pytest.mark.parametrize("send_default_pii", [True, False]) def test_basic( sentry_init, capture_items, - send_default_pii, ): sentry_init( integrations=[RqIntegration()], - send_default_pii=send_default_pii, + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) @@ -73,12 +71,8 @@ def test_basic( assert exception["stacktrace"]["frames"][-1]["vars"]["foo"] == "42" extra = event["extra"]["rq-job"] - if send_default_pii: - assert extra["args"] == [] - assert extra["kwargs"] == {"foo": 42} - else: - assert extra["args"] == SENSITIVE_DATA_SUBSTITUTE - assert extra["kwargs"] == SENSITIVE_DATA_SUBSTITUTE + assert extra["args"] == [] + assert extra["kwargs"] == {"foo": 42} assert extra["description"] == "tests.integrations.rq.test_rq.crashing_job(foo=42)" assert extra["func"] == "tests.integrations.rq.test_rq.crashing_job" assert "job_id" in extra @@ -90,19 +84,19 @@ def test_basic( @pytest.mark.parametrize( - "init_kwargs,expected_args,expected_kwargs", - DATA_COLLECTION_QUEUES_CASES_LEGACY, + "data_collection,expected_args,expected_kwargs", + DATA_COLLECTION_QUEUES_CASES, ) def test_job_args_kwargs_data_collection( sentry_init, capture_items, - init_kwargs, + data_collection, expected_args, expected_kwargs, ): sentry_init( integrations=[RqIntegration()], - **init_kwargs, + data_collection=data_collection, ) queue = rq.Queue(connection=FakeRedis()) @@ -147,16 +141,13 @@ def test_transport_shutdown( assert exception["type"] == "ZeroDivisionError" -@pytest.mark.parametrize("send_default_pii", [True, False]) def test_worker_span_with_error( sentry_init, capture_items, - send_default_pii, ): sentry_init( integrations=[RqIntegration()], traces_sample_rate=1.0, - send_default_pii=send_default_pii, ) queue = rq.Queue(connection=FakeRedis()) @@ -276,16 +267,13 @@ def test_tracing_disabled( assert error_event["contexts"]["trace"]["trace_id"] -@pytest.mark.parametrize("send_default_pii", [True, False]) def test_worker_span_no_error( sentry_init, capture_items, - send_default_pii, ): sentry_init( integrations=[RqIntegration()], traces_sample_rate=1.0, - send_default_pii=send_default_pii, ) queue = rq.Queue(connection=FakeRedis()) From ffd5e8c56a4cf312253d48a1f980fdc405bd0933 Mon Sep 17 00:00:00 2001 From: Pablo Deputter Date: Mon, 28 Sep 2026 14:16:10 +0200 Subject: [PATCH 3/4] tests(rq): Add `data_collection={}` to tests --- tests/integrations/rq/test_rq.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py index 1aeecf2ec8..26370baa92 100644 --- a/tests/integrations/rq/test_rq.py +++ b/tests/integrations/rq/test_rq.py @@ -148,6 +148,7 @@ def test_worker_span_with_error( sentry_init( integrations=[RqIntegration()], traces_sample_rate=1.0, + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) @@ -274,6 +275,7 @@ def test_worker_span_no_error( sentry_init( integrations=[RqIntegration()], traces_sample_rate=1.0, + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) From 5bb9330c32f789267056991ae3314b50a56f4034 Mon Sep 17 00:00:00 2001 From: Pablo Deputter Date: Mon, 28 Sep 2026 14:20:26 +0200 Subject: [PATCH 4/4] ref(tests): Add `data_collection={}` to remaining tests --- tests/integrations/rq/test_rq.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py index 26370baa92..e6c79a9ccd 100644 --- a/tests/integrations/rq/test_rq.py +++ b/tests/integrations/rq/test_rq.py @@ -124,6 +124,7 @@ def test_transport_shutdown( ): sentry_init( integrations=[RqIntegration()], + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) @@ -193,6 +194,7 @@ def test_error_has_trace_context_if_tracing_disabled( ): sentry_init( integrations=[RqIntegration()], + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) @@ -214,6 +216,7 @@ def test_tracing_enabled( sentry_init( integrations=[RqIntegration()], traces_sample_rate=1.0, + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) @@ -254,6 +257,7 @@ def test_tracing_disabled( ): sentry_init( integrations=[RqIntegration()], + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) @@ -305,6 +309,7 @@ def test_traces_sampler_gets_correct_values_in_sampling_context( sentry_init( integrations=[RqIntegration()], traces_sampler=traces_sampler, + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) @@ -340,6 +345,7 @@ def test_job_with_retries( ): sentry_init( integrations=[RqIntegration()], + data_collection={}, ) queue = rq.Queue(connection=FakeRedis()) @@ -360,6 +366,7 @@ def test_span_origin( sentry_init( integrations=[RqIntegration()], traces_sample_rate=1.0, + data_collection={}, ) queue = rq.Queue(connection=FakeRedis())