From 692e8f0d85e64372e1e4ad690860c32cee30cc6e Mon Sep 17 00:00:00 2001
From: Charles Paul <charles.paul@sentry.io>
Date: Tue, 11 Nov 2025 15:25:14 -0800
Subject: [PATCH 1/2] chore(events): Clean up preprocess option (1/3)

Putting up PRs to clean up the preprocess option. I'll probably let the option sit for a day or two longer just to be safe, but wanted to get this out of the way.

Steps:
1. Clean up usages
2. Clean up options-automator declaration
3. Clean up sentry declaration

This is PR 1/3.
---
 src/sentry/utils/snuba.py        | 3 +--
 tests/sentry/utils/test_snuba.py | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/sentry/utils/snuba.py b/src/sentry/utils/snuba.py
index 6f1dc953b0d690..48785b7a7b2373 100644
--- a/src/sentry/utils/snuba.py
+++ b/src/sentry/utils/snuba.py
@@ -27,7 +27,6 @@
 from snuba_sdk.legacy import json_to_snql
 from snuba_sdk.query import SelectableExpression
 
-from sentry import options
 from sentry.api.helpers.error_upsampling import (
     UPSAMPLED_ERROR_AGGREGATION,
     are_any_projects_error_upsampled,
@@ -928,7 +927,7 @@ def __init__(
         # account for merges, here we expand queries to include all group IDs that have
         # been merged together.
 
-        if options.get("snuba.preprocess-group-redirects") and self.dataset in {
+        if self.dataset in {
             Dataset.Events,
             Dataset.IssuePlatform,
         }:
diff --git a/tests/sentry/utils/test_snuba.py b/tests/sentry/utils/test_snuba.py
index b50763d3148255..a275d59d35e5ba 100644
--- a/tests/sentry/utils/test_snuba.py
+++ b/tests/sentry/utils/test_snuba.py
@@ -9,7 +9,6 @@
 from urllib3.exceptions import HTTPError, ReadTimeoutError
 from urllib3.response import HTTPResponse
 
-from sentry import options
 from sentry.models.groupredirect import GroupRedirect
 from sentry.models.grouprelease import GroupRelease
 from sentry.models.project import Project
@@ -326,8 +325,6 @@ def test_preprocess_group_redirects(self) -> None:
             previous_group_id=g3.id,
         )
 
-        options.set("snuba.preprocess-group-redirects", True)
-
         params = SnubaQueryParams(dataset=Dataset.Events, filter_keys={"group_id": {g1.id}})
         assert params.conditions[0] == ["group_id", "IN", {g1.id, g2.id, g3.id}]
 

From 9ac4054a2c96f5363a461d80a54cfccf4dd1f478 Mon Sep 17 00:00:00 2001
From: Charles Paul <charles.paul@sentry.io>
Date: Tue, 11 Nov 2025 15:27:09 -0800
Subject: [PATCH 2/2] chore(events): Clean up preprocess option

Putting up PRs to clean up the preprocess option. I'll probably let the option sit for a day or two longer just to be safe, but wanted to get this out of the way.

Steps:
1. Clean up usages
2. Clean up options-automator declaration
3. Clean up sentry declaration

This is PR 3/3.
---
 src/sentry/options/defaults.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py
index 75d78148b36a9c..2f6a24b1295606 100644
--- a/src/sentry/options/defaults.py
+++ b/src/sentry/options/defaults.py
@@ -842,7 +842,6 @@
 )
 register("snuba.search.hits-sample-size", default=100, flags=FLAG_AUTOMATOR_MODIFIABLE)
 register("snuba.track-outcomes-sample-rate", default=0.0, flags=FLAG_AUTOMATOR_MODIFIABLE)
-register("snuba.preprocess-group-redirects", default=False, flags=FLAG_AUTOMATOR_MODIFIABLE)
 
 # The percentage of tagkeys that we want to cache. Set to 1.0 in order to cache everything, <=0.0 to stop caching
 register(