Merge branch 'main' into devs/jd/add-run-id/I2a2e20331980c59a9f06aea89c11ac4d67542fd0

Author: mergify[bot]

mergify_cli/ci/upload.py

@@ -35,7 +35,7 @@ def capture_log(logger: logging.Logger) -> typing.Generator[io.StringIO, None, N
     stream_handler.close()
 
 
-def _upload(
+def upload_spans(
     api_url: str,
     token: str,
     repository: str,
@@ -93,8 +93,12 @@ async def upload(  # noqa: PLR0913, PLR0917
             )
 
     if spans:
-        _upload(api_url, token, repository, spans)
-        connect_traces(spans)
-        console.log("[green]:tada: File(s) uploaded[/]")
+        try:
+            upload_spans(api_url, token, repository, spans)
+        except UploadError as e:
+            console.log(f"Error uploading spans: {e}", style="red")
+        else:
+            connect_traces(spans)
+            console.log("[green]:tada: File(s) uploaded[/]")
     else:
         console.log("[orange]No tests were detected in the JUnit file(s)[/]")

mergify_cli/tests/ci/test_upload.py

@@ -1,6 +1,8 @@
 import pathlib
 import re
 
+from opentelemetry.sdk.trace import ReadableSpan
+import opentelemetry.trace.span
 import pytest
 import responses
 
@@ -66,22 +68,54 @@ async def test_junit_upload(
             captured.out,
             re.MULTILINE,
         )
-    else:
-        assert "🎉 File(s) uploaded" in captured.out
+
+    assert "🎉 File(s) uploaded" in captured.out
 
 
 @responses.activate(assert_all_requests_are_fired=True)
-async def test_junit_upload_http_error() -> None:
+def test_junit_upload_http_error() -> None:
     responses.post(
         "https://api.mergify.com/v1/repos/user/repo/ci/traces",
         status=422,
         json={"detail": "Not enabled on this repository"},
     )
 
     with pytest.raises(upload.UploadError):
-        await upload.upload(
+        upload.upload_spans(
             "https://api.mergify.com",
             "token",
             "user/repo",
-            (str(REPORT_XML),),
+            [
+                ReadableSpan(
+                    name="hello",
+                    context=opentelemetry.trace.span.SpanContext(
+                        trace_id=1234,
+                        span_id=324,
+                        is_remote=False,
+                    ),
+                ),
+            ],
         )
+
+
+@responses.activate(assert_all_requests_are_fired=True)
+async def test_junit_upload_http_error_console(
+    capsys: pytest.CaptureFixture[str],
+) -> None:
+    responses.post(
+        "https://api.mergify.com/v1/repos/user/repo/ci/traces",
+        status=422,
+        json={"detail": "Not enabled on this repository"},
+    )
+
+    await upload.upload(
+        "https://api.mergify.com",
+        "token",
+        "user/repo",
+        (str(REPORT_XML),),
+    )
+    captured = capsys.readouterr()
+    assert (
+        'Error uploading spans: Failed to export batch code: 422, reason: {"detail": "Not\nenabled on this repository"}'
+        in captured.out
+    )