Skip to content

Commit 37f965b

Browse files
authored
Revert "feat(replays): Enable PII scrubbing for all organizations" (#1747)
Reverts #1678 This is the suspected change increased the event's processing time. And maybe introduced a memory leak.
1 parent 5ccec48 commit 37f965b

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

relay-server/src/actors/processor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ impl EnvelopeProcessorService {
10871087
ItemType::ReplayRecording => {
10881088
// XXX: Temporarily, only the Sentry org will be allowed to parse replays while
10891089
// we measure the impact of this change.
1090-
if replays_enabled {
1090+
if replays_enabled && state.project_state.organization_id == Some(1) {
10911091
// Limit expansion of recordings to the max replay size. The payload is
10921092
// decompressed temporarily and then immediately re-compressed. However, to
10931093
// limit memory pressure, we use the replay limit as a good overall limit for

tests/integration/test_replay_recordings.py

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import zlib
1+
import time
22

33
from sentry_sdk.envelope import Envelope, Item, PayloadRef
44

@@ -92,6 +92,8 @@ def test_chunked_replay_recordings_processing(
9292
assert replay_recording["received"]
9393
assert type(replay_recording["received"]) == int
9494

95+
outcomes_consumer.assert_empty()
96+
9597

9698
def test_nonchunked_replay_recordings_processing(
9799
mini_sentry, relay_with_processing, replay_recordings_consumer, outcomes_consumer
@@ -115,8 +117,7 @@ def test_nonchunked_replay_recordings_processing(
115117
["attachment_type", "replay_recording"],
116118
]
117119
)
118-
payload = recording_payload(b"[]")
119-
envelope.add_item(Item(payload=PayloadRef(bytes=payload), type="replay_recording"))
120+
envelope.add_item(Item(payload=PayloadRef(bytes=b"test"), type="replay_recording"))
120121

121122
relay.send_envelope(project_id, envelope)
122123

@@ -128,12 +129,7 @@ def test_nonchunked_replay_recordings_processing(
128129
assert replay_recording["org_id"] == org_id
129130
assert type(replay_recording["received"]) == int
130131
assert replay_recording["retention_days"] == 90
131-
assert replay_recording["payload"] == payload
132+
assert replay_recording["payload"] == b"test"
132133
assert replay_recording["type"] == "replay_recording_not_chunked"
133134

134135
outcomes_consumer.assert_empty()
135-
136-
137-
def recording_payload(bits: bytes):
138-
compressed_payload = zlib.compress(bits)
139-
return b'{"segment_id": 0}\n' + compressed_payload

0 commit comments

Comments
 (0)