From dd0d0288106e941f9b6c50c448ad5ab8e1cb085a Mon Sep 17 00:00:00 2001
From: Eric Gribkoff <ericgribkoff@google.com>
Date: Fri, 17 Nov 2017 16:36:56 -0800
Subject: [PATCH] cronet: update to work with TransportTracer API

---
 .../main/java/io/grpc/cronet/CronetClientStream.java   |  7 ++++---
 .../java/io/grpc/cronet/CronetClientTransport.java     | 10 ++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cronet/src/main/java/io/grpc/cronet/CronetClientStream.java b/cronet/src/main/java/io/grpc/cronet/CronetClientStream.java
index 710cc2ac13..734c4914b5 100644
--- a/cronet/src/main/java/io/grpc/cronet/CronetClientStream.java
+++ b/cronet/src/main/java/io/grpc/cronet/CronetClientStream.java
@@ -91,7 +91,7 @@ class CronetClientStream extends AbstractClientStream {
       MethodDescriptor<?, ?> method,
       StatsTraceContext statsTraceCtx,
       CallOptions callOptions) {
-    super(new CronetWritableBufferAllocator(), statsTraceCtx, headers, method.isSafe());
+    super(new CronetWritableBufferAllocator(), statsTraceCtx, null, headers, method.isSafe());
     this.url = Preconditions.checkNotNull(url, "url");
     this.userAgent = Preconditions.checkNotNull(userAgent, "userAgent");
     this.executor = Preconditions.checkNotNull(executor, "executor");
@@ -155,7 +155,8 @@ class CronetClientStream extends AbstractClientStream {
     }
 
     @Override
-    public void writeFrame(WritableBuffer buffer, boolean endOfStream, boolean flush) {
+    public void writeFrame(
+        WritableBuffer buffer, boolean endOfStream, boolean flush, int numMessages) {
       synchronized (state.lock) {
         if (state.cancelSent) {
           return;
@@ -218,7 +219,7 @@ class CronetClientStream extends AbstractClientStream {
     private boolean readClosed;
 
     public TransportState(int maxMessageSize, StatsTraceContext statsTraceCtx, Object lock) {
-      super(maxMessageSize, statsTraceCtx);
+      super(maxMessageSize, statsTraceCtx, null);
       this.lock = Preconditions.checkNotNull(lock, "lock");
     }
 
diff --git a/cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java b/cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java
index 65d7b304e4..603e096b44 100644
--- a/cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java
+++ b/cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java
@@ -17,6 +17,7 @@
 package io.grpc.cronet;
 
 import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.SettableFuture;
 import io.grpc.Attributes;
 import io.grpc.CallOptions;
 import io.grpc.Metadata;
@@ -28,12 +29,14 @@ import io.grpc.internal.ConnectionClientTransport;
 import io.grpc.internal.GrpcUtil;
 import io.grpc.internal.LogId;
 import io.grpc.internal.StatsTraceContext;
+import io.grpc.internal.TransportTracer;
 import io.grpc.internal.WithLogId;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
 
@@ -87,6 +90,13 @@ class CronetClientTransport implements ConnectionClientTransport, WithLogId {
     this.streamFactory = Preconditions.checkNotNull(streamFactory, "streamFactory");
   }
 
+  @Override
+  public Future<TransportTracer.Stats> getTransportStats() {
+    SettableFuture<TransportTracer.Stats> f = SettableFuture.create();
+    f.set(null);
+    return f;
+  }
+
   @Override
   public CronetClientStream newStream(final MethodDescriptor<?, ?> method, final Metadata headers,
       final CallOptions callOptions) {