Skip to content

Commit 34ef74b

Browse files
authored
perf(ingest): remove experiment for orjson (#68937)
Follow up for #68811
1 parent 20126af commit 34ef74b

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

src/sentry/ingest/consumer/processors.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
from sentry.attachments import CachedAttachment, attachment_cache
1515
from sentry.event_manager import save_attachment
1616
from sentry.eventstore.processing import event_processing_store
17-
from sentry.features.rollout import in_random_rollout
1817
from sentry.feedback.usecases.create_feedback import FeedbackCreationSource
1918
from sentry.ingest.userreport import Conflict, save_userreport
2019
from sentry.killswitches import killswitch_matches_context
2120
from sentry.models.project import Project
2221
from sentry.signals import event_accepted
2322
from sentry.tasks.store import preprocess_event, save_event_feedback, save_event_transaction
2423
from sentry.usage_accountant import record
25-
from sentry.utils import json, metrics
24+
from sentry.utils import metrics
2625
from sentry.utils.cache import cache_key_for_event
2726
from sentry.utils.dates import to_datetime
2827
from sentry.utils.snuba import RateLimitExceeded
@@ -120,10 +119,7 @@ def process_event(
120119
# serializing it again.
121120
# XXX: Do not use CanonicalKeyDict here. This may break preprocess_event
122121
# which assumes that data passed in is a raw dictionary.
123-
if in_random_rollout("sentry-metrics.ingest-consumer.enable-orjson"):
124-
data = orjson.loads(payload)
125-
else:
126-
data = json.loads(payload, use_rapid_json=True, skip_trace=True)
122+
data = orjson.loads(payload)
127123

128124
if project_id == settings.SENTRY_PROJECT:
129125
metrics.incr(
@@ -308,12 +304,8 @@ def process_individual_attachment(message: IngestMessage, project: Project) -> N
308304
@metrics.wraps("ingest_consumer.process_userreport")
309305
def process_userreport(message: IngestMessage, project: Project) -> bool:
310306
start_time = to_datetime(message["start_time"])
311-
if in_random_rollout("sentry-metrics.ingest-consumer.enable-orjson"):
312-
# Always create a span because json.loads passes skip_trace=False
313-
with sentry_sdk.start_span(op="sentry.utils.json.loads"):
314-
feedback = orjson.loads(message["payload"])
315-
else:
316-
feedback = json.loads(message["payload"], use_rapid_json=True)
307+
with sentry_sdk.start_span(op="sentry.utils.json.loads"):
308+
feedback = orjson.loads(message["payload"])
317309

318310
try:
319311
save_userreport(

0 commit comments

Comments
 (0)