WIP

Author: saponifi3d

tests/sentry/incidents/test_metric_issue_post_process.py

@@ -4,11 +4,12 @@
 from sentry.issues.issue_occurrence import IssueOccurrence
 from sentry.issues.status_change_consumer import update_status
 from sentry.issues.status_change_message import StatusChangeMessage
-from sentry.models.group import Group
+from sentry.models.group import Group, GroupStatus
 from sentry.notifications.models.notificationaction import ActionTarget
 from sentry.services import eventstore
 from sentry.tasks.post_process import post_process_group
 from sentry.types.activity import ActivityType
+from sentry.types.group import GroupSubStatus
 from sentry.workflow_engine.models import Detector
 from sentry.workflow_engine.models.data_condition import Condition
 from sentry.workflow_engine.types import DetectorPriorityLevel
@@ -202,6 +203,9 @@ def test_resolution_from_critical(self, mock_trigger: MagicMock) -> None:
         evaluation_result = self.process_packet_and_return_result(data_packet)
         assert isinstance(evaluation_result, StatusChangeMessage)
         message = evaluation_result.to_dict()
+        # Packet processing already resolved the group; reset it so update_status creates a
+        # genuine SET_RESOLVED activity, which is what dispatches workflow processing.
+        group.update(status=GroupStatus.UNRESOLVED, substatus=GroupSubStatus.ONGOING)
         # TODO: Actions don't trigger on resolution yet. Update this test when this functionality exists.
         with patch("sentry.workflow_engine.tasks.workflows.metrics.incr") as mock_incr:
             with self.tasks():
@@ -233,6 +237,9 @@ def test_resolution_from_warning(self, mock_trigger: MagicMock) -> None:
         evaluation_result = self.process_packet_and_return_result(data_packet)
         assert isinstance(evaluation_result, StatusChangeMessage)
         message = evaluation_result.to_dict()
+        # Packet processing already resolved the group; reset it so update_status creates a
+        # genuine SET_RESOLVED activity, which is what dispatches workflow processing.
+        group.update(status=GroupStatus.UNRESOLVED, substatus=GroupSubStatus.ONGOING)
         # TODO: Actions don't trigger on resolution yet. Update this test when this functionality exists.
         with patch("sentry.workflow_engine.tasks.workflows.metrics.incr") as mock_incr:
             with self.tasks():

tests/sentry/workflow_engine/handlers/workflow/test_workflow_activity_handlers.py

@@ -132,13 +132,6 @@ def setUp(self) -> None:
         )
         self.detector = Detector.objects.get(project=self.project, type=ErrorGroupType.slug)
 
-    @mock.patch(
-        "sentry.workflow_engine.handlers.workflow.workflow_activity_handlers.process_workflow_activity"
-    )
-    def test_feature_flag_disabled(self, mock_process_workflow_activity: MagicMock) -> None:
-        activity_handler(self.group, self.activity, self.detector.id)
-        mock_process_workflow_activity.delay.assert_not_called()
-
     @mock.patch("sentry.workflow_engine.handlers.workflow.workflow_activity_handlers.metrics")
     def test_invalid_activity_type(self, mock_metrics: MagicMock) -> None:
         self.activity.type = -1

tests/sentry/workflow_engine/test_task.py

@@ -240,20 +240,6 @@ def test__e2e__issue_plat_to_processed(
         with self.tasks():
             update_status(self.group, self.message)
 
-            # Issue platform is forwarding the activity update
-            mock_incr.assert_any_call(
-                "workflow_engine.issue_platform.status_change_handler",
-                amount=1,
-                tags={"activity_type": self.activity.type},
-                sample_rate=1.0,
-            )
-
-            # Workflow engine is correctly registered for the activity update
-            mock_incr.assert_any_call(
-                "workflow_engine.tasks.process_workflows.activity_update",
-                tags={"activity_type": self.activity.type},
-            )
-
             # Workflow engine evaluated activity update in process_workflows
             mock_incr.assert_any_call(
                 "workflow_engine.tasks.process_workflows.activity_update.executed",
@@ -296,20 +282,6 @@ def test__e2e__issue_plat_to_processed_activity_data_is_set(
         ):
             process_status_change_message(self.message, txn)
 
-            # Issue platform is forwarding the activity update
-            mock_incr.assert_any_call(
-                "workflow_engine.issue_platform.status_change_handler",
-                amount=1,
-                tags={"activity_type": self.activity.type},
-                sample_rate=1.0,
-            )
-
-            # Workflow engine is correctly registered for the activity update
-            mock_incr.assert_any_call(
-                "workflow_engine.tasks.process_workflows.activity_update",
-                tags={"activity_type": self.activity.type},
-            )
-
             # Workflow engine evaluated activity update in process_workflows
             mock_incr.assert_any_call(
                 "workflow_engine.tasks.process_workflows.activity_update.executed",

tests/sentry/workflow_engine/test_task_integration.py

@@ -40,11 +40,16 @@ def test_handler_invoked__when_update_status_called(self) -> None:
         )
 
         with mock.patch("sentry.workflow_engine.tasks.workflows.metrics.incr") as mock_incr:
-            _process_message(message)
+            with self.tasks():
+                _process_message(message)
 
             mock_incr.assert_any_call(
-                "workflow_engine.tasks.process_workflows.activity_update",
-                tags={"activity_type": ActivityType.SET_RESOLVED.value},
+                "workflow_engine.tasks.process_workflows.activity_update.executed",
+                tags={
+                    "activity_type": ActivityType.SET_RESOLVED.value,
+                    "detector_type": self.detector.type,
+                },
+                sample_rate=1.0,
             )
 
     def test_handler_invoked__when_resolved(self) -> None:
@@ -63,10 +68,15 @@ def test_handler_invoked__when_resolved(self) -> None:
         )
 
         with mock.patch("sentry.workflow_engine.tasks.workflows.metrics.incr") as mock_incr:
-            update_status(self.group, message)
+            with self.tasks():
+                update_status(self.group, message)
             mock_incr.assert_any_call(
-                "workflow_engine.tasks.process_workflows.activity_update",
-                tags={"activity_type": ActivityType.SET_RESOLVED.value},
+                "workflow_engine.tasks.process_workflows.activity_update.executed",
+                tags={
+                    "activity_type": ActivityType.SET_RESOLVED.value,
+                    "detector_type": self.detector.type,
+                },
+                sample_rate=1.0,
             )
 
     def _resolved_message(self) -> StatusChangeMessageData: