make killswitch check more universal

Author: lobsterkatie

src/sentry/grouping/ingest/seer.py

@@ -48,7 +48,7 @@ def should_call_seer_for_grouping(event: Event, variants: Mapping[str, BaseVaria
 
     if (
         _has_customized_fingerprint(event, variants)
-        or killswitch_enabled(project.id, event)
+        or killswitch_enabled(project.id, ReferrerOptions.INGEST, event)
         or _circuit_breaker_broken(event, project)
         # The rate limit check has to be last (see below) but rate-limiting aside, call this after other checks
         # because it calculates the stacktrace string, which we only want to spend the time to do if we already

src/sentry/issues/endpoints/group_similar_issues_embeddings.py

@@ -18,6 +18,7 @@
 from sentry.seer.similarity.similar_issues import get_similarity_data_from_seer
 from sentry.seer.similarity.types import SeerSimilarIssueData, SimilarIssuesEmbeddingsRequest
 from sentry.seer.similarity.utils import (
+    ReferrerOptions,
     TooManyOnlySystemFramesException,
     event_content_has_stacktrace,
     get_stacktrace_string,
@@ -75,7 +76,7 @@ def get_formatted_results(
         return [(serialized_groups[group_id], group_data[group_id]) for group_id in group_data]
 
     def get(self, request: Request, group: Group) -> Response:
-        if killswitch_enabled(group.project.id):
+        if killswitch_enabled(group.project.id, ReferrerOptions.SIMILAR_ISSUES_TAB):
             return Response([])
 
         latest_event = group.get_latest_event()

src/sentry/seer/similarity/utils.py

@@ -68,6 +68,8 @@
 class ReferrerOptions(StrEnum):
     INGEST = "ingest"
     BACKFILL = "backfill"
+    DELETION = "deletion"
+    SIMILAR_ISSUES_TAB = "similar_issues_tab"
 
 
 class TooManyOnlySystemFramesException(Exception):
@@ -329,40 +331,45 @@ def record_did_call_seer_metric(*, call_made: bool, blocker: str) -> None:
 
 def killswitch_enabled(
     project_id: int | None,
+    referrer: ReferrerOptions,
     event: GroupEvent | Event | None = None,
 ) -> bool:
     """
     Check both the global and similarity-specific Seer killswitches.
     """
-
+    is_ingest = referrer == ReferrerOptions.INGEST
+    logger_prefix = f"grouping.similarity.{referrer.value}"
     logger_extra = {"event_id": event.event_id if event else None, "project_id": project_id}
 
     if options.get("seer.global-killswitch.enabled"):
         logger.warning(
-            "should_call_seer_for_grouping.seer_global_killswitch_enabled",
+            f"{logger_prefix}.seer_global_killswitch_enabled",  # noqa
             extra=logger_extra,
         )
-        record_did_call_seer_metric(call_made=False, blocker="global-killswitch")
+        if is_ingest:
+            record_did_call_seer_metric(call_made=False, blocker="global-killswitch")
 
         return True
 
     if options.get("seer.similarity-killswitch.enabled"):
         logger.warning(
-            "should_call_seer_for_grouping.seer_similarity_killswitch_enabled",
+            f"{logger_prefix}.seer_similarity_killswitch_enabled",  # noqa
             extra=logger_extra,
         )
-        record_did_call_seer_metric(call_made=False, blocker="similarity-killswitch")
+        if is_ingest:
+            record_did_call_seer_metric(call_made=False, blocker="similarity-killswitch")
 
         return True
 
     if killswitch_matches_context(
         "seer.similarity.grouping_killswitch_projects", {"project_id": project_id}
     ):
         logger.warning(
-            "should_call_seer_for_grouping.seer_similarity_project_killswitch_enabled",
+            f"{logger_prefix}.seer_similarity_project_killswitch_enabled",  # noqa
             extra=logger_extra,
         )
-        record_did_call_seer_metric(call_made=False, blocker="project-killswitch")
+        if is_ingest:
+            record_did_call_seer_metric(call_made=False, blocker="project-killswitch")
 
         return True
 

src/sentry/tasks/delete_seer_grouping_records.py

@@ -8,7 +8,7 @@
     delete_grouping_records_by_hash,
     delete_project_grouping_records,
 )
-from sentry.seer.similarity.utils import killswitch_enabled
+from sentry.seer.similarity.utils import ReferrerOptions, killswitch_enabled
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
 
@@ -34,7 +34,7 @@ def delete_seer_grouping_records_by_hash(
     Task to delete seer grouping records by hash list.
     Calls the seer delete by hash endpoint with batches of hashes of size `BATCH_SIZE`.
     """
-    if killswitch_enabled(project_id) or options.get(
+    if killswitch_enabled(project_id, ReferrerOptions.DELETION) or options.get(
         "seer.similarity-embeddings-delete-by-hash-killswitch.enabled"
     ):
         return
@@ -57,7 +57,7 @@ def call_delete_seer_grouping_records_by_hash(
     if (
         project
         and project.get_option("sentry:similarity_backfill_completed")
-        and not killswitch_enabled(project.id)
+        and not killswitch_enabled(project.id, ReferrerOptions.DELETION)
         and not options.get("seer.similarity-embeddings-delete-by-hash-killswitch.enabled")
     ):
         # TODO (jangjodi): once we store seer grouping info in GroupHash, we should filter by that here
@@ -86,7 +86,7 @@ def call_seer_delete_project_grouping_records(
     *args: Any,
     **kwargs: Any,
 ) -> None:
-    if killswitch_enabled(project_id) or options.get(
+    if killswitch_enabled(project_id, ReferrerOptions.DELETION) or options.get(
         "seer.similarity-embeddings-delete-by-hash-killswitch.enabled"
     ):
         return

src/sentry/tasks/embeddings_grouping/backfill_seer_grouping_records_for_project.py

@@ -9,7 +9,11 @@
 from sentry.grouping.api import GroupingConfigNotFound
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.models.project import Project
-from sentry.seer.similarity.utils import killswitch_enabled, project_is_seer_eligible
+from sentry.seer.similarity.utils import (
+    ReferrerOptions,
+    killswitch_enabled,
+    project_is_seer_eligible,
+)
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task
 from sentry.tasks.embeddings_grouping.utils import (
@@ -80,7 +84,7 @@ def backfill_seer_grouping_records_for_project(
     assert current_project_id is not None
 
     if options.get("seer.similarity-backfill-killswitch.enabled") or killswitch_enabled(
-        current_project_id
+        current_project_id, ReferrerOptions.BACKFILL
     ):
         logger.info("backfill_seer_grouping_records.killswitch_enabled")
         return