diff --git a/build.gradle b/build.gradle index 714bf367e6..f409f5f5dd 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,7 @@ subprojects { protobufVersion = '3.5.1' protocVersion = '3.5.1-1' protobufNanoVersion = '3.0.0-alpha-5' - opencensusVersion = '0.11.0' + opencensusVersion = '0.12.3' configureProtoCompilation = { String generatedSourcePath = "${projectDir}/src/generated" diff --git a/core/src/main/java/io/grpc/internal/CensusTracingModule.java b/core/src/main/java/io/grpc/internal/CensusTracingModule.java index 99e247bf25..24f79b6f43 100644 --- a/core/src/main/java/io/grpc/internal/CensusTracingModule.java +++ b/core/src/main/java/io/grpc/internal/CensusTracingModule.java @@ -35,7 +35,8 @@ import io.grpc.MethodDescriptor; import io.grpc.ServerStreamTracer; import io.grpc.StreamTracer; 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.SpanContext; import io.opencensus.trace.Status; @@ -210,17 +211,17 @@ final class CensusTracingModule { .build(); } - private static void recordNetworkEvent( - Span span, NetworkEvent.Type type, + private static void recordMessageEvent( + Span span, MessageEvent.Type type, int seqNo, long optionalWireSize, long optionalUncompressedSize) { - NetworkEvent.Builder eventBuilder = NetworkEvent.builder(type, seqNo); + MessageEvent.Builder eventBuilder = MessageEvent.builder(type, seqNo); if (optionalUncompressedSize != -1) { eventBuilder.setUncompressedMessageSize(optionalUncompressedSize); } if (optionalWireSize != -1) { eventBuilder.setCompressedMessageSize(optionalWireSize); } - span.addNetworkEvent(eventBuilder.build()); + span.addMessageEvent(eventBuilder.build()); } @VisibleForTesting @@ -280,15 +281,15 @@ final class CensusTracingModule { @Override public void outboundMessageSent( int seqNo, long optionalWireSize, long optionalUncompressedSize) { - recordNetworkEvent( - span, NetworkEvent.Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); + recordMessageEvent( + span, Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); } @Override public void inboundMessageRead( int seqNo, long optionalWireSize, long optionalUncompressedSize) { - recordNetworkEvent( - span, NetworkEvent.Type.RECV, seqNo, optionalWireSize, optionalUncompressedSize); + recordMessageEvent( + span, Type.RECEIVED, seqNo, optionalWireSize, optionalUncompressedSize); } } @@ -346,15 +347,15 @@ final class CensusTracingModule { @Override public void outboundMessageSent( int seqNo, long optionalWireSize, long optionalUncompressedSize) { - recordNetworkEvent( - span, NetworkEvent.Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); + recordMessageEvent( + span, Type.SENT, seqNo, optionalWireSize, optionalUncompressedSize); } @Override public void inboundMessageRead( int seqNo, long optionalWireSize, long optionalUncompressedSize) { - recordNetworkEvent( - span, NetworkEvent.Type.RECV, seqNo, optionalWireSize, optionalUncompressedSize); + recordMessageEvent( + span, Type.RECEIVED, seqNo, optionalWireSize, optionalUncompressedSize); } } diff --git a/core/src/test/java/io/grpc/internal/CensusModulesTest.java b/core/src/test/java/io/grpc/internal/CensusModulesTest.java index 8941c3b5a4..06d06efed3 100644 --- a/core/src/test/java/io/grpc/internal/CensusModulesTest.java +++ b/core/src/test/java/io/grpc/internal/CensusModulesTest.java @@ -72,8 +72,8 @@ import io.opencensus.tags.TagContext; import io.opencensus.tags.TagValue; import io.opencensus.tags.Tags; import io.opencensus.trace.EndSpanOptions; -import io.opencensus.trace.NetworkEvent; -import io.opencensus.trace.NetworkEvent.Type; +import io.opencensus.trace.MessageEvent; +import io.opencensus.trace.MessageEvent.Type; import io.opencensus.trace.Span; import io.opencensus.trace.SpanBuilder; import io.opencensus.trace.SpanContext; @@ -174,7 +174,7 @@ public class CensusModulesTest { @Captor private ArgumentCaptor statusCaptor; @Captor - private ArgumentCaptor networkEventCaptor; + private ArgumentCaptor messageEventCaptor; private CensusStatsModule censusStats; private CensusTracingModule censusTracing; @@ -448,14 +448,14 @@ public class CensusModulesTest { callTracer.callEnded(Status.OK); InOrder inOrder = inOrder(spyClientSpan); - inOrder.verify(spyClientSpan, times(3)).addNetworkEvent(networkEventCaptor.capture()); - List events = networkEventCaptor.getAllValues(); + inOrder.verify(spyClientSpan, times(3)).addMessageEvent(messageEventCaptor.capture()); + List events = messageEventCaptor.getAllValues(); assertEquals( - NetworkEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0)); + MessageEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0)); assertEquals( - NetworkEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1)); + MessageEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1)); assertEquals( - NetworkEvent.builder(Type.RECV, 0) + MessageEvent.builder(Type.RECEIVED, 0) .setCompressedMessageSize(255) .setUncompressedMessageSize(90) .build(), @@ -870,14 +870,14 @@ public class CensusModulesTest { serverStreamTracer.streamClosed(Status.CANCELLED); InOrder inOrder = inOrder(spyServerSpan); - inOrder.verify(spyServerSpan, times(3)).addNetworkEvent(networkEventCaptor.capture()); - List events = networkEventCaptor.getAllValues(); + inOrder.verify(spyServerSpan, times(3)).addMessageEvent(messageEventCaptor.capture()); + List events = messageEventCaptor.getAllValues(); assertEquals( - NetworkEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0)); + MessageEvent.builder(Type.SENT, 0).setCompressedMessageSize(882).build(), events.get(0)); assertEquals( - NetworkEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1)); + MessageEvent.builder(Type.SENT, 1).setUncompressedMessageSize(27).build(), events.get(1)); assertEquals( - NetworkEvent.builder(Type.RECV, 0) + MessageEvent.builder(Type.RECEIVED, 0) .setCompressedMessageSize(255) .setUncompressedMessageSize(90) .build(), diff --git a/repositories.bzl b/repositories.bzl index 3b489fde3e..092848a798 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -279,15 +279,15 @@ def io_netty_tcnative_boringssl_static(): def io_opencensus_api(): native.maven_jar( name = "io_opencensus_opencensus_api", - artifact = "io.opencensus:opencensus-api:0.11.0", - sha1 = "c1ff1f0d737a689d900a3e2113ddc29847188c64", + artifact = "io.opencensus:opencensus-api:0.12.3", + sha1 = "743f074095f29aa985517299545e72cc99c87de0", ) def io_opencensus_grpc_metrics(): native.maven_jar( name = "io_opencensus_opencensus_contrib_grpc_metrics", - artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.11.0", - sha1 = "d57b877f1a28a613452d45e35c7faae5af585258", + artifact = "io.opencensus:opencensus-contrib-grpc-metrics:0.12.3", + sha1 = "a4c7ff238a91b901c8b459889b6d0d7a9d889b4d", ) def javax_annotation(): diff --git a/testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java b/testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java index 827da96e51..16f6004550 100644 --- a/testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java +++ b/testing/src/main/java/io/grpc/internal/testing/StatsTestUtils.java @@ -40,7 +40,7 @@ import io.opencensus.trace.Annotation; import io.opencensus.trace.AttributeValue; import io.opencensus.trace.EndSpanOptions; import io.opencensus.trace.Link; -import io.opencensus.trace.NetworkEvent; +import io.opencensus.trace.MessageEvent; import io.opencensus.trace.Sampler; import io.opencensus.trace.Span; import io.opencensus.trace.SpanBuilder; @@ -347,7 +347,7 @@ public class StatsTestUtils { public void addAnnotation(Annotation annotation) {} @Override - public void addNetworkEvent(NetworkEvent networkEvent) {} + public void addMessageEvent(MessageEvent messageEvent) {} @Override public void addLink(Link link) {}