@@ -284,6 +284,22 @@ def _export_with_deadline(
284284 assert seen_deadlines [0 ] is not None
285285
286286
287+ @patch ("httpx2.Client" )
288+ def test_batch_trace_processor_timed_shutdown_retries_final_drain (mock_client ) -> None :
289+ transient = MagicMock (status_code = 503 , headers = {})
290+ success = MagicMock (status_code = 200 , headers = {})
291+ mock_client .return_value .post .side_effect = [transient , success ]
292+
293+ exporter = BackendSpanExporter (api_key = "test_key" , max_retries = 2 , base_delay = 0.001 )
294+ processor = BatchTraceProcessor (exporter = exporter )
295+ processor ._queue .put_nowait (get_span (processor ))
296+
297+ processor .shutdown (timeout = 1.0 )
298+
299+ assert mock_client .return_value .post .call_count == 2
300+ exporter .close ()
301+
302+
287303def test_batch_trace_processor_survives_exporter_exception ():
288304 """A failing exporter must not kill the background worker thread.
289305
@@ -564,6 +580,101 @@ def text(self) -> str:
564580 exporter .close ()
565581
566582
583+ @patch ("httpx2.Client" )
584+ @pytest .mark .parametrize ("status_code" , [408 , 409 , 429 ])
585+ def test_backend_span_exporter_retries_transient_client_errors (mock_client , status_code : int ):
586+ """A rate limit, timeout, or conflict is transient, as the OpenAI client treats it;
587+ dropping the batch on the first response loses every trace in it."""
588+ mock_response = MagicMock ()
589+ mock_response .status_code = status_code
590+ mock_response .headers = {}
591+ mock_client .return_value .post .return_value = mock_response
592+
593+ exporter = BackendSpanExporter (api_key = "test_key" , max_retries = 3 , base_delay = 0.1 , max_delay = 0.2 )
594+ with patch .object (exporter ._shutdown_event , "wait" , return_value = False ) as wait_for_retry :
595+ exporter .export ([get_span (mock_processor ())])
596+
597+ assert mock_client .return_value .post .call_count == 3
598+ assert wait_for_retry .call_count == 2
599+ exporter .close ()
600+
601+
602+ @patch ("httpx2.Client" )
603+ def test_backend_span_exporter_rate_limit_obeys_x_should_retry_false (mock_client , caplog ):
604+ """An explicit `x-should-retry: false` wins over the status classification, as in the
605+ OpenAI client."""
606+ mock_response = MagicMock ()
607+ mock_response .status_code = 429
608+ mock_response .headers = {"x-should-retry" : "false" , "retry-after" : "1" }
609+ mock_response .text = "rate limited"
610+ mock_client .return_value .post .return_value = mock_response
611+
612+ exporter = BackendSpanExporter (api_key = "test_key" , max_retries = 3 , base_delay = 0.1 , max_delay = 0.2 )
613+ with (
614+ patch .object (exporter ._shutdown_event , "wait" , return_value = False ) as wait_for_retry ,
615+ caplog .at_level (logging .ERROR , logger = "openai.agents" ),
616+ ):
617+ exporter .export ([get_span (mock_processor ())])
618+
619+ mock_client .return_value .post .assert_called_once ()
620+ wait_for_retry .assert_not_called ()
621+ assert "Tracing client error 429" in caplog .text
622+ exporter .close ()
623+
624+
625+ @patch ("httpx2.Client" )
626+ def test_backend_span_exporter_rate_limit_recovers_after_retry (mock_client ):
627+ ok_response = MagicMock ()
628+ ok_response .status_code = 200
629+ limited_response = MagicMock ()
630+ limited_response .status_code = 429
631+ limited_response .headers = {}
632+ mock_client .return_value .post .side_effect = [limited_response , ok_response ]
633+
634+ exporter = BackendSpanExporter (api_key = "test_key" , max_retries = 3 , base_delay = 0.1 , max_delay = 0.2 )
635+ with patch .object (exporter ._shutdown_event , "wait" , return_value = False ):
636+ exporter .export ([get_span (mock_processor ())])
637+
638+ assert mock_client .return_value .post .call_count == 2
639+ exporter .close ()
640+
641+
642+ @patch ("httpx2.Client" )
643+ @pytest .mark .parametrize (
644+ ("headers" , "expected_wait" ),
645+ [
646+ ({"retry-after" : "3" }, 3.0 ),
647+ ({"retry-after-ms" : "1500" }, 1.5 ),
648+ # Larger than max_delay: bounded so the export thread cannot stall.
649+ ({"retry-after" : "600" }, 5.0 ),
650+ # Unparsable or negative values fall back to exponential backoff.
651+ ({"retry-after" : "soon" }, None ),
652+ ({"retry-after" : "-1" }, None ),
653+ ],
654+ )
655+ def test_backend_span_exporter_rate_limit_honours_retry_after (
656+ mock_client , headers : dict [str , str ], expected_wait : float | None
657+ ):
658+ limited_response = MagicMock ()
659+ limited_response .status_code = 429
660+ limited_response .headers = headers
661+ ok_response = MagicMock ()
662+ ok_response .status_code = 200
663+ mock_client .return_value .post .side_effect = [limited_response , ok_response ]
664+
665+ exporter = BackendSpanExporter (api_key = "test_key" , max_retries = 3 , base_delay = 0.1 , max_delay = 5.0 )
666+ with patch .object (exporter ._shutdown_event , "wait" , return_value = False ) as wait_for_retry :
667+ exporter .export ([get_span (mock_processor ())])
668+
669+ assert mock_client .return_value .post .call_count == 2
670+ waited = wait_for_retry .call_args .args [0 ]
671+ if expected_wait is None :
672+ assert 0.1 <= waited <= 0.11
673+ else :
674+ assert waited == pytest .approx (expected_wait )
675+ exporter .close ()
676+
677+
567678@patch ("httpx2.Client" )
568679def test_backend_span_exporter_5xx_retry (mock_client ):
569680 mock_response = MagicMock ()
@@ -583,14 +694,34 @@ def test_backend_span_exporter_5xx_retry(mock_client):
583694 exporter .close ()
584695
585696
697+ @patch ("httpx2.Client" )
698+ def test_backend_span_exporter_5xx_obeys_x_should_retry_false (mock_client , caplog ):
699+ mock_response = MagicMock ()
700+ mock_response .status_code = 503
701+ mock_response .headers = {"x-should-retry" : "false" }
702+ mock_client .return_value .post .return_value = mock_response
703+
704+ exporter = BackendSpanExporter (api_key = "test_key" , max_retries = 3 , base_delay = 0.1 , max_delay = 0.2 )
705+ with (
706+ patch .object (exporter ._shutdown_event , "wait" , return_value = False ) as wait_for_retry ,
707+ caplog .at_level (logging .ERROR , logger = "openai.agents" ),
708+ ):
709+ exporter .export ([get_span (mock_processor ())])
710+
711+ mock_client .return_value .post .assert_called_once ()
712+ wait_for_retry .assert_not_called ()
713+ assert "server forbade retry for 503" in caplog .text
714+ exporter .close ()
715+
716+
586717@patch ("httpx2.Client" )
587718def test_backend_span_exporter_deadline_stops_during_5xx_retry_backoff (mock_client ):
588719 mock_response = MagicMock ()
589720 mock_response .status_code = 504
590721 mock_client .return_value .post .return_value = mock_response
591722
592723 exporter = BackendSpanExporter (api_key = "test_key" , max_retries = 3 , base_delay = 1.0 )
593- with patch ("time.sleep" ) as sleep_for_retry :
724+ with patch ("agents.tracing.processors. time.sleep" ) as sleep_for_retry :
594725 exporter ._export_with_deadline (
595726 [get_span (mock_processor ())], deadline = time .monotonic () + 0.01
596727 )
0 commit comments