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

core: update opencensus to 0.12.3. (#4530) 

Changed calls to deprecated methods to the newly added methods.
This commit is contained in:
Bogdan Drutu 2018-06-04 15:27:27 -07:00 committed by Kun Zhang
parent 29dba1e89f
commit 2a127ce3e7
5 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -104,7 +104,7 @@ subprojects {
protobufVersion = '3.5.1' protobufVersion = '3.5.1'
protocVersion = '3.5.1-1' protocVersion = '3.5.1-1'
protobufNanoVersion = '3.0.0-alpha-5' protobufNanoVersion = '3.0.0-alpha-5'
opencensusVersion = '0.11.0' opencensusVersion = '0.12.3'
configureProtoCompilation = { configureProtoCompilation = {
String generatedSourcePath = "${projectDir}/src/generated" String generatedSourcePath = "${projectDir}/src/generated"

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

@ -35,7 +35,8 @@ import io.grpc.MethodDescriptor;
import io.grpc.ServerStreamTracer; import io.grpc.ServerStreamTracer;
import io.grpc.StreamTracer; import io.grpc.StreamTracer;
import io.opencensus.trace.EndSpanOptions; import io.opencensus.trace.EndSpanOptions;
import io.opencensus.trace.NetworkEvent; import io.opencensus.trace.MessageEvent;
import io.opencensus.trace.MessageEvent.Type;
import io.opencensus.trace.Span; import io.opencensus.trace.Span;
import io.opencensus.trace.SpanContext; import io.opencensus.trace.SpanContext;
import io.opencensus.trace.Status; import io.opencensus.trace.Status;
@ -210,17 +211,17 @@ final class CensusTracingModule {
.build(); .build();
} }
private static void recordNetworkEvent( private static void recordMessageEvent(
Span span, NetworkEvent.Type type, Span span, MessageEvent.Type type,
int seqNo, long optionalWireSize, long optionalUncompressedSize) { int seqNo, long optionalWireSize, long optionalUncompressedSize) {
NetworkEvent.Builder eventBuilder = NetworkEvent.builder(type, seqNo); MessageEvent.Builder eventBuilder = MessageEvent.builder(type, seqNo);
if (optionalUncompressedSize != -1) { if (optionalUncompressedSize != -1) {
eventBuilder.setUncompressedMessageSize(optionalUncompressedSize); eventBuilder.setUncompressedMessageSize(optionalUncompressedSize);
} }
if (optionalWireSize != -1) { if (optionalWireSize != -1) {
eventBuilder.setCompressedMessageSize(optionalWireSize); eventBuilder.setCompressedMessageSize(optionalWireSize);
} }
span.addNetworkEvent(eventBuilder.build()); span.addMessageEvent(eventBuilder.build());
} }
@VisibleForTesting @VisibleForTesting
@ -280,15 +281,15 @@ final class CensusTracingModule {
@Override @Override
public void outboundMessageSent( public void outboundMessageSent(
int seqNo, long optionalWireSize, long optionalUncompressedSize) { int seqNo, long optionalWireSize, long optionalUncompressedSize) {
recordNetworkEvent( recordMessageEvent(
span, NetworkEvent.Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); span, Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize);
} }
@Override @Override
public void inboundMessageRead( public void inboundMessageRead(
int seqNo, long optionalWireSize, long optionalUncompressedSize) { int seqNo, long optionalWireSize, long optionalUncompressedSize) {
recordNetworkEvent( recordMessageEvent(
span, NetworkEvent.Type.RECV, seqNo, optionalWireSize, optionalUncompressedSize); span, Type.RECEIVED, seqNo, optionalWireSize, optionalUncompressedSize);
} }
} }
@ -346,15 +347,15 @@ final class CensusTracingModule {
@Override @Override
public void outboundMessageSent( public void outboundMessageSent(
int seqNo, long optionalWireSize, long optionalUncompressedSize) { int seqNo, long optionalWireSize, long optionalUncompressedSize) {
recordNetworkEvent( recordMessageEvent(
span, NetworkEvent.Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); span, Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize);
} }
@Override @Override
public void inboundMessageRead( public void inboundMessageRead(
int seqNo, long optionalWireSize, long optionalUncompressedSize) { int seqNo, long optionalWireSize, long optionalUncompressedSize) {
recordNetworkEvent( recordMessageEvent(
span, NetworkEvent.Type.RECV, seqNo, optionalWireSize, optionalUncompressedSize); span, Type.RECEIVED, seqNo, optionalWireSize, optionalUncompressedSize);
} }
} }

26
core/src/test/java/io/grpc/internal/CensusModulesTest.java
View File

@ -72,8 +72,8 @@ import io.opencensus.tags.TagContext;
import io.opencensus.tags.TagValue; import io.opencensus.tags.TagValue;
import io.opencensus.tags.Tags; import io.opencensus.tags.Tags;
import io.opencensus.trace.EndSpanOptions; import io.opencensus.trace.EndSpanOptions;
import io.opencensus.trace.NetworkEvent; import io.opencensus.trace.MessageEvent;
import io.opencensus.trace.NetworkEvent.Type; import io.opencensus.trace.MessageEvent.Type;
import io.opencensus.trace.Span; import io.opencensus.trace.Span;
import io.opencensus.trace.SpanBuilder; import io.opencensus.trace.SpanBuilder;
import io.opencensus.trace.SpanContext; import io.opencensus.trace.SpanContext;
@ -174,7 +174,7 @@ public class CensusModulesTest {
@Captor @Captor
private ArgumentCaptor<Status> statusCaptor; private ArgumentCaptor<Status> statusCaptor;
@Captor @Captor
private ArgumentCaptor<NetworkEvent> networkEventCaptor; private ArgumentCaptor<MessageEvent> messageEventCaptor;
private CensusStatsModule censusStats; private CensusStatsModule censusStats;
private CensusTracingModule censusTracing; private CensusTracingModule censusTracing;
@ -448,14 +448,14 @@ public class CensusModulesTest {
callTracer.callEnded(Status.OK); callTracer.callEnded(Status.OK);
InOrder inOrder = inOrder(spyClientSpan); InOrder inOrder = inOrder(spyClientSpan);
inOrder.verify(spyClientSpan, times(3)).addNetworkEvent(networkEventCaptor.capture()); inOrder.verify(spyClientSpan, times(3)).addMessageEvent(messageEventCaptor.capture());
List<NetworkEvent> events = networkEventCaptor.getAllValues(); List<MessageEvent> events = messageEventCaptor.getAllValues();
assertEquals( assertEquals(
NetworkEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0)); MessageEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0));
assertEquals( assertEquals(
NetworkEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1)); MessageEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1));
assertEquals( assertEquals(
NetworkEvent.builder(Type.RECV, 0) MessageEvent.builder(Type.RECEIVED, 0)
.setCompressedMessageSize(255) .setCompressedMessageSize(255)
.setUncompressedMessageSize(90) .setUncompressedMessageSize(90)
.build(), .build(),
@ -870,14 +870,14 @@ public class CensusModulesTest {
serverStreamTracer.streamClosed(Status.CANCELLED); serverStreamTracer.streamClosed(Status.CANCELLED);
InOrder inOrder = inOrder(spyServerSpan); InOrder inOrder = inOrder(spyServerSpan);
inOrder.verify(spyServerSpan, times(3)).addNetworkEvent(networkEventCaptor.capture()); inOrder.verify(spyServerSpan, times(3)).addMessageEvent(messageEventCaptor.capture());
List<NetworkEvent> events = networkEventCaptor.getAllValues(); List<MessageEvent> events = messageEventCaptor.getAllValues();
assertEquals( assertEquals(
NetworkEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0)); MessageEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0));
assertEquals( assertEquals(
NetworkEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1)); MessageEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1));
assertEquals( assertEquals(
NetworkEvent.builder(Type.RECV, 0) MessageEvent.builder(Type.RECEIVED, 0)
.setCompressedMessageSize(255) .setCompressedMessageSize(255)
.setUncompressedMessageSize(90) .setUncompressedMessageSize(90)
.build(), .build(),

8
repositories.bzl
View File

@ -279,15 +279,15 @@ def io_netty_tcnative_boringssl_static():
def io_opencensus_api(): def io_opencensus_api():
native.maven_jar( native.maven_jar(
name = "io_opencensus_opencensus_api", name = "io_opencensus_opencensus_api",
artifact = "io.opencensus:opencensus-api:0.11.0", artifact = "io.opencensus:opencensus-api:0.12.3",
sha1 = "c1ff1f0d737a689d900a3e2113ddc29847188c64", sha1 = "743f074095f29aa985517299545e72cc99c87de0",
) )
def io_opencensus_grpc_metrics(): def io_opencensus_grpc_metrics():
native.maven_jar( native.maven_jar(
name = "io_opencensus_opencensus_contrib_grpc_metrics", name = "io_opencensus_opencensus_contrib_grpc_metrics",
artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.11.0", artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.12.3",
sha1 = "d57b877f1a28a613452d45e35c7faae5af585258", sha1 = "a4c7ff238a91b901c8b459889b6d0d7a9d889b4d",
) )
def javax_annotation(): def javax_annotation():

4
testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java
View File

@ -40,7 +40,7 @@ import io.opencensus.trace.Annotation;
import io.opencensus.trace.AttributeValue; import io.opencensus.trace.AttributeValue;
import io.opencensus.trace.EndSpanOptions; import io.opencensus.trace.EndSpanOptions;
import io.opencensus.trace.Link; import io.opencensus.trace.Link;
import io.opencensus.trace.NetworkEvent; import io.opencensus.trace.MessageEvent;
import io.opencensus.trace.Sampler; import io.opencensus.trace.Sampler;
import io.opencensus.trace.Span; import io.opencensus.trace.Span;
import io.opencensus.trace.SpanBuilder; import io.opencensus.trace.SpanBuilder;
@ -347,7 +347,7 @@ public class StatsTestUtils {
public void addAnnotation(Annotation annotation) {} public void addAnnotation(Annotation annotation) {}
@Override @Override
public void addNetworkEvent(NetworkEvent networkEvent) {} public void addMessageEvent(MessageEvent messageEvent) {}
@Override @Override
public void addLink(Link link) {} public void addLink(Link link) {}