a bit fancier

Author: kcons

src/sentry/workflow_engine/processors/workflow.py

@@ -69,6 +69,12 @@ def from_results(cls, results: Iterable[TriggerResult]) -> "EvaluationStats":
                 untainted += 1
         return cls(tainted=tainted, untainted=untainted)
 
+    def __add__(self, other: "EvaluationStats") -> "EvaluationStats":
+        return EvaluationStats(
+            tainted=self.tainted + other.tainted,
+            untainted=self.untainted + other.untainted,
+        )
+
     def report_metrics(self, metric_name: str) -> None:
         metrics_incr(metric_name, self.tainted, tags={"tainted": True})
         metrics_incr(metric_name, self.untainted, tags={"tainted": False})
@@ -567,11 +573,11 @@ def process_workflows(
     triggered_workflows, queue_items_by_workflow_id, trigger_stats = evaluate_workflow_triggers(
         workflows, event_data, event_start_time
     )
-    trigger_stats.report_metrics("process_workflows.workflows_evaluated")
 
     workflow_evaluation_data.triggered_workflows = set(triggered_workflows.keys())
 
     if not triggered_workflows and not queue_items_by_workflow_id:
+        trigger_stats.report_metrics("process_workflows.workflows_evaluated")
         # TODO - re-think tainted once the actions are removed from process_workflows.
         return WorkflowEvaluation(
             tainted=True,
@@ -586,7 +592,7 @@ def process_workflows(
             triggered_workflows, event_data, queue_items_by_workflow_id, event_start_time
         )
     )
-    action_stats.report_metrics("process_workflows.workflows_evaluated")
+    (trigger_stats + action_stats).report_metrics("process_workflows.workflows_evaluated")
 
     enqueue_workflows(batch_client, queue_items_by_workflow_id)
 

tests/sentry/workflow_engine/processors/test_workflow.py

@@ -755,6 +755,11 @@ def test_action_filter_stats_excludes_delayed_workflows(self) -> None:
         assert self.workflow in queue_items
         assert stats == EvaluationStats(tainted=0, untainted=0)
 
+    def test_evaluation_stats_add(self) -> None:
+        a = EvaluationStats(tainted=1, untainted=2)
+        b = EvaluationStats(tainted=3, untainted=4)
+        assert a + b == EvaluationStats(tainted=4, untainted=6)
+
 
 @freeze_time(FROZEN_TIME)
 class TestWorkflowEnqueuing(BaseWorkflowTest):