ref(feedback): clean up graduated spam actions and event link flags (#95309)

aliu39 · web-flow · commit b5d1450011c7 · 2025-07-11T13:14:53.000-07:00
Ref [REPLAY-513: \[PR Tracker\] refactor backend user feedback code](https://linear.app/getsentry/issue/REPLAY-513/pr-tracker-refactor-backend-user-feedback-code)
diff --git a/src/sentry/features/temporary.py b/src/sentry/features/temporary.py
@@ -465,12 +465,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:user-feedback-ai-summaries", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable auto spam classification at User Feedback ingest time
     manager.add("organizations:user-feedback-spam-ingest", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable auto spam filtering at User Feedback ingest time, if spam-ingest is also enabled
-    manager.add("organizations:user-feedback-spam-filter-actions", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable User Feedback v2 UI
     manager.add("organizations:user-feedback-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # User Feedback Error Link Ingestion Changes
-    manager.add("organizations:user-feedback-event-link-ingestion-changes", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable view hierarchies options
     manager.add("organizations:view-hierarchies-options-dev", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable aggregates table editor on the new explore page
diff --git a/src/sentry/feedback/usecases/create_feedback.py b/src/sentry/feedback/usecases/create_feedback.py
@@ -9,7 +9,7 @@
 
 import jsonschema
 
-from sentry import features, options
+from sentry import options
 from sentry.constants import DataCategory
 from sentry.eventstore.models import Event, GroupEvent
 from sentry.feedback.lib.types import UserReportDict
@@ -428,7 +428,16 @@ def create_feedback_issue(
     )
     # Mark as spam. We need this since IP doesn't currently support an initial status of IGNORED.
     if is_message_spam:
-        auto_ignore_spam_feedbacks(project, issue_fingerprint)
+        produce_occurrence_to_kafka(
+            payload_type=PayloadType.STATUS_CHANGE,
+            status_change=StatusChangeMessage(
+                fingerprint=issue_fingerprint,
+                project_id=project.id,
+                new_status=GroupStatus.IGNORED,  # we use ignored in the UI for the spam tab
+                new_substatus=GroupSubStatus.FOREVER,
+            ),
+        )
+
     metrics.incr(
         "feedback.create_feedback_issue.produced_occurrence",
         tags={
@@ -452,24 +461,6 @@ def create_feedback_issue(
     return event_fixed
 
 
-def auto_ignore_spam_feedbacks(project, issue_fingerprint):
-    """
-    Marks an issue as spam with a STATUS_CHANGE kafka message. The IGNORED status allows the occurrence to skip alerts
-    and be picked up by frontend spam queries.
-    """
-    if features.has("organizations:user-feedback-spam-filter-actions", project.organization):
-        metrics.incr("feedback.spam-detection-actions.set-ignored")
-        produce_occurrence_to_kafka(
-            payload_type=PayloadType.STATUS_CHANGE,
-            status_change=StatusChangeMessage(
-                fingerprint=issue_fingerprint,
-                project_id=project.id,
-                new_status=GroupStatus.IGNORED,  # we use ignored in the UI for the spam tab
-                new_substatus=GroupSubStatus.FOREVER,
-            ),
-        )
-
-
 ###########
 # Shim code
 ###########
diff --git a/src/sentry/tasks/post_process.py b/src/sentry/tasks/post_process.py
@@ -1351,9 +1351,7 @@ def should_postprocess_feedback(job: PostProcessJob) -> bool:
     if not hasattr(event, "occurrence") or event.occurrence is None:
         return False
 
-    if event.occurrence.evidence_data.get("is_spam") is True and features.has(
-        "organizations:user-feedback-spam-filter-actions", job["event"].project.organization
-    ):
+    if event.occurrence.evidence_data.get("is_spam") is True:
         metrics.incr("feedback.spam-detection-actions.dont-send-notification")
         return False
 
@@ -1436,12 +1434,7 @@ def link_event_to_user_report(job: PostProcessJob) -> None:
     project = event.project
     group = event.group
 
-    if (
-        features.has(
-            "organizations:user-feedback-event-link-ingestion-changes", project.organization
-        )
-        and not job["is_reprocessed"]
-    ):
+    if not job["is_reprocessed"]:
         metrics.incr("event_manager.save._update_user_reports_with_event_link")
         event = job["event"]
         project = event.project
diff --git a/tests/sentry/feedback/usecases/test_create_feedback.py b/tests/sentry/feedback/usecases/test_create_feedback.py
@@ -548,74 +548,72 @@ def test_create_feedback_spam_detection_produce_to_kafka(
     monkeypatch,
     feature_flag,
 ):
-    with Feature({"organizations:user-feedback-spam-filter-actions": True}):
-
-        with Feature({"organizations:user-feedback-spam-ingest": feature_flag}):
-            event = {
-                "project_id": default_project.id,
-                "request": {
-                    "url": "https://sentry.sentry.io/feedback/?statsPeriod=14d",
-                    "headers": {
-                        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"
-                    },
+    with Feature({"organizations:user-feedback-spam-ingest": feature_flag}):
+        event = {
+            "project_id": default_project.id,
+            "request": {
+                "url": "https://sentry.sentry.io/feedback/?statsPeriod=14d",
+                "headers": {
+                    "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36"
                 },
-                "event_id": "56b08cf7852c42cbb95e4a6998c66ad6",
-                "timestamp": 1698255009.574,
-                "received": "2021-10-24T22:23:29.574000+00:00",
-                "environment": "prod",
-                "release": "frontend@daf1316f209d961443664cd6eb4231ca154db502",
-                "user": {
-                    "ip_address": "72.164.175.154",
-                    "email": "josh.ferge@sentry.io",
-                    "id": 880461,
-                    "isStaff": False,
+            },
+            "event_id": "56b08cf7852c42cbb95e4a6998c66ad6",
+            "timestamp": 1698255009.574,
+            "received": "2021-10-24T22:23:29.574000+00:00",
+            "environment": "prod",
+            "release": "frontend@daf1316f209d961443664cd6eb4231ca154db502",
+            "user": {
+                "ip_address": "72.164.175.154",
+                "email": "josh.ferge@sentry.io",
+                "id": 880461,
+                "isStaff": False,
+                "name": "Josh Ferge",
+            },
+            "contexts": {
+                "feedback": {
+                    "contact_email": "josh.ferge@sentry.io",
                     "name": "Josh Ferge",
+                    "message": input_message,
+                    "replay_id": "3d621c61593c4ff9b43f8490a78ae18e",
+                    "url": "https://sentry.sentry.io/feedback/?statsPeriod=14d",
                 },
-                "contexts": {
-                    "feedback": {
-                        "contact_email": "josh.ferge@sentry.io",
-                        "name": "Josh Ferge",
-                        "message": input_message,
-                        "replay_id": "3d621c61593c4ff9b43f8490a78ae18e",
-                        "url": "https://sentry.sentry.io/feedback/?statsPeriod=14d",
-                    },
-                },
-                "breadcrumbs": [],
-                "platform": "javascript",
-            }
+            },
+            "breadcrumbs": [],
+            "platform": "javascript",
+        }
 
-            mock_openai = Mock()
-            mock_openai().chat.completions.create = create_dummy_response
+        mock_openai = Mock()
+        mock_openai().chat.completions.create = create_dummy_response
 
-            monkeypatch.setattr("sentry.llm.providers.openai.OpenAI", mock_openai)
+        monkeypatch.setattr("sentry.llm.providers.openai.OpenAI", mock_openai)
 
-            create_feedback_issue(
-                event, default_project.id, FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
-            )
+        create_feedback_issue(
+            event, default_project.id, FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
+        )
 
-            # Check if the 'is_spam' evidence in the Kafka message matches the expected result
-            is_spam_evidence = [
-                evidence.value
-                for evidence in mock_produce_occurrence_to_kafka.call_args_list[0]
-                .kwargs["occurrence"]
-                .evidence_display
-                if evidence.name == "is_spam"
-            ]
-            found_is_spam = is_spam_evidence[0] if is_spam_evidence else None
-            assert (
-                found_is_spam == expected_result
-            ), f"Expected {expected_result} but found {found_is_spam} for {input_message} and feature flag {feature_flag}"
+        # Check if the 'is_spam' evidence in the Kafka message matches the expected result
+        is_spam_evidence = [
+            evidence.value
+            for evidence in mock_produce_occurrence_to_kafka.call_args_list[0]
+            .kwargs["occurrence"]
+            .evidence_display
+            if evidence.name == "is_spam"
+        ]
+        found_is_spam = is_spam_evidence[0] if is_spam_evidence else None
+        assert (
+            found_is_spam == expected_result
+        ), f"Expected {expected_result} but found {found_is_spam} for {input_message} and feature flag {feature_flag}"
 
-            if expected_result and feature_flag:
-                assert (
-                    mock_produce_occurrence_to_kafka.call_args_list[1]
-                    .kwargs["status_change"]
-                    .new_status
-                    == GroupStatus.IGNORED
-                )
+        if expected_result and feature_flag:
+            assert (
+                mock_produce_occurrence_to_kafka.call_args_list[1]
+                .kwargs["status_change"]
+                .new_status
+                == GroupStatus.IGNORED
+            )
 
-            if not (expected_result and feature_flag):
-                assert mock_produce_occurrence_to_kafka.call_count == 1
+        if not (expected_result and feature_flag):
+            assert mock_produce_occurrence_to_kafka.call_count == 1
 
 
 @django_db_all
@@ -904,7 +902,6 @@ def test_create_feedback_filters_large_message(
     """Large messages are filtered before spam detection and producing to kafka."""
     features = (
         {
-            "organizations:user-feedback-spam-filter-actions": True,
             "organizations:user-feedback-spam-ingest": True,
         }
         if spam_enabled
@@ -950,8 +947,8 @@ def test_create_feedback_evidence_has_spam(
         source = FeedbackCreationSource.NEW_FEEDBACK_ENVELOPE
         create_feedback_issue(event, default_project.id, source)
 
-    assert mock_produce_occurrence_to_kafka.call_count == 1
-    evidence = mock_produce_occurrence_to_kafka.call_args.kwargs["occurrence"].evidence_data
+    assert mock_produce_occurrence_to_kafka.call_count == 2  # second call is status change
+    evidence = mock_produce_occurrence_to_kafka.call_args_list[0].kwargs["occurrence"].evidence_data
     assert evidence["is_spam"] is True
 
 
diff --git a/tests/sentry/tasks/test_post_process.py b/tests/sentry/tasks/test_post_process.py
