Merge remote-tracking branch 'origin/fix/flaky-test-helpful-event-id' into shuffle-tests-across-shards

Author: joshuarli

src/sentry/models/group.py

@@ -224,15 +224,15 @@ class GroupStatus:
 
 
 class EventOrdering(Enum):
-    LATEST = ["project_id", "-timestamp", "-event_id"]
-    OLDEST = ["project_id", "timestamp", "event_id"]
+    LATEST = ["project_id", "-timestamp", "-id"]
+    OLDEST = ["project_id", "timestamp", "id"]
     RECOMMENDED = [
         "-replay.id",
         "-trace.sampled",
         "num_processing_errors",
         "-profile.id",
         "-timestamp",
-        "-event_id",
+        "-id",
     ]
 
 

tests/sentry/workflow_engine/test_integration.py

@@ -399,8 +399,8 @@ def test_slow_condition_subqueries(self, mock_trigger: MagicMock) -> None:
         )
         now = timezone.now()
 
-        batch_client = DelayedWorkflowClient()
         with freeze_time(now):
+            batch_client = DelayedWorkflowClient()
             event_1 = self.create_error_event(environment="production", tags=[["hello", "world"]])
             self.post_process_error(event_1)
             assert not mock_trigger.called
@@ -415,8 +415,9 @@ def test_slow_condition_subqueries(self, mock_trigger: MagicMock) -> None:
 
             project_ids = batch_client.get_project_ids(
                 min=0,
-                max=timezone.now().timestamp(),
+                max=now.timestamp() + 1,
             )
+            assert project_ids, "Expected data to be buffered for delayed processing"
 
             process_delayed_workflows(list(project_ids.keys())[0])
             assert not mock_trigger.called
@@ -429,8 +430,9 @@ def test_slow_condition_subqueries(self, mock_trigger: MagicMock) -> None:
 
             project_ids = batch_client.get_project_ids(
                 min=0,
-                max=timezone.now().timestamp(),
+                max=(now + timedelta(minutes=1)).timestamp() + 1,
             )
+            assert project_ids, "Expected data to be buffered for delayed processing"
 
             process_delayed_workflows(list(project_ids.keys())[0])
             mock_trigger.assert_called_once()