diff --git a/sentry_sdk/integrations/argv.py b/sentry_sdk/integrations/argv.py index b5b867c297..9db1150d87 100644 --- a/sentry_sdk/integrations/argv.py +++ b/sentry_sdk/integrations/argv.py @@ -2,7 +2,7 @@ import sentry_sdk from sentry_sdk.integrations import Integration -from sentry_sdk.scope import add_global_event_processor +from sentry_sdk.scope import add_global_event_processor, should_send_default_pii from typing import TYPE_CHECKING @@ -23,7 +23,7 @@ def processor(event: "Event", hint: "Optional[Hint]") -> "Optional[Event]": extra = event.setdefault("extra", {}) # If some event processor decided to set extra to e.g. an # `int`, don't crash. Not here. - if isinstance(extra, dict): + if isinstance(extra, dict) and should_send_default_pii(): extra["sys.argv"] = sys.argv return event diff --git a/tests/new_scopes_compat/test_new_scopes_compat_event.py b/tests/new_scopes_compat/test_new_scopes_compat_event.py index db1e5fec4b..6150e63b4b 100644 --- a/tests/new_scopes_compat/test_new_scopes_compat_event.py +++ b/tests/new_scopes_compat/test_new_scopes_compat_event.py @@ -111,7 +111,6 @@ def create_expected_error_event(trx, span): "extra1": "extra1_value", "extra2": "extra2_value", "should_be_removed_by_event_scrubber": "[Filtered]", - "sys.argv": "[Filtered]", }, "breadcrumbs": { "values": [ @@ -142,7 +141,6 @@ def create_expected_error_event(trx, span): "should_be_removed_by_event_scrubber": { "": {"rem": [["!config", "s"]]} }, - "sys.argv": {"": {"rem": [["!config", "s"]]}}, }, }, } @@ -213,7 +211,6 @@ def create_expected_transaction_event(trx, span): "extra1": "extra1_value", "extra2": "extra2_value", "should_be_removed_by_event_scrubber": "[Filtered]", - "sys.argv": "[Filtered]", }, "release": "0.1.2rc3", "environment": "checking-compatibility-with-sdk1", @@ -231,7 +228,6 @@ def create_expected_transaction_event(trx, span): "should_be_removed_by_event_scrubber": { "": {"rem": [["!config", "s"]]} }, - "sys.argv": {"": {"rem": [["!config", "s"]]}}, }, }, } @@ -316,8 +312,7 @@ def _init_sentry_sdk(sentry_init): before_send_transaction=_test_before_send_transaction, before_breadcrumb=_test_before_breadcrumb, event_scrubber=EventScrubber( - denylist=DEFAULT_DENYLIST - + ["should_be_removed_by_event_scrubber", "sys.argv"] + denylist=DEFAULT_DENYLIST + ["should_be_removed_by_event_scrubber"] ), send_default_pii=False, traces_sample_rate=1.0,