add missing endDelay()

Author: AgraVator

core/src/main/java/io/grpc/internal/DelayedClientTransport.java

@@ -247,7 +247,7 @@ public final void shutdownNow(Status status) {
     }
     if (savedReportTransportTerminated != null) {
       for (PendingStream stream : savedPendingStreams) {
-        Runnable runnable = stream.setStream(
+        Runnable runnable = stream.setStreamAndEndDelay(
             new FailingClientStream(status, RpcProgress.REFUSED, stream.tracers));
         if (runnable != null) {
           // Drain in-line instead of using an executor as failing stream just throws everything
@@ -406,6 +406,11 @@ void endDelay() {
       }
     }
 
+    Runnable setStreamAndEndDelay(ClientStream stream) {
+      endDelay();
+      return setStream(stream);
+    }
+
     /** Runnable may be null. */
     private Runnable createRealStream(ClientTransport transport, String authorityOverride) {
       ClientStream realStream;
@@ -424,7 +429,7 @@ private Runnable createRealStream(ClientTransport transport, String authorityOve
         // been called on the delayed stream.
         realStream.setAuthority(authorityOverride);
       }
-      return setStream(realStream);
+      return setStreamAndEndDelay(realStream);
     }
 
     @Override

core/src/test/java/io/grpc/internal/DelayedClientTransportTest.java

@@ -821,6 +821,26 @@ public void streamDelayMetrics_cancelled() {
     verify(mockTracer).delayEnded();
   }
 
+  @Test
+  public void streamDelayMetrics_shutdownNow() {
+    ClientStreamTracer mockTracer = mock(ClientStreamTracer.class);
+    ClientStreamTracer[] customTracers = new ClientStreamTracer[] { mockTracer };
+
+    SubchannelPicker connectingPicker = mock(SubchannelPicker.class);
+    when(connectingPicker.pickSubchannel(any(PickSubchannelArgs.class)))
+        .thenReturn(PickResult.withNoResult("pick_first:connecting"));
+
+    delayedTransport.reprocess(connectingPicker);
+    ClientStream stream = delayedTransport.newStream(method, headers, callOptions, customTracers);
+    stream.start(streamListener);
+
+    verify(mockTracer).delayStarted("pick_first:connecting");
+
+    delayedTransport.shutdownNow(Status.UNAVAILABLE);
+
+    verify(mockTracer).delayEnded();
+  }
+
   private static TransportProvider newTransportProvider(final ClientTransport transport) {
     return new TransportProvider() {
       @Override