util: exclude client cancellations and deadline exceeded from outlier detection call counter

Author: AgraVator

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

@@ -197,7 +197,11 @@ public final void halfClose() {
   @Override
   public final void cancel(Status reason) {
     Preconditions.checkArgument(!reason.isOk(), "Should not cancel with OK status");
+    if (cancelled || transportState().isListenerClosed()) {
+      return;
+    }
     cancelled = true;
+    transportState().getStatsTraceContext().clientCancelled(reason);
     abstractClientStreamSink().cancel(reason);
   }
 
@@ -251,6 +255,10 @@ protected TransportState(
       }
     }
 
+    protected final boolean isListenerClosed() {
+      return listenerClosed;
+    }
+
     private void setFullStreamDecompression(boolean fullStreamDecompression) {
       this.fullStreamDecompression = fullStreamDecompression;
     }
@@ -457,9 +465,6 @@ private void closeListener(
         Status status, RpcProgress rpcProgress, Metadata trailers) {
       if (!listenerClosed) {
         listenerClosed = true;
-        if (status.getCode() == Status.Code.CANCELLED) {
-          statsTraceCtx.clientCancelled(status);
-        }
         statsTraceCtx.streamClosed(status);
         if (getTransportTracer() != null) {
           getTransportTracer().reportStreamClosed(status.isOk());

util/src/main/java/io/grpc/util/OutlierDetectionLoadBalancer.java

@@ -493,7 +493,7 @@ public void cancelled(Status status) {
             @Override
             public void streamClosed(Status status) {
               if (!cancelled) {
-                tracker.incrementCallCount(status.isOk());
+                tracker.incrementCallCount(status);
               }
               delegate().streamClosed(status);
             }
@@ -510,7 +510,7 @@ public void cancelled(Status status) {
             @Override
             public void streamClosed(Status status) {
               if (!cancelled) {
-                tracker.incrementCallCount(status.isOk());
+                tracker.incrementCallCount(status);
               }
             }
           };
@@ -571,13 +571,13 @@ Set<OutlierDetectionSubchannel> getSubchannels() {
       return ImmutableSet.copyOf(subchannels);
     }
 
-    void incrementCallCount(boolean success) {
+    void incrementCallCount(Status status) {
       // If neither algorithm is configured, no point in incrementing counters.
       if (config.successRateEjection == null && config.failurePercentageEjection == null) {
         return;
       }
 
-      if (success) {
+      if (status.isOk()) {
         activeCallCounter.successCount.getAndIncrement();
       } else {
         activeCallCounter.failureCount.getAndIncrement();