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

all: Remove unused variables and squelch incorrect ErrorProne warning

This commit is contained in:
Eric Anderson 2017-08-02 14:57:11 -07:00
parent de8b411773
commit c4f91272d2
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/io/grpc/internal/CensusTracingModule.java
View File

@ -60,7 +60,6 @@ final class CensusTracingModule {
private static final ClientStreamTracer noopClientTracer = new ClientStreamTracer() {}; private static final ClientStreamTracer noopClientTracer = new ClientStreamTracer() {};
private final Tracer censusTracer; private final Tracer censusTracer;
private final BinaryFormat censusPropagationBinaryFormat;
@VisibleForTesting @VisibleForTesting
final Metadata.Key<SpanContext> tracingHeader; final Metadata.Key<SpanContext> tracingHeader;
private final TracingClientInterceptor clientInterceptor = new TracingClientInterceptor(); private final TracingClientInterceptor clientInterceptor = new TracingClientInterceptor();
@ -69,8 +68,7 @@ final class CensusTracingModule {
CensusTracingModule( CensusTracingModule(
Tracer censusTracer, final BinaryFormat censusPropagationBinaryFormat) { Tracer censusTracer, final BinaryFormat censusPropagationBinaryFormat) {
this.censusTracer = checkNotNull(censusTracer, "censusTracer"); this.censusTracer = checkNotNull(censusTracer, "censusTracer");
this.censusPropagationBinaryFormat = checkNotNull(censusPropagationBinaryFormat, "censusPropagationBinaryFormat");
checkNotNull(censusPropagationBinaryFormat, "censusPropagationBinaryFormat");
this.tracingHeader = this.tracingHeader =
Metadata.Key.of("grpc-trace-bin", new Metadata.BinaryMarshaller<SpanContext>() { Metadata.Key.of("grpc-trace-bin", new Metadata.BinaryMarshaller<SpanContext>() {
@Override @Override
@ -187,12 +185,11 @@ final class CensusTracingModule {
@VisibleForTesting @VisibleForTesting
final class ClientCallTracer extends ClientStreamTracer.Factory { final class ClientCallTracer extends ClientStreamTracer.Factory {
private final String fullMethodName;
private final AtomicBoolean callEnded = new AtomicBoolean(false); private final AtomicBoolean callEnded = new AtomicBoolean(false);
private final Span span; private final Span span;
ClientCallTracer(@Nullable Span parentSpan, String fullMethodName) { ClientCallTracer(@Nullable Span parentSpan, String fullMethodName) {
this.fullMethodName = checkNotNull(fullMethodName, "fullMethodName"); checkNotNull(fullMethodName, "fullMethodName");
this.span = this.span =
censusTracer censusTracer
.spanBuilderWithExplicitParent(makeSpanName("Sent", fullMethodName), parentSpan) .spanBuilderWithExplicitParent(makeSpanName("Sent", fullMethodName), parentSpan)
@ -222,12 +219,11 @@ final class CensusTracingModule {
} }
private final class ServerTracer extends ServerStreamTracer { private final class ServerTracer extends ServerStreamTracer {
private final String fullMethodName;
private final Span span; private final Span span;
private final AtomicBoolean streamClosed = new AtomicBoolean(false); private final AtomicBoolean streamClosed = new AtomicBoolean(false);
ServerTracer(String fullMethodName, @Nullable SpanContext remoteSpan) { ServerTracer(String fullMethodName, @Nullable SpanContext remoteSpan) {
this.fullMethodName = checkNotNull(fullMethodName, "fullMethodName"); checkNotNull(fullMethodName, "fullMethodName");
this.span = this.span =
censusTracer censusTracer
.spanBuilderWithRemoteParent(makeSpanName("Recv", fullMethodName), remoteSpan) .spanBuilderWithRemoteParent(makeSpanName("Recv", fullMethodName), remoteSpan)

1
interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
View File

@ -1376,6 +1376,7 @@ public abstract class AbstractInteropTest {
} }
/** Start a fullDuplexCall which the server will not respond, and verify the deadline expires. */ /** Start a fullDuplexCall which the server will not respond, and verify the deadline expires. */
@SuppressWarnings("MissingFail")
@Test(timeout = 10000) @Test(timeout = 10000)
public void timeoutOnSleepingServer() throws Exception { public void timeoutOnSleepingServer() throws Exception {
TestServiceGrpc.TestServiceStub stub = TestServiceGrpc.TestServiceStub stub =