Skip to content

ref(argv): Update integration #6155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sentrivana wants to merge 3 commits into from
+3 −8
Closed

ref(argv): Update integration #6155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d20cdc0
ref(argv): Update integration
sentrivana Apr 28, 2026
1228fde
.
sentrivana Apr 28, 2026
8b427d5
update compat tests
sentrivana Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sentry_sdk/integrations/argv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -22,8 +22,8 @@
if sentry_sdk.get_client().get_integration(ArgvIntegration) is not None:
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():

Check failure on line 26 in sentry_sdk/integrations/argv.py

View check run for this annotation

@sentry/warden / warden: code-review

Existing argv test will fail because send_default_pii defaults to False 

The change gates `extra['sys.argv']` behind `should_send_default_pii()`, which defaults to False. The existing test `tests/integrations/argv/test_argv.py::test_basic` initializes the SDK without `send_default_pii=True` and asserts `event['extra']['sys.argv'] == argv`, which will now raise `KeyError` because `extra` is set but `sys.argv` is never assigned to it. The test must be updated (e.g. pass `send_default_pii=True`) and a second test added covering the default (PII-off) path.
Comment thread
sentrivana marked this conversation as resolved.
extra["sys.argv"] = sys.argv

return event
7 changes: 1 addition & 6 deletions tests/new_scopes_compat/test_new_scopes_compat_event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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"]]}},
},
},
}
Expand Down Expand Up @@ -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",
Expand All @@ -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"]]}},
},
},
}
Expand Down Expand Up @@ -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,
Expand Down
Loading