Skip to content

Commit 76eb0a3

Browse files
authored
fix(workflow-engine): Remove unused has_reappeared from workflow event data (#108082)
has_reappeared hasn't been used for at least 6 months. This removes it from all workflows code except for trigger_action param construction, since the deployed task expects complete parameters (though this change fixes that too).
1 parent 8080c11 commit 76eb0a3

File tree

7 files changed

+4
-22
lines changed

7 files changed

+4
-22
lines changed

src/sentry/workflow_engine/tasks/actions.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def build_trigger_action_task_params(
5656
"group_id": event_data.event.group_id,
5757
"occurrence_id": occurrence_id,
5858
"group_state": event_data.group_state,
59-
"has_reappeared": event_data.has_reappeared,
59+
"has_reappeared": False, # TODO: remove when deployed trigger_action task doesn't expect it
6060
"has_escalated": event_data.has_escalated,
6161
}
6262

@@ -83,10 +83,10 @@ def trigger_action(
8383
group_id: int,
8484
occurrence_id: str | None,
8585
group_state: GroupState,
86-
has_reappeared: bool,
8786
has_escalated: bool,
8887
detector_id: int | None = None, # TODO: remove
8988
notification_uuid: str | None = None,
89+
**kwargs: dict[str, object],
9090
) -> None:
9191
import uuid
9292

@@ -114,7 +114,6 @@ def trigger_action(
114114
workflow_id=workflow_id,
115115
occurrence_id=occurrence_id,
116116
group_state=group_state,
117-
has_reappeared=has_reappeared,
118117
has_escalated=has_escalated,
119118
)
120119
elif activity_id is not None:

src/sentry/workflow_engine/tasks/utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ def build_workflow_event_data_from_event(
6969
workflow_id: int | None = None,
7070
occurrence_id: str | None = None,
7171
group_state: GroupState | None = None,
72-
has_reappeared: bool = False,
7372
has_escalated: bool = False,
7473
) -> WorkflowEventData:
7574
"""
@@ -99,7 +98,6 @@ def build_workflow_event_data_from_event(
9998
event=group_event,
10099
group=group,
101100
group_state=group_state,
102-
has_reappeared=has_reappeared,
103101
has_escalated=has_escalated,
104102
workflow_env=workflow_env,
105103
)

src/sentry/workflow_engine/tasks/workflows.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ def process_workflows_event(
102102
group_id: int,
103103
occurrence_id: str | None,
104104
group_state: GroupState,
105-
has_reappeared: bool,
106105
has_escalated: bool,
107106
start_timestamp_seconds: float | None = None,
108-
project_id: int | None = None, # TODO: remove
109107
**kwargs: dict[str, Any],
110108
) -> None:
111109
from sentry.workflow_engine.processors.workflow import process_workflows
@@ -120,7 +118,6 @@ def process_workflows_event(
120118
group_id=group_id,
121119
occurrence_id=occurrence_id,
122120
group_state=group_state,
123-
has_reappeared=has_reappeared,
124121
has_escalated=has_escalated,
125122
)
126123
except (RetryError, OSError) as e:

src/sentry/workflow_engine/types.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ class WorkflowEventData:
9393
event: GroupEvent | Activity
9494
group: Group
9595
group_state: GroupState | None = None
96-
has_reappeared: bool | None = None
9796
has_escalated: bool | None = None
9897
workflow_env: Environment | None = None
9998

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ def setUp(self) -> None:
2828
"is_new_group_environment": False,
2929
}
3030
),
31-
has_reappeared=True,
3231
has_escalated=True,
3332
)
3433
self.dc = self.create_data_condition(
@@ -74,16 +73,10 @@ def test_group_state_is_new(self) -> None:
7473
self.assert_does_not_pass(self.dc, self.event_data)
7574

7675
def test_is_escalating(self) -> None:
77-
self.event_data = replace(self.event_data, has_reappeared=False, has_escalated=True)
76+
self.event_data = replace(self.event_data, has_escalated=True)
7877
self.assert_passes(self.dc, self.event_data)
7978

80-
self.event_data = replace(self.event_data, has_reappeared=True, has_escalated=True)
81-
self.assert_passes(self.dc, self.event_data)
82-
83-
self.event_data = replace(self.event_data, has_reappeared=False, has_escalated=False)
84-
self.assert_does_not_pass(self.dc, self.event_data)
85-
86-
self.event_data = replace(self.event_data, has_reappeared=True, has_escalated=False)
79+
self.event_data = replace(self.event_data, has_escalated=False)
8780
self.assert_does_not_pass(self.dc, self.event_data)
8881

8982
def test_priority(self) -> None:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ def test(self) -> None:
4444
job = WorkflowEventData(
4545
event=self.group_event,
4646
group=self.group_event.group,
47-
has_reappeared=False,
4847
has_escalated=True,
4948
)
5049
dc = self.create_data_condition(

tests/sentry/workflow_engine/processors/test_workflow.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ def test_process_workflows_event(self, mock_fire_actions: MagicMock) -> None:
118118
"is_regression": True,
119119
"is_new_group_environment": False,
120120
},
121-
has_reappeared=False,
122121
has_escalated=False,
123122
)
124123
mock_fire_actions.assert_called_once()
@@ -155,7 +154,6 @@ def test_process_workflows_event__service_hooks_event_alert(
155154
"is_regression": True,
156155
"is_new_group_environment": False,
157156
},
158-
has_reappeared=False,
159157
has_escalated=False,
160158
)
161159

@@ -195,7 +193,6 @@ def test_process_workflows_event__service_hooks_event_created(
195193
"is_regression": True,
196194
"is_new_group_environment": False,
197195
},
198-
has_reappeared=False,
199196
has_escalated=False,
200197
)
201198

0 commit comments

Comments
 (0)