Update @SInCE tag to 1.84.0 and add tracer cancellation in FailingClientStream

Author: AgraVator

api/src/main/java/io/grpc/ClientStreamTracer.java

@@ -103,7 +103,7 @@ public void addOptionalLabel(String key, String value) {
    * The stream was cancelled from the client side before a normal response was received.
    *
    * @param status the cancellation status
-   * @since 1.70.0
+   * @since 1.84.0
    */
   public void cancelled(Status status) {
   }

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

@@ -61,6 +61,13 @@ public void start(ClientStreamListener listener) {
     listener.closed(error, rpcProgress, new Metadata());
   }
 
+  @Override
+  public void cancel(Status reason) {
+    for (ClientStreamTracer tracer : tracers) {
+      tracer.cancelled(reason);
+    }
+  }
+
   @VisibleForTesting
   Status getError() {
     return error;

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

@@ -39,6 +39,7 @@
 
 import io.grpc.Attributes;
 import io.grpc.CallOptions;
+import io.grpc.ClientStreamTracer;
 import io.grpc.Codec;
 import io.grpc.Deadline;
 import io.grpc.Grpc;
@@ -155,6 +156,24 @@ public void cancel(Status errorStatus) {
     verify(mockListener).closed(any(Status.class), same(PROCESSED), any(Metadata.class));
   }
 
+  @Test
+  public void cancel_notifiesStatsTraceContext() {
+    ClientStreamTracer mockTracer = mock(ClientStreamTracer.class);
+    StatsTraceContext customStatsTraceCtx = new StatsTraceContext(new StreamTracer[] {mockTracer});
+    final BaseTransportState state = new BaseTransportState(customStatsTraceCtx, transportTracer);
+    AbstractClientStream stream = new BaseAbstractClientStream(allocator, state, new BaseSink() {
+      @Override
+      public void cancel(Status errorStatus) {
+      }
+    }, customStatsTraceCtx, transportTracer);
+    stream.start(mockListener);
+
+    Status cancelStatus = Status.CANCELLED.withDescription("Cancelled by test");
+    stream.cancel(cancelStatus);
+
+    verify(mockTracer).cancelled(cancelStatus);
+  }
+
   @Test
   public void startFailsOnNullListener() {
     AbstractClientStream stream =

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

@@ -57,4 +57,14 @@ public void droppedRpcProgressPopulatedToListener() {
     stream.start(listener);
     verify(listener).closed(eq(status), eq(RpcProgress.DROPPED), any(Metadata.class));
   }
+
+  @Test
+  public void cancel_notifiesTracers() {
+    ClientStreamTracer mockTracer = mock(ClientStreamTracer.class);
+    ClientStream stream = new FailingClientStream(
+        Status.UNAVAILABLE, RpcProgress.PROCESSED, new ClientStreamTracer[] {mockTracer});
+    Status cancelStatus = Status.CANCELLED.withDescription("Cancelled by test");
+    stream.cancel(cancelStatus);
+    verify(mockTracer).cancelled(cancelStatus);
+  }
 }