🔧 chore(aci): pass evidence data to activity model for notifications (#95475)

Author: iamrajjoshi

src/sentry/issues/status_change_consumer.py

@@ -67,6 +67,7 @@ def update_status(group: Group, status_change: StatusChangeMessageData) -> None:
             status=new_status,
             substatus=new_substatus,
             activity_type=activity_type,
+            activity_data=status_change.get("activity_data"),
         )
         remove_group_from_inbox(group, action=GroupInboxRemoveAction.RESOLVED)
         kick_off_status_syncs.apply_async(
@@ -90,6 +91,7 @@ def update_status(group: Group, status_change: StatusChangeMessageData) -> None:
             status=new_status,
             substatus=new_substatus,
             activity_type=activity_type,
+            activity_data=status_change.get("activity_data"),
         )
         remove_group_from_inbox(group, action=GroupInboxRemoveAction.IGNORED)
         kick_off_status_syncs.apply_async(
@@ -127,6 +129,7 @@ def update_status(group: Group, status_change: StatusChangeMessageData) -> None:
             substatus=new_substatus,
             activity_type=activity_type,
             from_substatus=group.substatus,
+            activity_data=status_change.get("activity_data"),
         )
         add_group_to_inbox(group, group_inbox_reason)
         kick_off_status_syncs.apply_async(
@@ -164,7 +167,7 @@ def get_group_from_fingerprint(project_id: int, fingerprint: Sequence[str]) -> G
 
 
 def bulk_get_groups_from_fingerprints(
-    project_fingerprint_pairs: Iterable[tuple[int, Sequence[str]]]
+    project_fingerprint_pairs: Iterable[tuple[int, Sequence[str]]],
 ) -> dict[tuple[int, tuple[str, ...]], Group]:
     """
     Returns a map of (project, fingerprint) to the group.

src/sentry/issues/status_change_message.py

@@ -2,7 +2,7 @@
 
 from collections.abc import Sequence
 from dataclasses import dataclass, field
-from typing import TypedDict
+from typing import Any, TypedDict
 from uuid import uuid4
 
 
@@ -13,6 +13,7 @@ class StatusChangeMessageData(TypedDict):
     new_substatus: int | None
     id: str
     detector_id: int | None
+    activity_data: dict[str, Any] | None
 
 
 @dataclass(frozen=True)
@@ -22,6 +23,7 @@ class StatusChangeMessage:
     new_status: int
     new_substatus: int | None
     detector_id: int | None = None
+    activity_data: dict[str, Any] | None = None
     id: str = field(default_factory=lambda: uuid4().hex)
 
     def to_dict(
@@ -33,5 +35,6 @@ def to_dict(
             "new_status": self.new_status,
             "new_substatus": self.new_substatus,
             "detector_id": self.detector_id,
+            "activity_data": self.activity_data,
             "id": self.id,
         }

src/sentry/workflow_engine/handlers/detector/stateful.py

@@ -2,7 +2,7 @@
 import dataclasses
 import logging
 from datetime import UTC, datetime, timedelta
-from typing import Generic, cast
+from typing import Any, Generic, cast
 from uuid import uuid4
 
 from django.conf import settings
@@ -380,18 +380,31 @@ def evaluate(
         self.state_manager.commit_state_updates()
         return results
 
-    def _create_resolve_message(self, group_key: DetectorGroupKey = None) -> StatusChangeMessage:
+    def _create_resolve_message(
+        self,
+        condition_results: ProcessedDataConditionGroup,
+        data_packet: DataPacket[DataPacketType],
+        group_key: DetectorGroupKey = None,
+    ) -> StatusChangeMessage:
         fingerprint = [
             *self.build_issue_fingerprint(),
             self.state_manager.build_key(group_key),
         ]
 
+        evidence_data = self._build_evidence_data(
+            detector_occurrence=None,
+            evaluation_result=condition_results,
+            new_priority=DetectorPriorityLevel.OK,
+            data_packet=data_packet,
+        )
+
         return StatusChangeMessage(
             fingerprint=fingerprint,
             project_id=self.detector.project_id,
             new_status=GroupStatus.RESOLVED,
             new_substatus=None,
             detector_id=self.detector.id,
+            activity_data=evidence_data,
         )
 
     def _extract_value_from_packet(
@@ -430,7 +443,11 @@ def _build_detector_evaluation_result(
 
         if new_priority == DetectorPriorityLevel.OK:
             # Call the `create_resolve_message` method to create the status change.
-            detector_result = self._create_resolve_message(group_key)
+            detector_result = self._create_resolve_message(
+                condition_results,
+                data_packet,
+                group_key,
+            )
         else:
             # Call the `create_occurrence` method to create the detector occurrence.
             detector_occurrence, event_data = self.create_occurrence(
@@ -484,6 +501,33 @@ def _get_configured_detector_levels(self) -> list[DetectorPriorityLevel]:
 
         return list(DetectorPriorityLevel(level) for level in condition_result_levels)
 
+    def _build_evidence_data(
+        self,
+        detector_occurrence: DetectorOccurrence | None,
+        evaluation_result: ProcessedDataConditionGroup,
+        new_priority: DetectorPriorityLevel,
+        data_packet: DataPacket[DataPacketType],
+    ) -> dict[str, Any]:
+
+        evidence_data: dict[str, Any] = {}
+
+        if detector_occurrence:
+            evidence_data.update(detector_occurrence.evidence_data)
+
+        evidence_data.update(
+            {
+                "detector_id": self.detector.id,
+                "value": new_priority,
+                "data_packet_source_id": str(data_packet.source_id),
+                "conditions": [
+                    result.condition.get_snapshot()
+                    for result in evaluation_result.condition_results
+                ],
+            }
+        )
+
+        return evidence_data
+
     def _create_decorated_issue_occurrence(
         self,
         data_packet: DataPacket[DataPacketType],
@@ -495,15 +539,9 @@ def _create_decorated_issue_occurrence(
         """
         Decorate the issue occurrence with the data from the detector's evaluation result.
         """
-        evidence_data = {
-            **detector_occurrence.evidence_data,
-            "detector_id": self.detector.id,
-            "value": new_priority,
-            "data_packet_source_id": str(data_packet.source_id),
-            "conditions": [
-                result.condition.get_snapshot() for result in evaluation_result.condition_results
-            ],
-        }
+        evidence_data = self._build_evidence_data(
+            detector_occurrence, evaluation_result, new_priority, data_packet
+        )
 
         fingerprint = [
             *self.build_issue_fingerprint(group_key),

tests/sentry/issues/test_status_change_consumer.py

@@ -30,6 +30,7 @@ def get_test_message_status_change(
         "new_substatus": new_substatus,
         "payload_type": "status_change",
         "detector_id": detector_id,
+        "activity_data": {"test": "test"},
     }
 
     return payload
@@ -373,6 +374,7 @@ def setUp(self) -> None:
             new_status=status_change["new_status"],
             new_substatus=status_change.get("new_substatus"),
             detector_id=status_change.get("detector_id"),
+            activity_data=status_change.get("activity_data"),
         )
 
     def get_latest_activity(self, activity_type: ActivityType) -> Activity:
@@ -399,6 +401,8 @@ def test_handler_is_called__resolved(self) -> None:
             update_status(self.group, self.message)
             latest_activity = self.get_latest_activity(ActivityType.SET_RESOLVED)
 
+            assert latest_activity.data == {"test": "test"}
+
             mock_handler.assert_called_once_with(self.group, self.message, latest_activity)
 
     def test_handler_is_not_called__unresolved_escalating(self) -> None:
@@ -431,6 +435,9 @@ def test_handler_is_called_unresolved_ongoing(self) -> None:
 
             update_status(self.group, self.message)
             latest_activity = self.get_latest_activity(ActivityType.AUTO_SET_ONGOING)
+
+            assert latest_activity.data == {"test": "test"}
+
             mock_handler.assert_called_once_with(self.group, self.message, latest_activity)
 
     def test_handler_is_called__unresolved_regressed(self) -> None:
@@ -447,6 +454,9 @@ def test_handler_is_called__unresolved_regressed(self) -> None:
 
             update_status(self.group, self.message)
             latest_activity = self.get_latest_activity(ActivityType.SET_REGRESSION)
+
+            assert latest_activity.data == {"test": "test"}
+
             mock_handler.assert_called_once_with(self.group, self.message, latest_activity)
 
     def test_handler_is_called__ignored(self) -> None:
@@ -463,4 +473,7 @@ def test_handler_is_called__ignored(self) -> None:
 
             update_status(self.group, self.message)
             latest_activity = self.get_latest_activity(ActivityType.SET_IGNORED)
+
+            assert latest_activity.data == {"test": "test"}
+
             mock_handler.assert_called_once_with(self.group, self.message, latest_activity)

tests/sentry/issues/test_utils.py

@@ -95,6 +95,7 @@ def build_statuschange_data(self, **overrides: Any) -> StatusChangeMessageData:
             "new_status": 1,
             "new_substatus": 1,
             "detector_id": None,
+            "activity_data": {"test": "test"},
         }
         kwargs.update(overrides)  # type: ignore[typeddict-item]
 

tests/sentry/workflow_engine/test_task.py

@@ -58,6 +58,7 @@ def test__no_detector_id(self):
             new_substatus=None,
             fingerprint=["test_fingerprint"],
             detector_id=None,  # No detector_id provided
+            activity_data=None,
         )
 
         with mock.patch("sentry.workflow_engine.tasks.workflows.metrics.incr") as mock_incr:
@@ -80,6 +81,7 @@ def test__feature_flag(self):
             new_substatus=None,
             fingerprint=["test_fingerprint"],
             detector_id=detector.id,
+            activity_data={"test": "test"},
         )
 
         with mock.patch(
@@ -105,6 +107,7 @@ def test(self):
             new_substatus=None,
             fingerprint=["test_fingerprint"],
             detector_id=detector.id,
+            activity_data={"test": "test"},
         )
 
         with mock.patch(

tests/sentry/workflow_engine/test_task_integration.py

@@ -62,6 +62,7 @@ def test_handler_invoked__when_resolved(self):
             new_substatus=None,
             fingerprint=[self.fingerprint],
             detector_id=self.detector.id,
+            activity_data={"test": "test"},
         )
 
         with mock.patch("sentry.workflow_engine.tasks.workflows.metrics.incr") as mock_incr: