|
14 | 14 | from sentry.attachments import CachedAttachment, attachment_cache
|
15 | 15 | from sentry.event_manager import save_attachment
|
16 | 16 | from sentry.eventstore.processing import event_processing_store
|
17 |
| -from sentry.features.rollout import in_random_rollout |
18 | 17 | from sentry.feedback.usecases.create_feedback import FeedbackCreationSource
|
19 | 18 | from sentry.ingest.userreport import Conflict, save_userreport
|
20 | 19 | from sentry.killswitches import killswitch_matches_context
|
21 | 20 | from sentry.models.project import Project
|
22 | 21 | from sentry.signals import event_accepted
|
23 | 22 | from sentry.tasks.store import preprocess_event, save_event_feedback, save_event_transaction
|
24 | 23 | from sentry.usage_accountant import record
|
25 |
| -from sentry.utils import json, metrics |
| 24 | +from sentry.utils import metrics |
26 | 25 | from sentry.utils.cache import cache_key_for_event
|
27 | 26 | from sentry.utils.dates import to_datetime
|
28 | 27 | from sentry.utils.snuba import RateLimitExceeded
|
@@ -120,10 +119,7 @@ def process_event(
|
120 | 119 | # serializing it again.
|
121 | 120 | # XXX: Do not use CanonicalKeyDict here. This may break preprocess_event
|
122 | 121 | # 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) |
127 | 123 |
|
128 | 124 | if project_id == settings.SENTRY_PROJECT:
|
129 | 125 | metrics.incr(
|
@@ -308,12 +304,8 @@ def process_individual_attachment(message: IngestMessage, project: Project) -> N
|
308 | 304 | @metrics.wraps("ingest_consumer.process_userreport")
|
309 | 305 | def process_userreport(message: IngestMessage, project: Project) -> bool:
|
310 | 306 | 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"]) |
317 | 309 |
|
318 | 310 | try:
|
319 | 311 | save_userreport(
|
|
0 commit comments