fix(ci-insights): Preserve initial test status during flaky detection reruns (#358)

In unhealthy mode, the span's `test.case.result.status` was being
overwritten with "rerun" during each rerun iteration. Since "rerun" is
not a valid status on the server side, these spans were being dropped,
causing `rerun_count` to never be recorded for unhealthy tests.

This fix ensures span attributes are only set during the initial test
run by checking `is_test_rerun()` and returning early for subsequent
reruns. The `test.case.result.status` now correctly reflects the
initial run's outcome.

Fixes: MRGFY-6373
Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: remyduthu

pytest_mergify/__init__.py

@@ -364,6 +364,17 @@ def pytest_runtest_logreport(self, report: _pytest.reports.TestReport) -> None:
         if report.outcome is None:
             return  # type: ignore[unreachable]
 
+        if (
+            self.mergify_ci.flaky_detector
+            and self.mergify_ci.flaky_detector.is_test_rerun(report.nodeid)
+        ):
+            return
+
+        self._update_current_span_from_report(report)
+
+    def _update_current_span_from_report(
+        self, report: _pytest.reports.TestReport
+    ) -> None:
         has_error = report.outcome == "failed"
         status_code = (
             opentelemetry.trace.StatusCode.ERROR

pytest_mergify/flaky_detection.py

@@ -253,6 +253,13 @@ def is_test_too_slow(self, test: str) -> bool:
             > metrics.remaining_time()
         )
 
+    def is_test_rerun(self, test: str) -> bool:
+        """Returns `True` if the test has already completed its initial run and is
+        now in a rerun, `False` otherwise."""
+        return (
+            metrics := self._test_metrics.get(test)
+        ) is not None and metrics.rerun_count > 1
+
     def is_rerunning_test(self, test: str) -> bool:
         return (
             metrics := self._test_metrics.get(test)

tests/test_ci_insights.py

@@ -308,6 +308,8 @@ def test_quux():
             assert not span.attributes.get("cicd.test.new")
             assert span.attributes.get("cicd.test.flaky_detection", False) is True
             assert span.attributes.get("cicd.test.rerun_count", 0) == 1000
+            # The status should reflect the initial run outcome, not "rerun"
+            assert span.attributes.get("test.case.result.status") == "passed"
 
 
 @responses.activate