mirror of https://github.com/grpc/grpc-java.git
core: remove io.grpc core dependency on census (#4461)
io.grpc (core) does not strictly require census. Move the usages and and remove census from BUILD.bazel .
This commit is contained in:
parent
ad370d807b
commit
faffb09f0a
|
|
@ -12,7 +12,6 @@ java_library(
|
||||||
"@com_google_code_findbugs_jsr305//jar",
|
"@com_google_code_findbugs_jsr305//jar",
|
||||||
"@com_google_errorprone_error_prone_annotations//jar",
|
"@com_google_errorprone_error_prone_annotations//jar",
|
||||||
"@com_google_guava_guava//jar",
|
"@com_google_guava_guava//jar",
|
||||||
"@io_opencensus_opencensus_api//jar",
|
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,14 +19,12 @@ package io.grpc;
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import io.grpc.MethodDescriptor.Marshaller;
|
import io.grpc.MethodDescriptor.Marshaller;
|
||||||
import io.opencensus.trace.Span;
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.Closeable;
|
import java.io.Closeable;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.nio.ByteBuffer;
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
// TODO(zpencer): rename class to AbstractBinaryLog
|
// TODO(zpencer): rename class to AbstractBinaryLog
|
||||||
|
|
@ -165,10 +163,6 @@ public abstract class BinaryLogProvider implements Closeable {
|
||||||
this.hi = hi;
|
this.hi = hi;
|
||||||
this.lo = lo;
|
this.lo = lo;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static CallId fromCensusSpan(Span span) {
|
|
||||||
return new CallId(0, ByteBuffer.wrap(span.getContext().getSpanId().getBytes()).getLong());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Copied from internal
|
// Copied from internal
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ import static io.opencensus.trace.unsafe.ContextUtils.CONTEXT_SPAN_KEY;
|
||||||
|
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
import io.grpc.BinaryLogProvider;
|
import io.grpc.BinaryLogProvider;
|
||||||
|
import io.grpc.BinaryLogProvider.CallId;
|
||||||
import io.grpc.CallOptions;
|
import io.grpc.CallOptions;
|
||||||
import io.grpc.Channel;
|
import io.grpc.Channel;
|
||||||
import io.grpc.ClientCall;
|
import io.grpc.ClientCall;
|
||||||
|
|
@ -40,6 +41,7 @@ import io.opencensus.trace.SpanContext;
|
||||||
import io.opencensus.trace.Status;
|
import io.opencensus.trace.Status;
|
||||||
import io.opencensus.trace.Tracer;
|
import io.opencensus.trace.Tracer;
|
||||||
import io.opencensus.trace.propagation.BinaryFormat;
|
import io.opencensus.trace.propagation.BinaryFormat;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
|
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
@ -385,7 +387,10 @@ final class CensusTracingModule {
|
||||||
callOptions.withStreamTracerFactory(tracerFactory)
|
callOptions.withStreamTracerFactory(tracerFactory)
|
||||||
.withOption(
|
.withOption(
|
||||||
BinaryLogProvider.CLIENT_CALL_ID_CALLOPTION_KEY,
|
BinaryLogProvider.CLIENT_CALL_ID_CALLOPTION_KEY,
|
||||||
BinaryLogProvider.CallId.fromCensusSpan(tracerFactory.span)));
|
new CallId(
|
||||||
|
0,
|
||||||
|
ByteBuffer.wrap(
|
||||||
|
tracerFactory.span.getContext().getSpanId().getBytes()).getLong())));
|
||||||
return new SimpleForwardingClientCall<ReqT, RespT>(call) {
|
return new SimpleForwardingClientCall<ReqT, RespT>(call) {
|
||||||
@Override
|
@Override
|
||||||
public void start(Listener<RespT> responseListener, Metadata headers) {
|
public void start(Listener<RespT> responseListener, Metadata headers) {
|
||||||
|
|
|
||||||
|
|
@ -961,7 +961,10 @@ public class CensusModulesTest {
|
||||||
@Test
|
@Test
|
||||||
public void callIdFromSpan() {
|
public void callIdFromSpan() {
|
||||||
MockableSpan mockableSpan = MockableSpan.generateRandomSpan(new Random(0));
|
MockableSpan mockableSpan = MockableSpan.generateRandomSpan(new Random(0));
|
||||||
CallId callId = CallId.fromCensusSpan(mockableSpan);
|
CallId callId = new CallId(
|
||||||
|
0,
|
||||||
|
ByteBuffer.wrap(
|
||||||
|
mockableSpan.getContext().getSpanId().getBytes()).getLong());
|
||||||
assertThat(callId.hi).isEqualTo(0);
|
assertThat(callId.hi).isEqualTo(0);
|
||||||
assertThat(callId.lo)
|
assertThat(callId.lo)
|
||||||
.isEqualTo(ByteBuffer.wrap(mockableSpan.getContext().getSpanId().getBytes()).getLong());
|
.isEqualTo(ByteBuffer.wrap(mockableSpan.getContext().getSpanId().getBytes()).getLong());
|
||||||
|
|
|
||||||
|
|
@ -20,12 +20,16 @@ import io.grpc.BinaryLogProvider;
|
||||||
import io.grpc.CallOptions;
|
import io.grpc.CallOptions;
|
||||||
import io.opencensus.trace.Span;
|
import io.opencensus.trace.Span;
|
||||||
import io.opencensus.trace.Tracing;
|
import io.opencensus.trace.Tracing;
|
||||||
|
import java.nio.ByteBuffer;
|
||||||
|
|
||||||
final class CensusBinaryLogProvider extends BinaryLogProviderImpl {
|
final class CensusBinaryLogProvider extends BinaryLogProviderImpl {
|
||||||
@Override
|
@Override
|
||||||
protected CallId getServerCallId() {
|
protected CallId getServerCallId() {
|
||||||
Span currentSpan = Tracing.getTracer().getCurrentSpan();
|
Span currentSpan = Tracing.getTracer().getCurrentSpan();
|
||||||
return CallId.fromCensusSpan(currentSpan);
|
return new CallId(
|
||||||
|
0,
|
||||||
|
ByteBuffer.wrap(
|
||||||
|
currentSpan.getContext().getSpanId().getBytes()).getLong());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue