ref(feedback): use new flagpole flag for spam ingest (#92126)

Ref
- getsentry/team-replay#582

Depends on
getsentry/sentry-options-automator#3945

Author: aliu39

src/sentry/feedback/usecases/spam_detection.py

@@ -63,10 +63,6 @@ def trim_response(text):
 
 
 def spam_detection_enabled(project: Project) -> bool:
-    return (
-        features.has("organizations:user-feedback-spam-filter-ingest", project.organization)
-        and project.get_option("sentry:feedback_ai_spam_detection")
-        and not features.has(
-            "organizations:user-feedback-spam-ingest-blocklist", project.organization
-        )
-    )
+    return features.has(
+        "organizations:user-feedback-spam-ingest", project.organization
+    ) and project.get_option("sentry:feedback_ai_spam_detection")

tests/sentry/feedback/usecases/test_create_feedback.py

@@ -547,7 +547,7 @@ def test_create_feedback_spam_detection_produce_to_kafka(
 ):
     with Feature({"organizations:user-feedback-spam-filter-actions": True}):
 
-        with Feature({"organizations:user-feedback-spam-filter-ingest": feature_flag}):
+        with Feature({"organizations:user-feedback-spam-ingest": feature_flag}):
             event = {
                 "project_id": default_project.id,
                 "request": {
@@ -623,7 +623,7 @@ def test_create_feedback_spam_detection_project_option_false(
 ):
     default_project.update_option("sentry:feedback_ai_spam_detection", False)
 
-    with Feature({"organizations:user-feedback-spam-filter-ingest": True}):
+    with Feature({"organizations:user-feedback-spam-ingest": True}):
         event = {
             "project_id": default_project.id,
             "request": {
@@ -686,7 +686,7 @@ def test_create_feedback_spam_detection_set_status_ignored(
     with Feature(
         {
             "organizations:user-feedback-spam-filter-actions": True,
-            "organizations:user-feedback-spam-filter-ingest": True,
+            "organizations:user-feedback-spam-ingest": True,
         }
     ):
         event = {
@@ -859,7 +859,7 @@ def test_create_feedback_filters_large_message(
     features = (
         {
             "organizations:user-feedback-spam-filter-actions": True,
-            "organizations:user-feedback-spam-filter-ingest": True,
+            "organizations:user-feedback-spam-ingest": True,
         }
         if spam_enabled
         else {}
@@ -899,7 +899,7 @@ def test_create_feedback_evidence_has_spam(
     monkeypatch.setattr("sentry.feedback.usecases.create_feedback.is_spam", lambda _: True)
     default_project.update_option("sentry:feedback_ai_spam_detection", True)
 
-    with Feature({"organizations:user-feedback-spam-filter-ingest": True}):
+    with Feature({"organizations:user-feedback-spam-ingest": True}):
         event = mock_feedback_event(default_project.id)
         source = FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
         create_feedback_issue(event, default_project.id, source)