feat(aci milestone 3): resolution action filters (#90898)

Add the resolution action filter to dual write/update. This data
condition evaluates to True if an issue's priority is de-escalating; see
#89832 for more details.

Author: mifu67

src/sentry/workflow_engine/handlers/condition/issue_priority_deescalating_handler.py

@@ -12,29 +12,19 @@ class IssuePriorityDeescalatingConditionHandler(DataConditionHandler[WorkflowEve
     group = DataConditionHandler.Group.ACTION_FILTER
     subgroup = DataConditionHandler.Subgroup.ISSUE_ATTRIBUTES
 
-    comparison_json_schema = {
-        "type": "object",
-        "properties": {
-            "priority": {"type": "integer", "minimum": 0},
-        },
-        "required": ["priority"],
-        "additionalProperties": False,
-    }
-
     @staticmethod
     def evaluate_value(event_data: WorkflowEventData, comparison: Any) -> bool:
         group = event_data.event.group
 
         # we will fire actions on de-escalation if the priority seen is >= the threshold
         # priority specified in the comparison
-        comparison_priority = comparison.get("priority")
         current_priority = group.priority
         open_period = get_latest_open_period(group)
         if open_period is None:
             raise Exception("No open period found")
         # use this to determine if we've breached the comparison priority before
         highest_seen_priority = open_period.data.get("highest_seen_priority", current_priority)
 
-        return comparison_priority <= highest_seen_priority and (
-            current_priority < comparison_priority or group.status == GroupStatus.RESOLVED
+        return comparison <= highest_seen_priority and (
+            current_priority < comparison or group.status == GroupStatus.RESOLVED
         )

src/sentry/workflow_engine/migration_helpers/alert_rule.py

@@ -212,6 +212,7 @@ def get_action_filter(
     action_filter = DataCondition.objects.get(
         condition_group__in=workflow_dcgs,
         comparison=priority,
+        type=Condition.ISSUE_PRIORITY_GREATER_OR_EQUAL,
     )
     return action_filter
 
@@ -262,7 +263,7 @@ def migrate_metric_action(
 
 def migrate_metric_data_conditions(
     alert_rule_trigger: AlertRuleTrigger,
-) -> tuple[DataCondition, DataCondition]:
+) -> tuple[DataCondition, DataCondition, DataCondition]:
     alert_rule = alert_rule_trigger.alert_rule
     # create a data condition for the Detector's data condition group with the
     # threshold and associated priority level
@@ -313,7 +314,15 @@ def migrate_metric_data_conditions(
         type=Condition.ISSUE_PRIORITY_GREATER_OR_EQUAL,
         condition_group=data_condition_group,
     )
-    return detector_trigger, action_filter
+    # finally, create a "resolution action filter": the condition result is set to true
+    # if we're de-escalating from the priority specified in the comparison
+    resolve_action_filter = DataCondition.objects.create(
+        comparison=PRIORITY_MAP.get(alert_rule_trigger.label, DetectorPriorityLevel.HIGH),
+        condition_result=True,
+        type=Condition.ISSUE_PRIORITY_DEESCALATING,
+        condition_group=data_condition_group,
+    )
+    return detector_trigger, action_filter, resolve_action_filter
 
 
 def get_resolve_threshold(detector_data_condition_group: DataConditionGroup) -> float:
@@ -719,7 +728,10 @@ def dual_update_migrated_alert_rule_trigger(
         # we won't reach this path
         return None
     action_filter = get_action_filter(alert_rule_trigger, priority)
-
+    resolve_action_filter = DataCondition.objects.filter(
+        condition_group=action_filter.condition_group,
+        type=Condition.ISSUE_PRIORITY_DEESCALATING,
+    ).first()
     updated_detector_trigger_fields: dict[str, Any] = {}
     updated_action_filter_fields: dict[str, Any] = {}
     label = alert_rule_trigger.label
@@ -731,7 +743,10 @@ def dual_update_migrated_alert_rule_trigger(
 
     detector_trigger.update(**updated_detector_trigger_fields)
     if updated_action_filter_fields:
+        # these are updated together
         action_filter.update(**updated_action_filter_fields)
+        if resolve_action_filter is not None:
+            resolve_action_filter.update(**updated_action_filter_fields)
 
     return detector_trigger, action_filter
 
@@ -835,8 +850,7 @@ def dual_delete_migrated_alert_rule_trigger(alert_rule_trigger: AlertRuleTrigger
             action.delete()
 
         detector_trigger.delete()
-        action_filter.delete()
-        action_filter_dcg.delete()
+        action_filter_dcg.delete()  # deletes the action filter and resolve action filter
 
     return None
 

tests/sentry/incidents/serializers/test_workflow_engine_base.py

@@ -33,7 +33,7 @@ def setUp(self) -> None:
             alert_rule_trigger=self.critical_trigger
         )
         _, _, _, self.detector, _, _, _, _ = migrate_alert_rule(self.alert_rule)
-        self.critical_detector_trigger, _ = migrate_metric_data_conditions(self.critical_trigger)
+        self.critical_detector_trigger, _, _ = migrate_metric_data_conditions(self.critical_trigger)
 
         self.critical_action, _, _ = migrate_metric_action(self.critical_trigger_action)
         self.resolve_trigger_data_condition = migrate_resolve_threshold_data_condition(
@@ -94,7 +94,7 @@ def add_warning_trigger(self) -> None:
         self.warning_trigger_action = self.create_alert_rule_trigger_action(
             alert_rule_trigger=self.warning_trigger
         )
-        self.warning_detector_trigger, _ = migrate_metric_data_conditions(self.warning_trigger)
+        self.warning_detector_trigger, _, _ = migrate_metric_data_conditions(self.warning_trigger)
         self.warning_action, _, _ = migrate_metric_action(self.warning_trigger_action)
         self.expected_warning_action = [
             {

tests/sentry/incidents/serializers/test_workflow_engine_data_condition.py

@@ -101,7 +101,7 @@ def test_comparison_delta(self) -> None:
             alert_rule_trigger=comparison_delta_trigger
         )
         _, _, _, detector, _, _, _, _ = migrate_alert_rule(comparison_delta_rule)
-        comparison_detector_trigger, _ = migrate_metric_data_conditions(comparison_delta_trigger)
+        comparison_detector_trigger, _, _ = migrate_metric_data_conditions(comparison_delta_trigger)
         migrate_resolve_threshold_data_condition(comparison_delta_rule)
         action, _, _ = migrate_metric_action(comparison_delta_trigger_action)
 
@@ -131,8 +131,8 @@ def test_multiple_rules(self) -> None:
             self.create_rule_triggers_and_actions()
         )
         migrate_alert_rule(alert_rule)
-        critical_detector_trigger, _ = migrate_metric_data_conditions(critical_trigger)
-        warning_detector_trigger, _ = migrate_metric_data_conditions(warning_trigger)
+        critical_detector_trigger, _, _ = migrate_metric_data_conditions(critical_trigger)
+        warning_detector_trigger, _, _ = migrate_metric_data_conditions(warning_trigger)
         migrate_resolve_threshold_data_condition(alert_rule)
         migrate_metric_action(critical_action)
         migrate_metric_action(warning_action)

tests/sentry/workflow_engine/handlers/condition/test_issue_priority_deescalating_handler.py

@@ -40,14 +40,14 @@ def setUp(self):
         dc_critical = data_condition_critical_tuple[1]
 
         self.deescalating_dc_warning = self.create_data_condition(
-            comparison={"priority": DetectorPriorityLevel.MEDIUM.value},
+            comparison=DetectorPriorityLevel.MEDIUM,
             type=self.condition,
             condition_result=True,
             condition_group=dc_warning.condition_group,
         )
 
         self.deescalating_dc_critical = self.create_data_condition(
-            comparison={"priority": DetectorPriorityLevel.HIGH.value},
+            comparison=DetectorPriorityLevel.HIGH,
             type=self.condition,
             condition_result=True,
             condition_group=dc_critical.condition_group,

tests/sentry/workflow_engine/migration_helpers/test_migrate_alert_rule.py

@@ -167,14 +167,28 @@ def assert_alert_rule_trigger_migrated(alert_rule_trigger):
     workflow_dcgs = DataConditionGroup.objects.filter(workflowdataconditiongroup__workflow=workflow)
 
     data_condition = DataCondition.objects.get(
-        comparison=condition_result, condition_result=True, condition_group__in=workflow_dcgs
+        comparison=condition_result,
+        condition_result=True,
+        condition_group__in=workflow_dcgs,
+        type=Condition.ISSUE_PRIORITY_GREATER_OR_EQUAL,
     )
     assert data_condition.type == Condition.ISSUE_PRIORITY_GREATER_OR_EQUAL
     assert data_condition.condition_result is True
     assert WorkflowDataConditionGroup.objects.filter(
         condition_group=data_condition.condition_group
     ).exists()
 
+    resolve_data_condition = DataCondition.objects.get(
+        comparison=condition_result,
+        condition_result=True,
+        condition_group__in=workflow_dcgs,
+        type=Condition.ISSUE_PRIORITY_DEESCALATING,
+    )
+    assert resolve_data_condition.condition_group == data_condition.condition_group
+    assert WorkflowDataConditionGroup.objects.filter(
+        condition_group=resolve_data_condition.condition_group
+    ).exists()
+
 
 def build_sentry_app_compare_blob(
     sentry_app_config: list[dict[str, Any]],
@@ -333,7 +347,7 @@ def create_migrated_metric_alert_rule_trigger_objects(
         alert_rule_trigger: AlertRuleTrigger,
         priority: DetectorPriorityLevel,
         detector_trigger_type: Condition,
-    ) -> tuple[DataCondition, DataCondition]:
+    ) -> tuple[DataCondition, DataCondition, DataCondition]:
         """
         Set up all the necessary ACI objects for a dual written metric alert trigger.
         """
@@ -365,7 +379,13 @@ def create_migrated_metric_alert_rule_trigger_objects(
             condition_group=data_condition_group,
         )
 
-        return detector_trigger, action_filter
+        resolve_action_filter = self.create_data_condition(
+            comparison=priority,
+            condition_result=True,
+            type=Condition.ISSUE_PRIORITY_DEESCALATING,
+            condition_group=data_condition_group,
+        )
+        return detector_trigger, action_filter, resolve_action_filter
 
     def create_migrated_metric_alert_rule_resolve_objects(
         self, alert_rule: AlertRule, resolve_threshold, detector_trigger_type: Condition
@@ -516,8 +536,10 @@ def test_dual_delete_comprehensive(self):
             alert_rule_trigger=alert_rule_trigger
         )
 
-        detector_trigger, action_filter = self.create_migrated_metric_alert_rule_trigger_objects(
-            alert_rule_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
+        detector_trigger, action_filter, resolve_action_filter = (
+            self.create_migrated_metric_alert_rule_trigger_objects(
+                alert_rule_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
+            )
         )
         action_filter_dcg = action_filter.condition_group
         action, data_condition_group_action, aarta = (
@@ -541,6 +563,7 @@ def test_dual_delete_comprehensive(self):
         # check trigger objects
         assert not DataConditionGroup.objects.filter(id=action_filter_dcg.id).exists()
         assert not DataCondition.objects.filter(id=detector_trigger.id).exists()
+        assert not DataCondition.objects.filter(id=resolve_action_filter.id).exists()
         assert not DataConditionAlertRuleTrigger.objects.filter(
             data_condition=detector_trigger
         ).exists()
@@ -594,10 +617,12 @@ def setUp(self):
         self.alert_rule_trigger = self.create_alert_rule_trigger(
             alert_rule=self.metric_alert, label="critical", alert_threshold=200
         )
-        self.critical_detector_trigger, self.critical_action_filter = (
-            self.create_migrated_metric_alert_rule_trigger_objects(
-                self.alert_rule_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
-            )
+        (
+            self.critical_detector_trigger,
+            self.critical_action_filter,
+            self.critical_resolve_action_filter,
+        ) = self.create_migrated_metric_alert_rule_trigger_objects(
+            self.alert_rule_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
         )
         self.resolve_detector_trigger = self.create_migrated_metric_alert_rule_resolve_objects(
             self.metric_alert, 200, Condition.LESS_OR_EQUAL
@@ -736,7 +761,7 @@ def setUp(self):
             alert_rule=self.metric_alert, label="critical"
         )
         self.create_migrated_metric_alert_objects(self.metric_alert)
-        self.detector_trigger, self.action_filter = (
+        self.detector_trigger, self.action_filter, self.resolve_action_filter = (
             self.create_migrated_metric_alert_rule_trigger_objects(
                 self.alert_rule_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
             )
@@ -792,10 +817,12 @@ def setUp(self):
             alert_rule=self.metric_alert, label="critical", alert_threshold=200
         )
         self.create_migrated_metric_alert_objects(self.metric_alert)
-        self.critical_detector_trigger, self.critical_action_filter = (
-            self.create_migrated_metric_alert_rule_trigger_objects(
-                self.alert_rule_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
-            )
+        (
+            self.critical_detector_trigger,
+            self.critical_action_filter,
+            self.critical_resolve_action_filter,
+        ) = self.create_migrated_metric_alert_rule_trigger_objects(
+            self.alert_rule_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
         )
         self.resolve_detector_trigger = self.create_migrated_metric_alert_rule_resolve_objects(
             self.metric_alert, 200, Condition.LESS_OR_EQUAL
@@ -1254,7 +1281,7 @@ def setUp(self):
             alert_rule=self.metric_alert, label="critical"
         )
         self.create_migrated_metric_alert_objects(self.metric_alert)
-        self.detector_trigger, self.action_filter = (
+        self.detector_trigger, self.action_filter, self.resolve_action_filter = (
             self.create_migrated_metric_alert_rule_trigger_objects(
                 self.alert_rule_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
             )
@@ -1337,7 +1364,7 @@ def setUp(self):
         )
 
         self.create_migrated_metric_alert_objects(self.dual_written_alert)
-        self.detector_trigger, self.action_filter = (
+        self.detector_trigger, self.action_filter, self.resolve_action_filter = (
             self.create_migrated_metric_alert_rule_trigger_objects(
                 self.dual_written_trigger, DetectorPriorityLevel.HIGH, Condition.GREATER
             )