|
40 | 40 | from sentry.utils.sdk import bind_organization_context, set_current_event_project
|
41 | 41 | from sentry.utils.sdk_crashes.sdk_crash_detection_config import build_sdk_crash_detection_configs
|
42 | 42 | from sentry.utils.services import build_instance_from_options_of_type
|
43 |
| -from sentry.workflow_engine.types import WorkflowEventData |
44 | 43 |
|
45 | 44 | if TYPE_CHECKING:
|
46 | 45 | from sentry.eventstore.models import Event, GroupEvent
|
@@ -955,45 +954,26 @@ def process_workflow_engine(job: PostProcessJob) -> None:
|
955 | 954 | """
|
956 | 955 | metrics.incr("workflow_engine.issue_platform.payload.received.occurrence")
|
957 | 956 |
|
958 |
| - from sentry.workflow_engine.processors.workflow import process_workflows |
959 | 957 | from sentry.workflow_engine.tasks.workflows import process_workflows_event
|
960 | 958 |
|
961 |
| - # PostProcessJob event is optional, WorkflowEventData event is required |
962 | 959 | if "event" not in job:
|
963 |
| - logger.error("Missing event to create WorkflowEventData", extra={"job": job}) |
| 960 | + logger.error("Missing event to schedule workflow task", extra={"job": job}) |
964 | 961 | return
|
965 | 962 |
|
966 | 963 | try:
|
967 |
| - workflow_event_data = WorkflowEventData( |
968 |
| - event=job["event"], |
969 |
| - group=job["event"].group, |
970 |
| - group_state=job.get("group_state"), |
971 |
| - has_reappeared=job.get("has_reappeared"), |
972 |
| - has_escalated=job.get("has_escalated"), |
| 964 | + process_workflows_event.delay( |
| 965 | + project_id=job["event"].project_id, |
| 966 | + event_id=job["event"].event_id, |
| 967 | + occurrence_id=job["event"].occurrence_id, |
| 968 | + group_id=job["event"].group_id, |
| 969 | + group_state=job["group_state"], |
| 970 | + has_reappeared=job["has_reappeared"], |
| 971 | + has_escalated=job["has_escalated"], |
973 | 972 | )
|
974 | 973 | except Exception:
|
975 |
| - logger.exception("Could not create WorkflowEventData", extra={"job": job}) |
| 974 | + logger.exception("Could not process workflow task", extra={"job": job}) |
976 | 975 | return
|
977 | 976 |
|
978 |
| - org = job["event"].project.organization |
979 |
| - if not features.has("organizations:workflow-engine-post-process-async", org): |
980 |
| - with sentry_sdk.start_span(op="tasks.post_process_group.workflow_engine.process_workflow"): |
981 |
| - process_workflows(workflow_event_data) |
982 |
| - else: |
983 |
| - try: |
984 |
| - process_workflows_event.delay( |
985 |
| - project_id=job["event"].project_id, |
986 |
| - event_id=job["event"].event_id, |
987 |
| - occurrence_id=job["event"].occurrence_id, |
988 |
| - group_id=job["event"].group_id, |
989 |
| - group_state=job["group_state"], |
990 |
| - has_reappeared=job["has_reappeared"], |
991 |
| - has_escalated=job["has_escalated"], |
992 |
| - ) |
993 |
| - except Exception: |
994 |
| - logger.exception("Could not process workflow task", extra={"job": job}) |
995 |
| - return |
996 |
| - |
997 | 977 |
|
998 | 978 | def process_workflow_engine_issue_alerts(job: PostProcessJob) -> None:
|
999 | 979 | """
|
|
0 commit comments