Skip to content

ref(client)!: Remove EventScrubber and the event_scrubber option - #7772

Open
ericapisani wants to merge 3 commits into
major/3.0from
py-2798-remove-event-scrubber
Open

ericapisani wants to merge 3 commits into
major/3.0from
py-2798-remove-event-scrubber

Conversation

@ericapisani

Copy link
Copy Markdown
Member

data_collection is now the default way to control what data the SDK collects, so the always-on EventScrubber is no longer needed. The expectation is that, if people need to filter out request bodies, etc., that they use the before_send callback.

Removes sentry_sdk.scrubber (EventScrubber, DEFAULT_DENYLIST, DEFAULT_PII_DENYLIST), the scrubbing step in _prepare_event, and the event_scrubber init option. Passing event_scrubber= to init now raises a TypeError.

Refs PY-2798
Refs #7566

`data_collection` is now the default way to control what data the SDK
collects, so the always-on `EventScrubber` is no longer needed.

Removes `sentry_sdk.scrubber` (`EventScrubber`, `DEFAULT_DENYLIST`,
`DEFAULT_PII_DENYLIST`), the scrubbing step in `_prepare_event`, and the
`event_scrubber` init option. Passing `event_scrubber=` to `init` now
raises a `TypeError`.

Refs PY-2798
Refs #7566
@linear-code

linear-code Bot commented Sep 29, 2026

Copy link
Copy Markdown

PY-2798

@github-actions

github-actions Bot commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

Codecov Results 📊

✅ 57188 passed | ❌ 1 failed | ⏭️ 2709 skipped | Total: 59898 | Pass Rate: 95.48% | Execution Time: 162m 56s

📊 Comparison with Base Branch

Metric Change
Total Tests 📉 -76961
Passed Tests 📉 -72502
Failed Tests 📈 +1
Skipped Tests 📉 -4460

➕ New Tests (1)

View new tests
  • test_input_attributes_nonstreaming_chat[messages0-expected_system_instructions0-expected_input_messages0]
    • File: tests.integrations.mistral.test_mistral
    • Status: ❌ Failing

❌ Failed Tests

test_input_attributes_nonstreaming_chat[messages0-expected_system_instructions0-expected_input_messages0]

File: tests.integrations.mistral.test_mistral
Suite: py3.10-mistral-v2.6.0
Error: KeyError: 140591437570048

Stack Trace
tests/integrations/mistral/test_mistral.py:389: in test_input_attributes_nonstreaming_chat
    sentry_init(
tests/conftest.py:349: in inner
    client = sentry_sdk.Client(*a, **kw)
sentry_sdk/client.py:262: in __init__
    self._init_impl()
sentry_sdk/client.py:412: in _init_impl
    self.integrations = setup_integrations(
sentry_sdk/integrations/__init__.py:217: in setup_integrations
    for integration_cls in iter_default_integrations(
sentry_sdk/integrations/__init__.py:44: in iter_default_integrations
    yield getattr(import_module(module), cls)
/usr/lib/python3.10/importlib/__init__.py:126: in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
<frozen importlib._bootstrap>:1050: in _gcd_import
    ???
<frozen importlib._bootstrap>:1024: in _find_and_load
    ???
<frozen importlib._bootstrap>:171: in __enter__
    ???
<frozen importlib._bootstrap>:123: in acquire
    ???
E   KeyError: 140591437570048

✅ Patch coverage is 100.00%. Project has 2070 uncovered lines.
❌ Project coverage is 90.01%. Comparing base (b8d3978) to head (08b6c64).

Coverage diff
@@            Coverage Diff             @@
##        master       #PR       +/-##
==========================================
- Coverage    90.25%    90.01%    -0.24%
==========================================
  Files          195       178       -17
  Lines        26195     20715     -5480
  Branches      9758      7260     -2498
==========================================
+ Hits         23641     18645     -4996
- Misses        2554      2070      -484
- Partials      1484      1215      -269

Generated by Codecov Action

The body is no longer redacted by `EventScrubber`, so assert the raw value.
Opt into `data_collection` and disable flask_login, whose module-level
login manager has no user_loader, so user info collection doesn't raise.
@ericapisani
ericapisani marked this pull request as ready for review September 29, 2026 18:56
@ericapisani
ericapisani requested a review from a team as a code owner September 29, 2026 18:56

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant