grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cronet: update to work with TransportTracer API

This commit is contained in:
Eric Gribkoff 2017-11-17 16:36:56 -08:00 committed by GitHub
parent f0efb0f1d3
commit dd0d028810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cronet/src/main/java/io/grpc/cronet/CronetClientStream.java
View File

@ -91,7 +91,7 @@ class CronetClientStream extends AbstractClientStream {
MethodDescriptor<?, ?> method, MethodDescriptor<?, ?> method,
StatsTraceContext statsTraceCtx, StatsTraceContext statsTraceCtx,
CallOptions callOptions) { CallOptions callOptions) {
super(new CronetWritableBufferAllocator(), statsTraceCtx, headers, method.isSafe()); super(new CronetWritableBufferAllocator(), statsTraceCtx, null, headers, method.isSafe());
this.url = Preconditions.checkNotNull(url, "url"); this.url = Preconditions.checkNotNull(url, "url");
this.userAgent = Preconditions.checkNotNull(userAgent, "userAgent"); this.userAgent = Preconditions.checkNotNull(userAgent, "userAgent");
this.executor = Preconditions.checkNotNull(executor, "executor"); this.executor = Preconditions.checkNotNull(executor, "executor");
@ -155,7 +155,8 @@ class CronetClientStream extends AbstractClientStream {
} }
@Override @Override
public void writeFrame(WritableBuffer buffer, boolean endOfStream, boolean flush) { public void writeFrame(
WritableBuffer buffer, boolean endOfStream, boolean flush, int numMessages) {
synchronized (state.lock) { synchronized (state.lock) {
if (state.cancelSent) { if (state.cancelSent) {
return; return;
@ -218,7 +219,7 @@ class CronetClientStream extends AbstractClientStream {
private boolean readClosed; private boolean readClosed;
public TransportState(int maxMessageSize, StatsTraceContext statsTraceCtx, Object lock) { public TransportState(int maxMessageSize, StatsTraceContext statsTraceCtx, Object lock) {
super(maxMessageSize, statsTraceCtx); super(maxMessageSize, statsTraceCtx, null);
this.lock = Preconditions.checkNotNull(lock, "lock"); this.lock = Preconditions.checkNotNull(lock, "lock");
} }

10
cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java
View File

@ -17,6 +17,7 @@
package io.grpc.cronet; package io.grpc.cronet;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.Attributes; import io.grpc.Attributes;
import io.grpc.CallOptions; import io.grpc.CallOptions;
import io.grpc.Metadata; import io.grpc.Metadata;
@ -28,12 +29,14 @@ import io.grpc.internal.ConnectionClientTransport;
import io.grpc.internal.GrpcUtil; import io.grpc.internal.GrpcUtil;
import io.grpc.internal.LogId; import io.grpc.internal.LogId;
import io.grpc.internal.StatsTraceContext; import io.grpc.internal.StatsTraceContext;
import io.grpc.internal.TransportTracer;
import io.grpc.internal.WithLogId; import io.grpc.internal.WithLogId;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Future;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.GuardedBy;
@ -87,6 +90,13 @@ class CronetClientTransport implements ConnectionClientTransport, WithLogId {
this.streamFactory = Preconditions.checkNotNull(streamFactory, "streamFactory"); this.streamFactory = Preconditions.checkNotNull(streamFactory, "streamFactory");
} }
@Override
public Future<TransportTracer.Stats> getTransportStats() {
SettableFuture<TransportTracer.Stats> f = SettableFuture.create();
f.set(null);
return f;
}
@Override @Override
public CronetClientStream newStream(final MethodDescriptor<?, ?> method, final Metadata headers, public CronetClientStream newStream(final MethodDescriptor<?, ?> method, final Metadata headers,
final CallOptions callOptions) { final CallOptions callOptions) {