File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed
Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -57,9 +57,9 @@ def _upload(
5757
5858def connect_traces (spans : list [ReadableSpan ]) -> None :
5959 if detector .get_ci_provider () == "github_actions" and spans :
60- trace_id = spans [0 ].context .trace_id
60+ root_span_id = spans [0 ].context .span_id
6161 console .print (
62- f"::notice title=Mergify CI::MERGIFY_TRACE_ID= { trace_id } " ,
62+ f"::notice title=Mergify CI::MERGIFY_TEST_ROOT_SPAN_ID= { root_span_id } " ,
6363 soft_wrap = True ,
6464 )
6565
Original file line number Diff line number Diff line change @@ -61,11 +61,12 @@ async def test_junit_upload(
6161
6262 captured = capsys .readouterr ()
6363 if env ["GITHUB_ACTIONS" ] == "true" :
64- assert re .search (
65- r"^::notice title=Mergify CI::MERGIFY_TRACE_ID= \d+" ,
64+ matched = re .search (
65+ r"^::notice title=Mergify CI::MERGIFY_TEST_ROOT_SPAN_ID=( \d+) " ,
6666 captured .out ,
6767 re .MULTILINE ,
6868 )
69+ assert int (matched .group (1 )) > 0
6970 else :
7071 assert "🎉 File(s) uploaded" in captured .out
7172
You can’t perform that action at this time.
0 commit comments