From a1ab12d078b06a24e1002f7a2be2d86ef4a8431e Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Mon, 15 Jul 2024 11:42:25 +0000
Subject: [PATCH] Revert "ref(proguard): Remove separate queue (#74198)"

This reverts commit 1b13e98d7dcfc8da9f40e13217cfe2ac57dc2afd.

Co-authored-by: loewenheim <7622248+loewenheim@users.noreply.github.com>
---
 src/sentry/conf/server.py      |  1 +
 src/sentry/options/defaults.py |  9 +++++++++
 src/sentry/tasks/store.py      | 36 ++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index a9ad9a831124a..c0373a492d78e 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -866,6 +866,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     Queue("email.inbound", routing_key="email.inbound"),
     Queue("events.preprocess_event", routing_key="events.preprocess_event"),
     Queue("events.process_event", routing_key="events.process_event"),
+    Queue("events.process_event_proguard", routing_key="events.process_event_proguard"),
     Queue(
         "events.reprocessing.preprocess_event", routing_key="events.reprocessing.preprocess_event"
     ),
diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py
index 07474ed2b173e..34ec71943676d 100644
--- a/src/sentry/options/defaults.py
+++ b/src/sentry/options/defaults.py
@@ -644,6 +644,15 @@
     flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE,
 )
 
+# The fraction of prooguard events that will be routed to the
+# separate `store.process_event_proguard` queue
+# TODO: Unused, remove this.
+register(
+    "store.separate-proguard-queue-rate",
+    default=0.0,
+    flags=FLAG_AUTOMATOR_MODIFIABLE | FLAG_MODIFIABLE_RATE,
+)
+
 # Query and supply Bundle Indexes to Symbolicator SourceMap processing
 register(
     "symbolicator.sourcemaps-bundle-index-sample-rate", default=0.0, flags=FLAG_AUTOMATOR_MODIFIABLE
diff --git a/src/sentry/tasks/store.py b/src/sentry/tasks/store.py
index b1ef03986bfe1..3b6d9dacc571c 100644
--- a/src/sentry/tasks/store.py
+++ b/src/sentry/tasks/store.py
@@ -459,6 +459,42 @@ def process_event(
     )
 
 
+# TODO: Unused, remove this.
+@instrumented_task(
+    name="sentry.tasks.store.process_event_proguard",
+    queue="events.process_event_proguard",
+    time_limit=65,
+    soft_time_limit=60,
+    silo_mode=SiloMode.REGION,
+)
+def process_event_proguard(
+    cache_key: str,
+    start_time: float | None = None,
+    event_id: str | None = None,
+    data_has_changed: bool = False,
+    from_symbolicate: bool = False,
+    has_attachments: bool = False,
+    **kwargs: Any,
+) -> None:
+    """
+    Handles event processing (for those events that need it)
+
+    :param string cache_key: the cache key for the event data
+    :param int start_time: the timestamp when the event was ingested
+    :param string event_id: the event identifier
+    :param boolean data_has_changed: set to True if the event data was changed in previous tasks
+    """
+    return do_process_event(
+        cache_key=cache_key,
+        start_time=start_time,
+        event_id=event_id,
+        from_reprocessing=False,
+        data_has_changed=data_has_changed,
+        from_symbolicate=from_symbolicate,
+        has_attachments=has_attachments,
+    )
+
+
 @instrumented_task(
     name="sentry.tasks.store.process_event_from_reprocessing",
     queue="events.reprocessing.process_event",