@@ -785,22 +785,22 @@ public void streamDelayMetrics() {
785785 delayedTransport .newStream (method , headers , callOptions , customTracers );
786786
787787 InOrder inOrder = inOrder (mockTracer );
788- inOrder .verify (mockTracer ).delayTypeStarted ( "connecting" );
789- inOrder . verify ( mockTracer ). delayReasonAttached ( "pick_first: attempting to connect" );
788+ inOrder .verify (mockTracer ).recordAttemptDelayStart (
789+ "connecting" , "pick_first: attempting to connect" );
790790
791791 SubchannelPicker customDelayPicker = mock (SubchannelPicker .class );
792792 when (customDelayPicker .pickSubchannel (any (PickSubchannelArgs .class )))
793793 .thenReturn (PickResult .withNoResult ("rls_lookup_pending" , "RLS request pending." ));
794794
795795 delayedTransport .reprocess (customDelayPicker );
796796
797- inOrder .verify (mockTracer ).delayEnded ();
798- inOrder .verify (mockTracer ).delayTypeStarted ( "rls_lookup_pending" );
799- inOrder . verify ( mockTracer ). delayReasonAttached ( "RLS request pending." );
797+ inOrder .verify (mockTracer ).recordAttemptDelayEnd ();
798+ inOrder .verify (mockTracer ).recordAttemptDelayStart (
799+ "rls_lookup_pending" , "RLS request pending." );
800800
801801 delayedTransport .reprocess (mockPicker );
802802
803- inOrder .verify (mockTracer ).delayEnded ();
803+ inOrder .verify (mockTracer ).recordAttemptDelayEnd ();
804804 }
805805
806806 @ Test
@@ -816,12 +816,12 @@ public void streamDelayMetrics_cancelled() {
816816 ClientStream stream = delayedTransport .newStream (method , headers , callOptions , customTracers );
817817 stream .start (streamListener );
818818
819- verify (mockTracer ).delayTypeStarted ( "connecting" );
820- verify ( mockTracer ). delayReasonAttached ( "pick_first: attempting to connect" );
819+ verify (mockTracer ).recordAttemptDelayStart (
820+ "connecting" , "pick_first: attempting to connect" );
821821
822822 stream .cancel (Status .CANCELLED );
823823
824- verify (mockTracer ).delayEnded ();
824+ verify (mockTracer ).recordAttemptDelayEnd ();
825825 }
826826
827827 @ Test
@@ -837,12 +837,12 @@ public void streamDelayMetrics_shutdownNow() {
837837 ClientStream stream = delayedTransport .newStream (method , headers , callOptions , customTracers );
838838 stream .start (streamListener );
839839
840- verify (mockTracer ).delayTypeStarted ( "connecting" );
841- verify ( mockTracer ). delayReasonAttached ( "pick_first: attempting to connect" );
840+ verify (mockTracer ).recordAttemptDelayStart (
841+ "connecting" , "pick_first: attempting to connect" );
842842
843843 delayedTransport .shutdownNow (Status .UNAVAILABLE );
844844
845- verify (mockTracer ).delayEnded ();
845+ verify (mockTracer ).recordAttemptDelayEnd ();
846846 }
847847
848848 @ Test
@@ -857,18 +857,17 @@ public void streamDelayMetrics_cadenceReasonUpdate_doesNotStartNewTypeSegment()
857857 delayedTransport .reprocess (picker1 );
858858 delayedTransport .newStream (method , headers , callOptions , customTracers );
859859
860- verify (mockTracer , times (1 )).delayTypeStarted ("connecting" );
861- verify (mockTracer ).delayReasonAttached ("attempt 1" );
860+ verify (mockTracer , times (1 )).recordAttemptDelayStart ("connecting" , "attempt 1" );
862861
863862 SubchannelPicker picker2 = mock (SubchannelPicker .class );
864863 when (picker2 .pickSubchannel (any (PickSubchannelArgs .class )))
865864 .thenReturn (PickResult .withNoResult ("connecting" , "attempt 2" ));
866865
867866 delayedTransport .reprocess (picker2 );
868867
869- verify (mockTracer , times (1 )).delayTypeStarted ("connecting" );
870- verify (mockTracer ).delayReasonAttached ("attempt 2" );
871- verify (mockTracer , never ()).delayEnded ();
868+ verify (mockTracer , times (1 )).recordAttemptDelayStart ("connecting" , "attempt 1 " );
869+ verify (mockTracer ).recordAttemptDelayReasonChanged ("attempt 2" );
870+ verify (mockTracer , never ()).recordAttemptDelayEnd ();
872871 }
873872
874873 @ Test
@@ -879,8 +878,8 @@ public void streamDelayMetrics_channelFallback_clientChannelInit() {
879878 // No picker reprocessed yet (lastPicker == null)
880879 delayedTransport .newStream (method , headers , callOptions , customTracers );
881880
882- verify (mockTracer ).delayTypeStarted ( "client_channel_init" );
883- verify ( mockTracer ). delayReasonAttached ( "client channel: created LB policy." );
881+ verify (mockTracer ).recordAttemptDelayStart (
882+ "client_channel_init" , "client channel: created LB policy." );
884883 }
885884
886885 @ Test
@@ -900,8 +899,8 @@ public void streamDelayMetrics_channelFallback_subchannelStateMismatch() {
900899 delayedTransport .reprocess (stalePicker );
901900 delayedTransport .newStream (method , headers , callOptions , customTracers );
902901
903- verify (mockTracer ).delayTypeStarted ( "subchannel_state_mismatch" );
904- verify ( mockTracer ). delayReasonAttached (
902+ verify (mockTracer ).recordAttemptDelayStart (
903+ "subchannel_state_mismatch" ,
905904 "subchannel returned by LB picker has no connected subchannel" );
906905 }
907906
@@ -918,8 +917,8 @@ public void streamDelayMetrics_channelFallback_waitForReadyFailed() {
918917 CallOptions wfrOptions = callOptions .withWaitForReady ();
919918 delayedTransport .newStream (method , headers , wfrOptions , customTracers );
920919
921- verify (mockTracer ).delayTypeStarted ( "wait_for_ready_failed" );
922- verify ( mockTracer ). delayReasonAttached (
920+ verify (mockTracer ).recordAttemptDelayStart (
921+ "wait_for_ready_failed" ,
923922 "wait_for_ready RPC failed with status: " + Status .UNAVAILABLE );
924923 }
925924
0 commit comments