From 29c5c7a0d8ee57a073dc5f868498ea910b4a3c8d Mon Sep 17 00:00:00 2001 From: Josh Callender <1569818+saponifi3d@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:25:45 -0800 Subject: [PATCH 1/2] change event_data to just have the ID so we can look it up in _admin --- src/sentry/workflow_engine/types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/workflow_engine/types.py b/src/sentry/workflow_engine/types.py index 2e151899eaf52d..d2a7a10a98cfdc 100644 --- a/src/sentry/workflow_engine/types.py +++ b/src/sentry/workflow_engine/types.py @@ -127,7 +127,7 @@ def get_snapshot(self) -> dict[str, Any]: "associated_detector": associated_detector, "event": self.event, "group": self.event.group, - "event_data": self.event.data, + "event_data_id": self.event.data.id, "action_filter_conditions": action_filter_conditions, "triggered_actions": triggered_actions, "triggered_workflows": triggered_workflows, From e04a178add07244f643a5216dcf39b200ece321a Mon Sep 17 00:00:00 2001 From: Josh Callender <1569818+saponifi3d@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:46:29 -0800 Subject: [PATCH 2/2] fix the tests --- src/sentry/workflow_engine/types.py | 7 ++++++- tests/sentry/workflow_engine/test_task.py | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/sentry/workflow_engine/types.py b/src/sentry/workflow_engine/types.py index d2a7a10a98cfdc..be8c61d43b6113 100644 --- a/src/sentry/workflow_engine/types.py +++ b/src/sentry/workflow_engine/types.py @@ -122,12 +122,17 @@ def get_snapshot(self) -> dict[str, Any]: if self.triggered_actions: triggered_actions = [action.get_snapshot() for action in self.triggered_actions] + event_id = None + if hasattr(self.event, "event_id"): + # Activity's do not have an event id + event_id = self.event.event_id + return { "workflow_ids": workflow_ids, "associated_detector": associated_detector, "event": self.event, + "event_id": event_id, "group": self.event.group, - "event_data_id": self.event.data.id, "action_filter_conditions": action_filter_conditions, "triggered_actions": triggered_actions, "triggered_workflows": triggered_workflows, diff --git a/tests/sentry/workflow_engine/test_task.py b/tests/sentry/workflow_engine/test_task.py index 3cd89acc56d8e2..2fef8a73139177 100644 --- a/tests/sentry/workflow_engine/test_task.py +++ b/tests/sentry/workflow_engine/test_task.py @@ -158,7 +158,7 @@ def test_process_workflow_activity__no_workflows(self, mock_logger) -> None: "associated_detector": self.detector.get_snapshot(), "event": self.activity, "group": self.activity.group, - "event_data": self.activity.data, + "event_id": None, "action_filter_conditions": None, "triggered_actions": None, "triggered_workflows": None, @@ -205,7 +205,7 @@ def test_process_workflow_activity__workflows__no_actions( "associated_detector": self.detector.get_snapshot(), "event": self.activity, "group": self.activity.group, - "event_data": self.activity.data, + "event_id": None, "action_filter_conditions": None, "triggered_actions": None, "triggered_workflows": None, @@ -285,7 +285,7 @@ def test_process_workflow_activity__success_logs( "associated_detector": self.detector.get_snapshot(), "event": self.activity, "group": self.activity.group, - "event_data": self.activity.data, + "event_id": None, "action_filter_conditions": [self.action_group.get_snapshot()], "triggered_actions": [self.action.get_snapshot()], "triggered_workflows": [self.workflow.get_snapshot()],