From 900a00f635beaf7f3750c5baa5a38ff39380cca1 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 13 Oct 2022 00:28:12 +0000 Subject: [PATCH 1/8] OpenCensus: Move measure and view declarations to include file --- include/grpcpp/opencensus.h | 102 ++++++++++++++++++++++ src/cpp/ext/filters/census/grpc_plugin.h | 104 +---------------------- 2 files changed, 104 insertions(+), 102 deletions(-) diff --git a/include/grpcpp/opencensus.h b/include/grpcpp/opencensus.h index 0da949ab73c3a..477c0169e2268 100644 --- a/include/grpcpp/opencensus.h +++ b/include/grpcpp/opencensus.h @@ -42,6 +42,108 @@ void RegisterOpenCensusViewsForExport(); // Returns the tracing Span for the current RPC. ::opencensus::trace::Span GetSpanFromServerContext(ServerContext* context); +// The tag keys set when recording RPC stats. +::opencensus::tags::TagKey ClientMethodTagKey(); +::opencensus::tags::TagKey ClientStatusTagKey(); +::opencensus::tags::TagKey ServerMethodTagKey(); +::opencensus::tags::TagKey ServerStatusTagKey(); + +// Names of measures used by the plugin--users can create views on these +// measures but should not record data for them. +extern const absl::string_view kRpcClientSentMessagesPerRpcMeasureName; +extern const absl::string_view kRpcClientSentBytesPerRpcMeasureName; +extern const absl::string_view kRpcClientReceivedMessagesPerRpcMeasureName; +extern const absl::string_view kRpcClientReceivedBytesPerRpcMeasureName; +extern const absl::string_view kRpcClientRoundtripLatencyMeasureName; +extern const absl::string_view kRpcClientServerLatencyMeasureName; +extern const absl::string_view kRpcClientStartedRpcsMeasureName; +extern const absl::string_view kRpcClientRetriesPerCallMeasureName; +extern const absl::string_view kRpcClientTransparentRetriesPerCallMeasureName; +extern const absl::string_view kRpcClientRetryDelayPerCallMeasureName; + +extern const absl::string_view kRpcServerSentMessagesPerRpcMeasureName; +extern const absl::string_view kRpcServerSentBytesPerRpcMeasureName; +extern const absl::string_view kRpcServerReceivedMessagesPerRpcMeasureName; +extern const absl::string_view kRpcServerReceivedBytesPerRpcMeasureName; +extern const absl::string_view kRpcServerServerLatencyMeasureName; +extern const absl::string_view kRpcServerStartedRpcsMeasureName; + +// Canonical gRPC view definitions. +const ::opencensus::stats::ViewDescriptor& ClientSentMessagesPerRpcCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientSentBytesPerRpcCumulative(); +const ::opencensus::stats::ViewDescriptor& +ClientReceivedMessagesPerRpcCumulative(); +const ::opencensus::stats::ViewDescriptor& +ClientReceivedBytesPerRpcCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientRoundtripLatencyCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientServerLatencyCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientStartedRpcsCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientCompletedRpcsCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientRetriesPerCallCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientRetriesCumulative(); +const ::opencensus::stats::ViewDescriptor& +ClientTransparentRetriesPerCallCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientTransparentRetriesCumulative(); +const ::opencensus::stats::ViewDescriptor& ClientRetryDelayPerCallCumulative(); + +const ::opencensus::stats::ViewDescriptor& ServerSentBytesPerRpcCumulative(); +const ::opencensus::stats::ViewDescriptor& +ServerReceivedBytesPerRpcCumulative(); +const ::opencensus::stats::ViewDescriptor& ServerServerLatencyCumulative(); +const ::opencensus::stats::ViewDescriptor& ServerStartedCountCumulative(); +const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsCumulative(); +const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsCumulative(); +const ::opencensus::stats::ViewDescriptor& ServerSentMessagesPerRpcCumulative(); +const ::opencensus::stats::ViewDescriptor& +ServerReceivedMessagesPerRpcCumulative(); + +const ::opencensus::stats::ViewDescriptor& ClientSentMessagesPerRpcMinute(); +const ::opencensus::stats::ViewDescriptor& ClientSentBytesPerRpcMinute(); +const ::opencensus::stats::ViewDescriptor& ClientReceivedMessagesPerRpcMinute(); +const ::opencensus::stats::ViewDescriptor& ClientReceivedBytesPerRpcMinute(); +const ::opencensus::stats::ViewDescriptor& ClientRoundtripLatencyMinute(); +const ::opencensus::stats::ViewDescriptor& ClientServerLatencyMinute(); +const ::opencensus::stats::ViewDescriptor& ClientStartedRpcsMinute(); +const ::opencensus::stats::ViewDescriptor& ClientCompletedRpcsMinute(); +const ::opencensus::stats::ViewDescriptor& ClientRetriesPerCallMinute(); +const ::opencensus::stats::ViewDescriptor& ClientRetriesMinute(); +const ::opencensus::stats::ViewDescriptor& +ClientTransparentRetriesPerCallMinute(); +const ::opencensus::stats::ViewDescriptor& ClientTransparentRetriesMinute(); +const ::opencensus::stats::ViewDescriptor& ClientRetryDelayPerCallMinute(); + +const ::opencensus::stats::ViewDescriptor& ServerSentMessagesPerRpcMinute(); +const ::opencensus::stats::ViewDescriptor& ServerSentBytesPerRpcMinute(); +const ::opencensus::stats::ViewDescriptor& ServerReceivedMessagesPerRpcMinute(); +const ::opencensus::stats::ViewDescriptor& ServerReceivedBytesPerRpcMinute(); +const ::opencensus::stats::ViewDescriptor& ServerServerLatencyMinute(); +const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsMinute(); +const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsMinute(); + +const ::opencensus::stats::ViewDescriptor& ClientSentMessagesPerRpcHour(); +const ::opencensus::stats::ViewDescriptor& ClientSentBytesPerRpcHour(); +const ::opencensus::stats::ViewDescriptor& ClientReceivedMessagesPerRpcHour(); +const ::opencensus::stats::ViewDescriptor& ClientReceivedBytesPerRpcHour(); +const ::opencensus::stats::ViewDescriptor& ClientRoundtripLatencyHour(); +const ::opencensus::stats::ViewDescriptor& ClientServerLatencyHour(); +const ::opencensus::stats::ViewDescriptor& ClientStartedRpcsHour(); +const ::opencensus::stats::ViewDescriptor& ClientCompletedRpcsHour(); +const ::opencensus::stats::ViewDescriptor& ClientRetriesPerCallHour(); +const ::opencensus::stats::ViewDescriptor& ClientRetriesHour(); +const ::opencensus::stats::ViewDescriptor& +ClientTransparentRetriesPerCallHour(); +const ::opencensus::stats::ViewDescriptor& ClientTransparentRetriesHour(); +const ::opencensus::stats::ViewDescriptor& ClientRetryDelayPerCallHour(); + +const ::opencensus::stats::ViewDescriptor& ServerSentMessagesPerRpcHour(); +const ::opencensus::stats::ViewDescriptor& ServerSentBytesPerRpcHour(); +const ::opencensus::stats::ViewDescriptor& ServerReceivedMessagesPerRpcHour(); +const ::opencensus::stats::ViewDescriptor& ServerReceivedBytesPerRpcHour(); +const ::opencensus::stats::ViewDescriptor& ServerServerLatencyHour(); +const ::opencensus::stats::ViewDescriptor& ServerStartedCountHour(); +const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsHour(); +const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsHour(); + } // namespace grpc #endif // GRPCPP_OPENCENSUS_H diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h index 715024c89585c..391a30df5542d 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.h +++ b/src/cpp/ext/filters/census/grpc_plugin.h @@ -25,109 +25,9 @@ #include "opencensus/stats/stats.h" #include "opencensus/tags/tag_key.h" -namespace grpc { - -// The tag keys set when recording RPC stats. -::opencensus::tags::TagKey ClientMethodTagKey(); -::opencensus::tags::TagKey ClientStatusTagKey(); -::opencensus::tags::TagKey ServerMethodTagKey(); -::opencensus::tags::TagKey ServerStatusTagKey(); - -// Names of measures used by the plugin--users can create views on these -// measures but should not record data for them. -extern const absl::string_view kRpcClientSentMessagesPerRpcMeasureName; -extern const absl::string_view kRpcClientSentBytesPerRpcMeasureName; -extern const absl::string_view kRpcClientReceivedMessagesPerRpcMeasureName; -extern const absl::string_view kRpcClientReceivedBytesPerRpcMeasureName; -extern const absl::string_view kRpcClientRoundtripLatencyMeasureName; -extern const absl::string_view kRpcClientServerLatencyMeasureName; -extern const absl::string_view kRpcClientStartedRpcsMeasureName; -extern const absl::string_view kRpcClientRetriesPerCallMeasureName; -extern const absl::string_view kRpcClientTransparentRetriesPerCallMeasureName; -extern const absl::string_view kRpcClientRetryDelayPerCallMeasureName; - -extern const absl::string_view kRpcServerSentMessagesPerRpcMeasureName; -extern const absl::string_view kRpcServerSentBytesPerRpcMeasureName; -extern const absl::string_view kRpcServerReceivedMessagesPerRpcMeasureName; -extern const absl::string_view kRpcServerReceivedBytesPerRpcMeasureName; -extern const absl::string_view kRpcServerServerLatencyMeasureName; -extern const absl::string_view kRpcServerStartedRpcsMeasureName; - -// Canonical gRPC view definitions. -const ::opencensus::stats::ViewDescriptor& ClientSentMessagesPerRpcCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientSentBytesPerRpcCumulative(); -const ::opencensus::stats::ViewDescriptor& -ClientReceivedMessagesPerRpcCumulative(); -const ::opencensus::stats::ViewDescriptor& -ClientReceivedBytesPerRpcCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientRoundtripLatencyCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientServerLatencyCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientStartedRpcsCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientCompletedRpcsCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientRetriesPerCallCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientRetriesCumulative(); -const ::opencensus::stats::ViewDescriptor& -ClientTransparentRetriesPerCallCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientTransparentRetriesCumulative(); -const ::opencensus::stats::ViewDescriptor& ClientRetryDelayPerCallCumulative(); +#include -const ::opencensus::stats::ViewDescriptor& ServerSentBytesPerRpcCumulative(); -const ::opencensus::stats::ViewDescriptor& -ServerReceivedBytesPerRpcCumulative(); -const ::opencensus::stats::ViewDescriptor& ServerServerLatencyCumulative(); -const ::opencensus::stats::ViewDescriptor& ServerStartedCountCumulative(); -const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsCumulative(); -const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsCumulative(); -const ::opencensus::stats::ViewDescriptor& ServerSentMessagesPerRpcCumulative(); -const ::opencensus::stats::ViewDescriptor& -ServerReceivedMessagesPerRpcCumulative(); - -const ::opencensus::stats::ViewDescriptor& ClientSentMessagesPerRpcMinute(); -const ::opencensus::stats::ViewDescriptor& ClientSentBytesPerRpcMinute(); -const ::opencensus::stats::ViewDescriptor& ClientReceivedMessagesPerRpcMinute(); -const ::opencensus::stats::ViewDescriptor& ClientReceivedBytesPerRpcMinute(); -const ::opencensus::stats::ViewDescriptor& ClientRoundtripLatencyMinute(); -const ::opencensus::stats::ViewDescriptor& ClientServerLatencyMinute(); -const ::opencensus::stats::ViewDescriptor& ClientStartedRpcsMinute(); -const ::opencensus::stats::ViewDescriptor& ClientCompletedRpcsMinute(); -const ::opencensus::stats::ViewDescriptor& ClientRetriesPerCallMinute(); -const ::opencensus::stats::ViewDescriptor& ClientRetriesMinute(); -const ::opencensus::stats::ViewDescriptor& -ClientTransparentRetriesPerCallMinute(); -const ::opencensus::stats::ViewDescriptor& ClientTransparentRetriesMinute(); -const ::opencensus::stats::ViewDescriptor& ClientRetryDelayPerCallMinute(); - -const ::opencensus::stats::ViewDescriptor& ServerSentMessagesPerRpcMinute(); -const ::opencensus::stats::ViewDescriptor& ServerSentBytesPerRpcMinute(); -const ::opencensus::stats::ViewDescriptor& ServerReceivedMessagesPerRpcMinute(); -const ::opencensus::stats::ViewDescriptor& ServerReceivedBytesPerRpcMinute(); -const ::opencensus::stats::ViewDescriptor& ServerServerLatencyMinute(); -const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsMinute(); -const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsMinute(); - -const ::opencensus::stats::ViewDescriptor& ClientSentMessagesPerRpcHour(); -const ::opencensus::stats::ViewDescriptor& ClientSentBytesPerRpcHour(); -const ::opencensus::stats::ViewDescriptor& ClientReceivedMessagesPerRpcHour(); -const ::opencensus::stats::ViewDescriptor& ClientReceivedBytesPerRpcHour(); -const ::opencensus::stats::ViewDescriptor& ClientRoundtripLatencyHour(); -const ::opencensus::stats::ViewDescriptor& ClientServerLatencyHour(); -const ::opencensus::stats::ViewDescriptor& ClientStartedRpcsHour(); -const ::opencensus::stats::ViewDescriptor& ClientCompletedRpcsHour(); -const ::opencensus::stats::ViewDescriptor& ClientRetriesPerCallHour(); -const ::opencensus::stats::ViewDescriptor& ClientRetriesHour(); -const ::opencensus::stats::ViewDescriptor& -ClientTransparentRetriesPerCallHour(); -const ::opencensus::stats::ViewDescriptor& ClientTransparentRetriesHour(); -const ::opencensus::stats::ViewDescriptor& ClientRetryDelayPerCallHour(); - -const ::opencensus::stats::ViewDescriptor& ServerSentMessagesPerRpcHour(); -const ::opencensus::stats::ViewDescriptor& ServerSentBytesPerRpcHour(); -const ::opencensus::stats::ViewDescriptor& ServerReceivedMessagesPerRpcHour(); -const ::opencensus::stats::ViewDescriptor& ServerReceivedBytesPerRpcHour(); -const ::opencensus::stats::ViewDescriptor& ServerServerLatencyHour(); -const ::opencensus::stats::ViewDescriptor& ServerStartedCountHour(); -const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsHour(); -const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsHour(); +namespace grpc { // Enables/Disables OpenCensus stats/tracing. It's only safe to do at the start // of a program, before any channels/servers are built. From 311b9a79af3b288e488288c0928b021c5f2487d2 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 13 Oct 2022 00:35:35 +0000 Subject: [PATCH 2/8] Move CensusContext class too --- include/grpcpp/opencensus.h | 39 ++++++++++++++++++++++++++++ src/cpp/ext/filters/census/context.h | 37 +------------------------- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/include/grpcpp/opencensus.h b/include/grpcpp/opencensus.h index 477c0169e2268..e2b315e578c7c 100644 --- a/include/grpcpp/opencensus.h +++ b/include/grpcpp/opencensus.h @@ -19,7 +19,10 @@ #ifndef GRPCPP_OPENCENSUS_H #define GRPCPP_OPENCENSUS_H +#include "opencensus/stats/view_descriptor.h" +#include "opencensus/tags/tag_map.h" #include "opencensus/trace/span.h" +#include "opencensus/trace/span_context.h" namespace grpc { class ServerContext; @@ -144,6 +147,42 @@ const ::opencensus::stats::ViewDescriptor& ServerStartedCountHour(); const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsHour(); const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsHour(); +// Thread compatible. +class CensusContext { + public: + CensusContext() : span_(::opencensus::trace::Span::BlankSpan()), tags_({}) {} + + explicit CensusContext(absl::string_view name, + const ::opencensus::tags::TagMap& tags) + : span_(::opencensus::trace::Span::StartSpan(name)), tags_(tags) {} + + CensusContext(absl::string_view name, const ::opencensus::trace::Span* parent, + const ::opencensus::tags::TagMap& tags) + : span_(::opencensus::trace::Span::StartSpan(name, parent)), + tags_(tags) {} + + CensusContext(absl::string_view name, + const ::opencensus::trace::SpanContext& parent_ctxt) + : span_(::opencensus::trace::Span::StartSpanWithRemoteParent( + name, parent_ctxt)), + tags_({}) {} + + void AddSpanAttribute(absl::string_view key, + opencensus::trace::AttributeValueRef attribute) { + span_.AddAttribute(key, attribute); + } + + const ::opencensus::trace::Span& Span() const { return span_; } + const ::opencensus::tags::TagMap& tags() const { return tags_; } + + ::opencensus::trace::SpanContext Context() const { return Span().context(); } + void EndSpan() { Span().End(); } + + private: + ::opencensus::trace::Span span_; + ::opencensus::tags::TagMap tags_; +}; + } // namespace grpc #endif // GRPCPP_OPENCENSUS_H diff --git a/src/cpp/ext/filters/census/context.h b/src/cpp/ext/filters/census/context.h index e38fda8cda1dc..6939d1c1b3d54 100644 --- a/src/cpp/ext/filters/census/context.h +++ b/src/cpp/ext/filters/census/context.h @@ -34,48 +34,13 @@ #include #include #include +#include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/slice/slice.h" namespace grpc { -// Thread compatible. -class CensusContext { - public: - CensusContext() : span_(::opencensus::trace::Span::BlankSpan()), tags_({}) {} - - explicit CensusContext(absl::string_view name, - const ::opencensus::tags::TagMap& tags) - : span_(::opencensus::trace::Span::StartSpan(name)), tags_(tags) {} - - CensusContext(absl::string_view name, const ::opencensus::trace::Span* parent, - const ::opencensus::tags::TagMap& tags) - : span_(::opencensus::trace::Span::StartSpan(name, parent)), - tags_(tags) {} - - CensusContext(absl::string_view name, - const ::opencensus::trace::SpanContext& parent_ctxt) - : span_(::opencensus::trace::Span::StartSpanWithRemoteParent( - name, parent_ctxt)), - tags_({}) {} - - void AddSpanAttribute(absl::string_view key, - opencensus::trace::AttributeValueRef attribute) { - span_.AddAttribute(key, attribute); - } - - const ::opencensus::trace::Span& Span() const { return span_; } - const ::opencensus::tags::TagMap& tags() const { return tags_; } - - ::opencensus::trace::SpanContext Context() const { return Span().context(); } - void EndSpan() { Span().End(); } - - private: - ::opencensus::trace::Span span_; - ::opencensus::tags::TagMap tags_; -}; - // Serializes the outgoing trace context. tracing_buf must be // opencensus::trace::propagation::kGrpcTraceBinHeaderLen bytes long. size_t TraceContextSerialize(const ::opencensus::trace::SpanContext& context, From aaab10ff696d04eb588b2b68bdc137a1976f6864 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 13 Oct 2022 01:20:58 +0000 Subject: [PATCH 3/8] Fix IWYU --- src/cpp/ext/filters/census/client_filter.cc | 1 + src/cpp/ext/filters/census/context.cc | 1 + src/cpp/ext/filters/census/context.h | 2 -- src/cpp/ext/filters/census/grpc_plugin.cc | 2 +- src/cpp/ext/filters/census/grpc_plugin.h | 6 ------ src/cpp/ext/filters/census/measures.cc | 2 +- src/cpp/ext/filters/census/open_census_call_tracer.h | 2 +- src/cpp/ext/filters/census/server_filter.cc | 1 + src/cpp/ext/filters/census/server_filter.h | 2 +- src/cpp/ext/filters/census/views.cc | 2 -- 10 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/cpp/ext/filters/census/client_filter.cc b/src/cpp/ext/filters/census/client_filter.cc index 26b47b5325694..dede8f2bf7776 100644 --- a/src/cpp/ext/filters/census/client_filter.cc +++ b/src/cpp/ext/filters/census/client_filter.cc @@ -44,6 +44,7 @@ #include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/src/cpp/ext/filters/census/context.cc b/src/cpp/ext/filters/census/context.cc index 9e5ead22aced1..2e977d7993bd4 100644 --- a/src/cpp/ext/filters/census/context.cc +++ b/src/cpp/ext/filters/census/context.cc @@ -23,6 +23,7 @@ #include #include "opencensus/tags/context_util.h" +#include "opencensus/tags/tag_map.h" #include "opencensus/trace/context_util.h" #include "opencensus/trace/propagation/grpc_trace_bin.h" diff --git a/src/cpp/ext/filters/census/context.h b/src/cpp/ext/filters/census/context.h index 6939d1c1b3d54..6b033775c044e 100644 --- a/src/cpp/ext/filters/census/context.h +++ b/src/cpp/ext/filters/census/context.h @@ -26,8 +26,6 @@ #include "absl/strings/string_view.h" #include "absl/strings/strip.h" -#include "opencensus/tags/tag_map.h" -#include "opencensus/trace/attribute_value_ref.h" #include "opencensus/trace/span.h" #include "opencensus/trace/span_context.h" diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc index 60155e8b8eaa7..09e2222efc6eb 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.cc +++ b/src/cpp/ext/filters/census/grpc_plugin.cc @@ -25,6 +25,7 @@ #include #include "absl/base/attributes.h" +#include "absl/strings/string_view.h" #include "opencensus/tags/tag_key.h" #include "opencensus/trace/span.h" @@ -35,7 +36,6 @@ #include "src/cpp/common/channel_filter.h" #include "src/cpp/ext/filters/census/channel_filter.h" #include "src/cpp/ext/filters/census/client_filter.h" -#include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/measures.h" #include "src/cpp/ext/filters/census/server_filter.h" diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h index 391a30df5542d..3b25f4938e280 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.h +++ b/src/cpp/ext/filters/census/grpc_plugin.h @@ -21,12 +21,6 @@ #include -#include "absl/strings/string_view.h" -#include "opencensus/stats/stats.h" -#include "opencensus/tags/tag_key.h" - -#include - namespace grpc { // Enables/Disables OpenCensus stats/tracing. It's only safe to do at the start diff --git a/src/cpp/ext/filters/census/measures.cc b/src/cpp/ext/filters/census/measures.cc index 29f90fac11a04..16dec46d48294 100644 --- a/src/cpp/ext/filters/census/measures.cc +++ b/src/cpp/ext/filters/census/measures.cc @@ -22,7 +22,7 @@ #include "opencensus/stats/stats.h" -#include "src/cpp/ext/filters/census/grpc_plugin.h" +#include namespace grpc { diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h index 1c8fd265c648a..40d0f36d0bd3f 100644 --- a/src/cpp/ext/filters/census/open_census_call_tracer.h +++ b/src/cpp/ext/filters/census/open_census_call_tracer.h @@ -30,6 +30,7 @@ #include #include +#include #include "src/core/lib/channel/call_tracer.h" #include "src/core/lib/channel/channel_stack.h" @@ -41,7 +42,6 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/core/lib/transport/transport.h" -#include "src/cpp/ext/filters/census/context.h" // TODO(yashykt): This might not be the right place for this channel arg, but we // don't have a better place for this right now. diff --git a/src/cpp/ext/filters/census/server_filter.cc b/src/cpp/ext/filters/census/server_filter.cc index 622ae26add9f6..ada41d7242c26 100644 --- a/src/cpp/ext/filters/census/server_filter.cc +++ b/src/cpp/ext/filters/census/server_filter.cc @@ -38,6 +38,7 @@ #include "src/core/lib/surface/call.h" #include "src/core/lib/transport/transport.h" #include "src/cpp/ext/filters/census/channel_filter.h" +#include "src/cpp/ext/filters/census/context.h" #include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/measures.h" diff --git a/src/cpp/ext/filters/census/server_filter.h b/src/cpp/ext/filters/census/server_filter.h index 55e542cb5d709..1c35f0c29a5c0 100644 --- a/src/cpp/ext/filters/census/server_filter.h +++ b/src/cpp/ext/filters/census/server_filter.h @@ -32,6 +32,7 @@ #include #include +#include #include #include "src/core/lib/channel/channel_fwd.h" @@ -42,7 +43,6 @@ #include "src/core/lib/slice/slice_buffer.h" #include "src/core/lib/transport/metadata_batch.h" #include "src/cpp/common/channel_filter.h" -#include "src/cpp/ext/filters/census/context.h" namespace grpc { diff --git a/src/cpp/ext/filters/census/views.cc b/src/cpp/ext/filters/census/views.cc index 6885fd00c87f7..9728c3ac192bd 100644 --- a/src/cpp/ext/filters/census/views.cc +++ b/src/cpp/ext/filters/census/views.cc @@ -25,8 +25,6 @@ #include -#include "src/cpp/ext/filters/census/grpc_plugin.h" - namespace grpc { using ::opencensus::stats::Aggregation; From 79d5a218fe13786b4d6346cb32edf17d75d0c51a Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 17 Oct 2022 21:27:19 +0000 Subject: [PATCH 4/8] Guard with experimental --- include/grpcpp/opencensus.h | 4 + src/cpp/ext/filters/census/context.h | 2 + src/cpp/ext/filters/census/grpc_plugin.cc | 70 +++-- src/cpp/ext/filters/census/grpc_plugin.h | 97 ++++++ src/cpp/ext/filters/census/measures.cc | 56 ++-- .../filters/census/open_census_call_tracer.h | 8 +- src/cpp/ext/filters/census/server_filter.h | 2 +- src/cpp/ext/filters/census/views.cc | 290 +++++++++--------- 8 files changed, 329 insertions(+), 200 deletions(-) diff --git a/include/grpcpp/opencensus.h b/include/grpcpp/opencensus.h index e2b315e578c7c..d01f5c5903bb5 100644 --- a/include/grpcpp/opencensus.h +++ b/include/grpcpp/opencensus.h @@ -45,6 +45,8 @@ void RegisterOpenCensusViewsForExport(); // Returns the tracing Span for the current RPC. ::opencensus::trace::Span GetSpanFromServerContext(ServerContext* context); +namespace experimental { + // The tag keys set when recording RPC stats. ::opencensus::tags::TagKey ClientMethodTagKey(); ::opencensus::tags::TagKey ClientStatusTagKey(); @@ -183,6 +185,8 @@ class CensusContext { ::opencensus::tags::TagMap tags_; }; +} // namespace experimental + } // namespace grpc #endif // GRPCPP_OPENCENSUS_H diff --git a/src/cpp/ext/filters/census/context.h b/src/cpp/ext/filters/census/context.h index 6b033775c044e..0486283fdd76e 100644 --- a/src/cpp/ext/filters/census/context.h +++ b/src/cpp/ext/filters/census/context.h @@ -39,6 +39,8 @@ namespace grpc { +using experimental::CensusContext; + // Serializes the outgoing trace context. tracing_buf must be // opencensus::trace::propagation::kGrpcTraceBinHeaderLen bytes long. size_t TraceContextSerialize(const ::opencensus::trace::SpanContext& context, diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc index 09e2222efc6eb..fce236797e5a2 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.cc +++ b/src/cpp/ext/filters/census/grpc_plugin.cc @@ -75,32 +75,33 @@ ::opencensus::trace::Span GetSpanFromServerContext( grpc::ServerContext* context) { if (context == nullptr) return opencensus::trace::Span::BlankSpan(); - return reinterpret_cast(context->census_context()) + return reinterpret_cast( + context->census_context()) ->Span(); } // These measure definitions should be kept in sync across opencensus // implementations--see // https://github.com/census-instrumentation/opencensus-java/blob/master/contrib/grpc_metrics/src/main/java/io/opencensus/contrib/grpc/metrics/RpcMeasureConstants.java. -::opencensus::tags::TagKey ClientMethodTagKey() { +::opencensus::tags::TagKey experimental::ClientMethodTagKey() { static const auto method_tag_key = ::opencensus::tags::TagKey::Register("grpc_client_method"); return method_tag_key; } -::opencensus::tags::TagKey ClientStatusTagKey() { +::opencensus::tags::TagKey experimental::ClientStatusTagKey() { static const auto status_tag_key = ::opencensus::tags::TagKey::Register("grpc_client_status"); return status_tag_key; } -::opencensus::tags::TagKey ServerMethodTagKey() { +::opencensus::tags::TagKey experimental::ServerMethodTagKey() { static const auto method_tag_key = ::opencensus::tags::TagKey::Register("grpc_server_method"); return method_tag_key; } -::opencensus::tags::TagKey ServerStatusTagKey() { +::opencensus::tags::TagKey experimental::ServerStatusTagKey() { static const auto status_tag_key = ::opencensus::tags::TagKey::Register("grpc_server_status"); return status_tag_key; @@ -108,60 +109,69 @@ ::opencensus::tags::TagKey ServerStatusTagKey() { // Client ABSL_CONST_INIT const absl::string_view - kRpcClientSentMessagesPerRpcMeasureName = + experimental::kRpcClientSentMessagesPerRpcMeasureName = "grpc.io/client/sent_messages_per_rpc"; -ABSL_CONST_INIT const absl::string_view kRpcClientSentBytesPerRpcMeasureName = - "grpc.io/client/sent_bytes_per_rpc"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcClientSentBytesPerRpcMeasureName = + "grpc.io/client/sent_bytes_per_rpc"; ABSL_CONST_INIT const absl::string_view - kRpcClientReceivedMessagesPerRpcMeasureName = + experimental::kRpcClientReceivedMessagesPerRpcMeasureName = "grpc.io/client/received_messages_per_rpc"; ABSL_CONST_INIT const absl::string_view - kRpcClientReceivedBytesPerRpcMeasureName = + experimental::kRpcClientReceivedBytesPerRpcMeasureName = "grpc.io/client/received_bytes_per_rpc"; -ABSL_CONST_INIT const absl::string_view kRpcClientRoundtripLatencyMeasureName = - "grpc.io/client/roundtrip_latency"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcClientRoundtripLatencyMeasureName = + "grpc.io/client/roundtrip_latency"; -ABSL_CONST_INIT const absl::string_view kRpcClientServerLatencyMeasureName = - "grpc.io/client/server_latency"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcClientServerLatencyMeasureName = + "grpc.io/client/server_latency"; -ABSL_CONST_INIT const absl::string_view kRpcClientStartedRpcsMeasureName = - "grpc.io/client/started_rpcs"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcClientStartedRpcsMeasureName = + "grpc.io/client/started_rpcs"; -ABSL_CONST_INIT const absl::string_view kRpcClientRetriesPerCallMeasureName = - "grpc.io/client/retries_per_call"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcClientRetriesPerCallMeasureName = + "grpc.io/client/retries_per_call"; ABSL_CONST_INIT const absl::string_view - kRpcClientTransparentRetriesPerCallMeasureName = + experimental::kRpcClientTransparentRetriesPerCallMeasureName = "grpc.io/client/transparent_retries_per_call"; -ABSL_CONST_INIT const absl::string_view kRpcClientRetryDelayPerCallMeasureName = - "grpc.io/client/retry_delay_per_call"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcClientRetryDelayPerCallMeasureName = + "grpc.io/client/retry_delay_per_call"; // Server ABSL_CONST_INIT const absl::string_view - kRpcServerSentMessagesPerRpcMeasureName = + experimental::kRpcServerSentMessagesPerRpcMeasureName = "grpc.io/server/sent_messages_per_rpc"; -ABSL_CONST_INIT const absl::string_view kRpcServerSentBytesPerRpcMeasureName = - "grpc.io/server/sent_bytes_per_rpc"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcServerSentBytesPerRpcMeasureName = + "grpc.io/server/sent_bytes_per_rpc"; ABSL_CONST_INIT const absl::string_view - kRpcServerReceivedMessagesPerRpcMeasureName = + experimental::kRpcServerReceivedMessagesPerRpcMeasureName = "grpc.io/server/received_messages_per_rpc"; ABSL_CONST_INIT const absl::string_view - kRpcServerReceivedBytesPerRpcMeasureName = + experimental::kRpcServerReceivedBytesPerRpcMeasureName = "grpc.io/server/received_bytes_per_rpc"; -ABSL_CONST_INIT const absl::string_view kRpcServerServerLatencyMeasureName = - "grpc.io/server/server_latency"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcServerServerLatencyMeasureName = + "grpc.io/server/server_latency"; -ABSL_CONST_INIT const absl::string_view kRpcServerStartedRpcsMeasureName = - "grpc.io/server/started_rpcs"; +ABSL_CONST_INIT const absl::string_view + experimental::kRpcServerStartedRpcsMeasureName = + "grpc.io/server/started_rpcs"; std::atomic g_open_census_stats_enabled(true); std::atomic g_open_census_tracing_enabled(true); diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h index 3b25f4938e280..4e516800fa679 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.h +++ b/src/cpp/ext/filters/census/grpc_plugin.h @@ -21,6 +21,8 @@ #include +#include + namespace grpc { // Enables/Disables OpenCensus stats/tracing. It's only safe to do at the start @@ -31,6 +33,101 @@ void EnableOpenCensusTracing(bool enable); bool OpenCensusStatsEnabled(); bool OpenCensusTracingEnabled(); +// The tag keys set when recording RPC stats. +using experimental::ClientMethodTagKey; +using experimental::ClientStatusTagKey; +using experimental::ServerMethodTagKey; +using experimental::ServerStatusTagKey; + +// Names of measures used by the plugin--users can create views on these +// measures but should not record data for them. +using experimental::kRpcClientReceivedBytesPerRpcMeasureName; +using experimental::kRpcClientReceivedMessagesPerRpcMeasureName; +using experimental::kRpcClientRetriesPerCallMeasureName; +using experimental::kRpcClientRetryDelayPerCallMeasureName; +using experimental::kRpcClientRoundtripLatencyMeasureName; +using experimental::kRpcClientSentBytesPerRpcMeasureName; +using experimental::kRpcClientSentMessagesPerRpcMeasureName; +using experimental::kRpcClientServerLatencyMeasureName; +using experimental::kRpcClientStartedRpcsMeasureName; +using experimental::kRpcClientTransparentRetriesPerCallMeasureName; + +using experimental::kRpcServerReceivedBytesPerRpcMeasureName; +using experimental::kRpcServerReceivedMessagesPerRpcMeasureName; +using experimental::kRpcServerSentBytesPerRpcMeasureName; +using experimental::kRpcServerSentMessagesPerRpcMeasureName; +using experimental::kRpcServerServerLatencyMeasureName; +using experimental::kRpcServerStartedRpcsMeasureName; + +// Canonical gRPC view definitions. +using experimental::ClientCompletedRpcsCumulative; +using experimental::ClientReceivedBytesPerRpcCumulative; +using experimental::ClientReceivedMessagesPerRpcCumulative; +using experimental::ClientRetriesCumulative; +using experimental::ClientRetriesPerCallCumulative; +using experimental::ClientRetryDelayPerCallCumulative; +using experimental::ClientRoundtripLatencyCumulative; +using experimental::ClientSentBytesPerRpcCumulative; +using experimental::ClientSentMessagesPerRpcCumulative; +using experimental::ClientServerLatencyCumulative; +using experimental::ClientStartedRpcsCumulative; +using experimental::ClientTransparentRetriesCumulative; +using experimental::ClientTransparentRetriesPerCallCumulative; + +using experimental::ServerCompletedRpcsCumulative; +using experimental::ServerReceivedBytesPerRpcCumulative; +using experimental::ServerReceivedMessagesPerRpcCumulative; +using experimental::ServerSentBytesPerRpcCumulative; +using experimental::ServerSentMessagesPerRpcCumulative; +using experimental::ServerServerLatencyCumulative; +using experimental::ServerStartedCountCumulative; +using experimental::ServerStartedRpcsCumulative; + +using experimental::ClientCompletedRpcsMinute; +using experimental::ClientReceivedBytesPerRpcMinute; +using experimental::ClientReceivedMessagesPerRpcMinute; +using experimental::ClientRetriesMinute; +using experimental::ClientRetriesPerCallMinute; +using experimental::ClientRetryDelayPerCallMinute; +using experimental::ClientRoundtripLatencyMinute; +using experimental::ClientSentBytesPerRpcMinute; +using experimental::ClientSentMessagesPerRpcMinute; +using experimental::ClientServerLatencyMinute; +using experimental::ClientStartedRpcsMinute; +using experimental::ClientTransparentRetriesMinute; +using experimental::ClientTransparentRetriesPerCallMinute; + +using experimental::ServerCompletedRpcsMinute; +using experimental::ServerReceivedBytesPerRpcMinute; +using experimental::ServerReceivedMessagesPerRpcMinute; +using experimental::ServerSentBytesPerRpcMinute; +using experimental::ServerSentMessagesPerRpcMinute; +using experimental::ServerServerLatencyMinute; +using experimental::ServerStartedRpcsMinute; + +using experimental::ClientCompletedRpcsHour; +using experimental::ClientReceivedBytesPerRpcHour; +using experimental::ClientReceivedMessagesPerRpcHour; +using experimental::ClientRetriesHour; +using experimental::ClientRetriesPerCallHour; +using experimental::ClientRetryDelayPerCallHour; +using experimental::ClientRoundtripLatencyHour; +using experimental::ClientSentBytesPerRpcHour; +using experimental::ClientSentMessagesPerRpcHour; +using experimental::ClientServerLatencyHour; +using experimental::ClientStartedRpcsHour; +using experimental::ClientTransparentRetriesHour; +using experimental::ClientTransparentRetriesPerCallHour; + +using experimental::ServerCompletedRpcsHour; +using experimental::ServerReceivedBytesPerRpcHour; +using experimental::ServerReceivedMessagesPerRpcHour; +using experimental::ServerSentBytesPerRpcHour; +using experimental::ServerSentMessagesPerRpcHour; +using experimental::ServerServerLatencyHour; +using experimental::ServerStartedCountHour; +using experimental::ServerStartedRpcsHour; + } // namespace grpc #endif /* GRPC_INTERNAL_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H */ diff --git a/src/cpp/ext/filters/census/measures.cc b/src/cpp/ext/filters/census/measures.cc index 16dec46d48294..b813db88182d0 100644 --- a/src/cpp/ext/filters/census/measures.cc +++ b/src/cpp/ext/filters/census/measures.cc @@ -45,21 +45,21 @@ constexpr char kCount[] = "1"; // Client MeasureDouble RpcClientSentBytesPerRpc() { static const auto measure = MeasureDouble::Register( - kRpcClientSentBytesPerRpcMeasureName, + experimental::kRpcClientSentBytesPerRpcMeasureName, "Total bytes sent across all request messages per RPC", kUnitBytes); return measure; } MeasureDouble RpcClientReceivedBytesPerRpc() { static const auto measure = MeasureDouble::Register( - kRpcClientReceivedBytesPerRpcMeasureName, + experimental::kRpcClientReceivedBytesPerRpcMeasureName, "Total bytes received across all response messages per RPC", kUnitBytes); return measure; } MeasureDouble RpcClientRoundtripLatency() { static const auto measure = MeasureDouble::Register( - kRpcClientRoundtripLatencyMeasureName, + experimental::kRpcClientRoundtripLatencyMeasureName, "Time between first byte of request sent to last byte of response " "received, or terminal error", kUnitMilliseconds); @@ -68,7 +68,7 @@ MeasureDouble RpcClientRoundtripLatency() { MeasureDouble RpcClientServerLatency() { static const auto measure = MeasureDouble::Register( - kRpcClientServerLatencyMeasureName, + experimental::kRpcClientServerLatencyMeasureName, "Time between first byte of request received to last byte of response " "sent, or terminal error (propagated from the server)", kUnitMilliseconds); @@ -76,22 +76,22 @@ MeasureDouble RpcClientServerLatency() { } MeasureInt64 RpcClientSentMessagesPerRpc() { - static const auto measure = - MeasureInt64::Register(kRpcClientSentMessagesPerRpcMeasureName, - "Number of messages sent per RPC", kCount); + static const auto measure = MeasureInt64::Register( + experimental::kRpcClientSentMessagesPerRpcMeasureName, + "Number of messages sent per RPC", kCount); return measure; } MeasureInt64 RpcClientReceivedMessagesPerRpc() { - static const auto measure = - MeasureInt64::Register(kRpcClientReceivedMessagesPerRpcMeasureName, - "Number of messages received per RPC", kCount); + static const auto measure = MeasureInt64::Register( + experimental::kRpcClientReceivedMessagesPerRpcMeasureName, + "Number of messages received per RPC", kCount); return measure; } MeasureInt64 RpcClientStartedRpcs() { static const auto measure = - MeasureInt64::Register(kRpcClientStartedRpcsMeasureName, + MeasureInt64::Register(experimental::kRpcClientStartedRpcsMeasureName, "The total number of client RPCs ever opened, " "including those that have not been completed.", kCount); @@ -101,7 +101,7 @@ MeasureInt64 RpcClientStartedRpcs() { // Client per-overall-client-call measures MeasureInt64 RpcClientRetriesPerCall() { static const auto measure = - MeasureInt64::Register(kRpcClientRetriesPerCallMeasureName, + MeasureInt64::Register(experimental::kRpcClientRetriesPerCallMeasureName, "Number of retry or hedging attempts excluding " "transparent retries made during the client call", kCount); @@ -110,38 +110,38 @@ MeasureInt64 RpcClientRetriesPerCall() { MeasureInt64 RpcClientTransparentRetriesPerCall() { static const auto measure = MeasureInt64::Register( - kRpcClientTransparentRetriesPerCallMeasureName, + experimental::kRpcClientTransparentRetriesPerCallMeasureName, "Number of transparent retries made during the client call", kCount); return measure; } MeasureDouble RpcClientRetryDelayPerCall() { - static const auto measure = - MeasureDouble::Register(kRpcClientRetryDelayPerCallMeasureName, - "Total time of delay while there is no active " - "attempt during the client call", - kUnitMilliseconds); + static const auto measure = MeasureDouble::Register( + experimental::kRpcClientRetryDelayPerCallMeasureName, + "Total time of delay while there is no active " + "attempt during the client call", + kUnitMilliseconds); return measure; } // Server MeasureDouble RpcServerSentBytesPerRpc() { static const auto measure = MeasureDouble::Register( - kRpcServerSentBytesPerRpcMeasureName, + experimental::kRpcServerSentBytesPerRpcMeasureName, "Total bytes sent across all messages per RPC", kUnitBytes); return measure; } MeasureDouble RpcServerReceivedBytesPerRpc() { static const auto measure = MeasureDouble::Register( - kRpcServerReceivedBytesPerRpcMeasureName, + experimental::kRpcServerReceivedBytesPerRpcMeasureName, "Total bytes received across all messages per RPC", kUnitBytes); return measure; } MeasureDouble RpcServerServerLatency() { static const auto measure = MeasureDouble::Register( - kRpcServerServerLatencyMeasureName, + experimental::kRpcServerServerLatencyMeasureName, "Time between first byte of request received to last byte of response " "sent, or terminal error", kUnitMilliseconds); @@ -150,7 +150,7 @@ MeasureDouble RpcServerServerLatency() { MeasureInt64 RpcServerStartedRpcs() { static const auto measure = - MeasureInt64::Register(kRpcServerStartedRpcsMeasureName, + MeasureInt64::Register(experimental::kRpcServerStartedRpcsMeasureName, "The total number of server RPCs ever opened, " "including those that have not been completed.", kCount); @@ -158,16 +158,16 @@ MeasureInt64 RpcServerStartedRpcs() { } MeasureInt64 RpcServerSentMessagesPerRpc() { - static const auto measure = - MeasureInt64::Register(kRpcServerSentMessagesPerRpcMeasureName, - "Number of messages sent per RPC", kCount); + static const auto measure = MeasureInt64::Register( + experimental::kRpcServerSentMessagesPerRpcMeasureName, + "Number of messages sent per RPC", kCount); return measure; } MeasureInt64 RpcServerReceivedMessagesPerRpc() { - static const auto measure = - MeasureInt64::Register(kRpcServerReceivedMessagesPerRpcMeasureName, - "Number of messages received per RPC", kCount); + static const auto measure = MeasureInt64::Register( + experimental::kRpcServerReceivedMessagesPerRpcMeasureName, + "Number of messages received per RPC", kCount); return measure; } diff --git a/src/cpp/ext/filters/census/open_census_call_tracer.h b/src/cpp/ext/filters/census/open_census_call_tracer.h index 40d0f36d0bd3f..1ecfdf6359389 100644 --- a/src/cpp/ext/filters/census/open_census_call_tracer.h +++ b/src/cpp/ext/filters/census/open_census_call_tracer.h @@ -82,7 +82,7 @@ class OpenCensusCallTracer : public grpc_core::CallTracer { void RecordCancel(grpc_error_handle cancel_error) override; void RecordEnd(const gpr_timespec& /*latency*/) override; - CensusContext* context() { return &context_; } + experimental::CensusContext* context() { return &context_; } private: // Maximum size of trace context is sent on the wire. @@ -91,7 +91,7 @@ class OpenCensusCallTracer : public grpc_core::CallTracer { static constexpr uint32_t kMaxTagsLen = 2048; OpenCensusCallTracer* parent_; const bool arena_allocated_; - CensusContext context_; + experimental::CensusContext context_; // Start time (for measuring latency). absl::Time start_time_; // Number of messages in this RPC. @@ -110,13 +110,13 @@ class OpenCensusCallTracer : public grpc_core::CallTracer { bool is_transparent_retry) override; private: - CensusContext CreateCensusContextForCallAttempt(); + experimental::CensusContext CreateCensusContextForCallAttempt(); const grpc_call_context_element* call_context_; // Client method. grpc_core::Slice path_; absl::string_view method_; - CensusContext context_; + experimental::CensusContext context_; grpc_core::Arena* arena_; bool tracing_enabled_; grpc_core::Mutex mu_; diff --git a/src/cpp/ext/filters/census/server_filter.h b/src/cpp/ext/filters/census/server_filter.h index 1c35f0c29a5c0..84b80f996bf61 100644 --- a/src/cpp/ext/filters/census/server_filter.h +++ b/src/cpp/ext/filters/census/server_filter.h @@ -83,7 +83,7 @@ class CensusServerCallData : public CallData { static void OnDoneRecvMessageCb(void* user_data, grpc_error_handle error); private: - CensusContext context_; + experimental::CensusContext context_; // server method absl::string_view method_; std::string qualified_method_; diff --git a/src/cpp/ext/filters/census/views.cc b/src/cpp/ext/filters/census/views.cc index 9728c3ac192bd..4b5b793c23d60 100644 --- a/src/cpp/ext/filters/census/views.cc +++ b/src/cpp/ext/filters/census/views.cc @@ -72,28 +72,30 @@ ViewDescriptor HourDescriptor() { } // namespace void RegisterOpenCensusViewsForExport() { - ClientSentMessagesPerRpcCumulative().RegisterForExport(); - ClientSentBytesPerRpcCumulative().RegisterForExport(); - ClientReceivedMessagesPerRpcCumulative().RegisterForExport(); - ClientReceivedBytesPerRpcCumulative().RegisterForExport(); - ClientRoundtripLatencyCumulative().RegisterForExport(); - ClientServerLatencyCumulative().RegisterForExport(); + experimental::ClientSentMessagesPerRpcCumulative().RegisterForExport(); + experimental::ClientSentBytesPerRpcCumulative().RegisterForExport(); + experimental::ClientReceivedMessagesPerRpcCumulative().RegisterForExport(); + experimental::ClientReceivedBytesPerRpcCumulative().RegisterForExport(); + experimental::ClientRoundtripLatencyCumulative().RegisterForExport(); + experimental::ClientServerLatencyCumulative().RegisterForExport(); - ServerSentMessagesPerRpcCumulative().RegisterForExport(); - ServerSentBytesPerRpcCumulative().RegisterForExport(); - ServerReceivedMessagesPerRpcCumulative().RegisterForExport(); - ServerReceivedBytesPerRpcCumulative().RegisterForExport(); - ServerServerLatencyCumulative().RegisterForExport(); + experimental::ServerSentMessagesPerRpcCumulative().RegisterForExport(); + experimental::ServerSentBytesPerRpcCumulative().RegisterForExport(); + experimental::ServerReceivedMessagesPerRpcCumulative().RegisterForExport(); + experimental::ServerReceivedBytesPerRpcCumulative().RegisterForExport(); + experimental::ServerServerLatencyCumulative().RegisterForExport(); } +namespace experimental { + // client cumulative const ViewDescriptor& ClientSentBytesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/sent_bytes_per_rpc/cumulative") - .set_measure(kRpcClientSentBytesPerRpcMeasureName) + .set_measure(experimental::kRpcClientSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -101,9 +103,9 @@ const ViewDescriptor& ClientReceivedBytesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/received_bytes_per_rpc/cumulative") - .set_measure(kRpcClientReceivedBytesPerRpcMeasureName) + .set_measure(experimental::kRpcClientReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -111,9 +113,9 @@ const ViewDescriptor& ClientRoundtripLatencyCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/roundtrip_latency/cumulative") - .set_measure(kRpcClientRoundtripLatencyMeasureName) + .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -121,9 +123,9 @@ const ViewDescriptor& ClientServerLatencyCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/server_latency/cumulative") - .set_measure(kRpcClientServerLatencyMeasureName) + .set_measure(experimental::kRpcClientServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -131,9 +133,9 @@ const ViewDescriptor& ClientStartedRpcsCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/started_rpcs/cumulative") - .set_measure(kRpcClientStartedRpcsMeasureName) + .set_measure(experimental::kRpcClientStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -141,10 +143,10 @@ const ViewDescriptor& ClientCompletedRpcsCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/completed_rpcs/cumulative") - .set_measure(kRpcClientRoundtripLatencyMeasureName) + .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ClientMethodTagKey()) - .add_column(ClientStatusTagKey()); + .add_column(experimental::ClientMethodTagKey()) + .add_column(experimental::ClientStatusTagKey()); return descriptor; } @@ -152,9 +154,9 @@ const ViewDescriptor& ClientSentMessagesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/received_messages_per_rpc/cumulative") - .set_measure(kRpcClientSentMessagesPerRpcMeasureName) + .set_measure(experimental::kRpcClientSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -162,9 +164,10 @@ const ViewDescriptor& ClientReceivedMessagesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/sent_messages_per_rpc/cumulative") - .set_measure(kRpcClientReceivedMessagesPerRpcMeasureName) + .set_measure( + experimental::kRpcClientReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -172,9 +175,9 @@ const ViewDescriptor& ClientRetriesPerCallCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/retries_per_call/cumulative") - .set_measure(kRpcClientRetriesPerCallMeasureName) + .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -182,9 +185,9 @@ const ViewDescriptor& ClientRetriesCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/retries/cumulative") - .set_measure(kRpcClientRetriesPerCallMeasureName) + .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -192,9 +195,10 @@ const ViewDescriptor& ClientTransparentRetriesPerCallCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/transparent_retries_per_call/cumulative") - .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure( + experimental::kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -202,9 +206,10 @@ const ViewDescriptor& ClientTransparentRetriesCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/transparent_retries/cumulative") - .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure( + experimental::kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -212,9 +217,9 @@ const ViewDescriptor& ClientRetryDelayPerCallCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/retry_delay_per_call/cumulative") - .set_measure(kRpcClientRetryDelayPerCallMeasureName) + .set_measure(experimental::kRpcClientRetryDelayPerCallMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -223,9 +228,9 @@ const ViewDescriptor& ServerSentBytesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/received_bytes_per_rpc/cumulative") - .set_measure(kRpcServerSentBytesPerRpcMeasureName) + .set_measure(experimental::kRpcServerSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -233,9 +238,9 @@ const ViewDescriptor& ServerReceivedBytesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/sent_bytes_per_rpc/cumulative") - .set_measure(kRpcServerReceivedBytesPerRpcMeasureName) + .set_measure(experimental::kRpcServerReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -243,9 +248,9 @@ const ViewDescriptor& ServerServerLatencyCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/elapsed_time/cumulative") - .set_measure(kRpcServerServerLatencyMeasureName) + .set_measure(experimental::kRpcServerServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -253,9 +258,9 @@ const ViewDescriptor& ServerStartedRpcsCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/started_rpcs/cumulative") - .set_measure(kRpcServerStartedRpcsMeasureName) + .set_measure(experimental::kRpcServerStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -263,10 +268,10 @@ const ViewDescriptor& ServerCompletedRpcsCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/completed_rpcs/cumulative") - .set_measure(kRpcServerServerLatencyMeasureName) + .set_measure(experimental::kRpcServerServerLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ServerMethodTagKey()) - .add_column(ServerStatusTagKey()); + .add_column(experimental::ServerMethodTagKey()) + .add_column(experimental::ServerStatusTagKey()); return descriptor; } @@ -274,9 +279,9 @@ const ViewDescriptor& ServerSentMessagesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/received_messages_per_rpc/cumulative") - .set_measure(kRpcServerSentMessagesPerRpcMeasureName) + .set_measure(experimental::kRpcServerSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -284,9 +289,10 @@ const ViewDescriptor& ServerReceivedMessagesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/sent_messages_per_rpc/cumulative") - .set_measure(kRpcServerReceivedMessagesPerRpcMeasureName) + .set_measure( + experimental::kRpcServerReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -295,9 +301,9 @@ const ViewDescriptor& ClientSentBytesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/sent_bytes_per_rpc/minute") - .set_measure(kRpcClientSentBytesPerRpcMeasureName) + .set_measure(experimental::kRpcClientSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -305,9 +311,9 @@ const ViewDescriptor& ClientReceivedBytesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/received_bytes_per_rpc/minute") - .set_measure(kRpcClientReceivedBytesPerRpcMeasureName) + .set_measure(experimental::kRpcClientReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -315,9 +321,9 @@ const ViewDescriptor& ClientRoundtripLatencyMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/roundtrip_latency/minute") - .set_measure(kRpcClientRoundtripLatencyMeasureName) + .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -325,9 +331,9 @@ const ViewDescriptor& ClientServerLatencyMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/server_latency/minute") - .set_measure(kRpcClientServerLatencyMeasureName) + .set_measure(experimental::kRpcClientServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -335,9 +341,9 @@ const ViewDescriptor& ClientStartedRpcsMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/started_rpcs/minute") - .set_measure(kRpcClientStartedRpcsMeasureName) + .set_measure(experimental::kRpcClientStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -345,10 +351,10 @@ const ViewDescriptor& ClientCompletedRpcsMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/completed_rpcs/minute") - .set_measure(kRpcClientRoundtripLatencyMeasureName) + .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ClientMethodTagKey()) - .add_column(ClientStatusTagKey()); + .add_column(experimental::ClientMethodTagKey()) + .add_column(experimental::ClientStatusTagKey()); return descriptor; } @@ -356,9 +362,9 @@ const ViewDescriptor& ClientSentMessagesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/sent_messages_per_rpc/minute") - .set_measure(kRpcClientSentMessagesPerRpcMeasureName) + .set_measure(experimental::kRpcClientSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -366,9 +372,10 @@ const ViewDescriptor& ClientReceivedMessagesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/received_messages_per_rpc/minute") - .set_measure(kRpcClientReceivedMessagesPerRpcMeasureName) + .set_measure( + experimental::kRpcClientReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -376,9 +383,9 @@ const ViewDescriptor& ClientRetriesPerCallMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/retries_per_call/minute") - .set_measure(kRpcClientRetriesPerCallMeasureName) + .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -386,9 +393,9 @@ const ViewDescriptor& ClientRetriesMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/retries/minute") - .set_measure(kRpcClientRetriesPerCallMeasureName) + .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -396,9 +403,10 @@ const ViewDescriptor& ClientTransparentRetriesPerCallMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/transparent_retries_per_call/minute") - .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure( + experimental::kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -406,9 +414,10 @@ const ViewDescriptor& ClientTransparentRetriesMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/transparent_retries/minute") - .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure( + experimental::kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -416,9 +425,9 @@ const ViewDescriptor& ClientRetryDelayPerCallMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/retry_delay_per_call/minute") - .set_measure(kRpcClientRetryDelayPerCallMeasureName) + .set_measure(experimental::kRpcClientRetryDelayPerCallMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -427,9 +436,9 @@ const ViewDescriptor& ServerSentBytesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/sent_bytes_per_rpc/minute") - .set_measure(kRpcServerSentBytesPerRpcMeasureName) + .set_measure(experimental::kRpcServerSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -437,9 +446,9 @@ const ViewDescriptor& ServerReceivedBytesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/received_bytes_per_rpc/minute") - .set_measure(kRpcServerReceivedBytesPerRpcMeasureName) + .set_measure(experimental::kRpcServerReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -447,9 +456,9 @@ const ViewDescriptor& ServerServerLatencyMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/server_latency/minute") - .set_measure(kRpcServerServerLatencyMeasureName) + .set_measure(experimental::kRpcServerServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -457,9 +466,9 @@ const ViewDescriptor& ServerStartedRpcsMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/started_rpcs/minute") - .set_measure(kRpcServerStartedRpcsMeasureName) + .set_measure(experimental::kRpcServerStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -467,10 +476,10 @@ const ViewDescriptor& ServerCompletedRpcsMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/completed_rpcs/minute") - .set_measure(kRpcServerServerLatencyMeasureName) + .set_measure(experimental::kRpcServerServerLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ServerMethodTagKey()) - .add_column(ServerStatusTagKey()); + .add_column(experimental::ServerMethodTagKey()) + .add_column(experimental::ServerStatusTagKey()); return descriptor; } @@ -478,9 +487,9 @@ const ViewDescriptor& ServerSentMessagesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/sent_messages_per_rpc/minute") - .set_measure(kRpcServerSentMessagesPerRpcMeasureName) + .set_measure(experimental::kRpcServerSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -488,9 +497,10 @@ const ViewDescriptor& ServerReceivedMessagesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/received_messages_per_rpc/minute") - .set_measure(kRpcServerReceivedMessagesPerRpcMeasureName) + .set_measure( + experimental::kRpcServerReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -499,9 +509,9 @@ const ViewDescriptor& ClientSentBytesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/sent_bytes_per_rpc/hour") - .set_measure(kRpcClientSentBytesPerRpcMeasureName) + .set_measure(experimental::kRpcClientSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -509,9 +519,9 @@ const ViewDescriptor& ClientReceivedBytesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/received_bytes_per_rpc/hour") - .set_measure(kRpcClientReceivedBytesPerRpcMeasureName) + .set_measure(experimental::kRpcClientReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -519,9 +529,9 @@ const ViewDescriptor& ClientRoundtripLatencyHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/roundtrip_latency/hour") - .set_measure(kRpcClientRoundtripLatencyMeasureName) + .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -529,9 +539,9 @@ const ViewDescriptor& ClientServerLatencyHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/server_latency/hour") - .set_measure(kRpcClientServerLatencyMeasureName) + .set_measure(experimental::kRpcClientServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -539,9 +549,9 @@ const ViewDescriptor& ClientStartedRpcsHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/started_rpcs/hour") - .set_measure(kRpcClientStartedRpcsMeasureName) + .set_measure(experimental::kRpcClientStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -549,10 +559,10 @@ const ViewDescriptor& ClientCompletedRpcsHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/completed_rpcs/hour") - .set_measure(kRpcClientRoundtripLatencyMeasureName) + .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ClientMethodTagKey()) - .add_column(ClientStatusTagKey()); + .add_column(experimental::ClientMethodTagKey()) + .add_column(experimental::ClientStatusTagKey()); return descriptor; } @@ -560,9 +570,9 @@ const ViewDescriptor& ClientSentMessagesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/sent_messages_per_rpc/hour") - .set_measure(kRpcClientSentMessagesPerRpcMeasureName) + .set_measure(experimental::kRpcClientSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -570,9 +580,10 @@ const ViewDescriptor& ClientReceivedMessagesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/received_messages_per_rpc/hour") - .set_measure(kRpcClientReceivedMessagesPerRpcMeasureName) + .set_measure( + experimental::kRpcClientReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -580,9 +591,9 @@ const ViewDescriptor& ClientRetriesPerCallHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/retries_per_call/hour") - .set_measure(kRpcClientRetriesPerCallMeasureName) + .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -590,9 +601,9 @@ const ViewDescriptor& ClientRetriesHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/retries/hour") - .set_measure(kRpcClientRetriesPerCallMeasureName) + .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -600,9 +611,10 @@ const ViewDescriptor& ClientTransparentRetriesPerCallHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/transparent_retries_per_call/hour") - .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure( + experimental::kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -610,9 +622,10 @@ const ViewDescriptor& ClientTransparentRetriesHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/transparent_retries/hour") - .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure( + experimental::kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -620,9 +633,9 @@ const ViewDescriptor& ClientRetryDelayPerCallHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/retry_delay_per_call/hour") - .set_measure(kRpcClientRetryDelayPerCallMeasureName) + .set_measure(experimental::kRpcClientRetryDelayPerCallMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -631,9 +644,9 @@ const ViewDescriptor& ServerSentBytesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/sent_bytes_per_rpc/hour") - .set_measure(kRpcServerSentBytesPerRpcMeasureName) + .set_measure(experimental::kRpcServerSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -641,9 +654,9 @@ const ViewDescriptor& ServerReceivedBytesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/received_bytes_per_rpc/hour") - .set_measure(kRpcServerReceivedBytesPerRpcMeasureName) + .set_measure(experimental::kRpcServerReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -651,9 +664,9 @@ const ViewDescriptor& ServerServerLatencyHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/server_latency/hour") - .set_measure(kRpcServerServerLatencyMeasureName) + .set_measure(experimental::kRpcServerServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -661,9 +674,9 @@ const ViewDescriptor& ServerStartedRpcsHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/started_rpcs/hour") - .set_measure(kRpcServerStartedRpcsMeasureName) + .set_measure(experimental::kRpcServerStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ClientMethodTagKey()); + .add_column(experimental::ClientMethodTagKey()); return descriptor; } @@ -671,10 +684,10 @@ const ViewDescriptor& ServerCompletedRpcsHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/completed_rpcs/hour") - .set_measure(kRpcServerServerLatencyMeasureName) + .set_measure(experimental::kRpcServerServerLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(ServerMethodTagKey()) - .add_column(ServerStatusTagKey()); + .add_column(experimental::ServerMethodTagKey()) + .add_column(experimental::ServerStatusTagKey()); return descriptor; } @@ -682,9 +695,9 @@ const ViewDescriptor& ServerSentMessagesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/sent_messages_per_rpc/hour") - .set_measure(kRpcServerSentMessagesPerRpcMeasureName) + .set_measure(experimental::kRpcServerSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } @@ -692,10 +705,13 @@ const ViewDescriptor& ServerReceivedMessagesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/received_messages_per_rpc/hour") - .set_measure(kRpcServerReceivedMessagesPerRpcMeasureName) + .set_measure( + experimental::kRpcServerReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(ServerMethodTagKey()); + .add_column(experimental::ServerMethodTagKey()); return descriptor; } +} // namespace experimental + } // namespace grpc From c605805c7e56b78ac116dde3e038c650b794a33f Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 17 Oct 2022 21:31:21 +0000 Subject: [PATCH 5/8] Formatting --- src/cpp/ext/filters/census/grpc_plugin.h | 16 +- src/cpp/ext/filters/census/views.cc | 264 +++++++++++------------ 2 files changed, 134 insertions(+), 146 deletions(-) diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h index 4e516800fa679..d3e0982b66350 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.h +++ b/src/cpp/ext/filters/census/grpc_plugin.h @@ -25,14 +25,6 @@ namespace grpc { -// Enables/Disables OpenCensus stats/tracing. It's only safe to do at the start -// of a program, before any channels/servers are built. -void EnableOpenCensusStats(bool enable); -void EnableOpenCensusTracing(bool enable); -// Gets the current status of OpenCensus stats/tracing -bool OpenCensusStatsEnabled(); -bool OpenCensusTracingEnabled(); - // The tag keys set when recording RPC stats. using experimental::ClientMethodTagKey; using experimental::ClientStatusTagKey; @@ -128,6 +120,14 @@ using experimental::ServerServerLatencyHour; using experimental::ServerStartedCountHour; using experimental::ServerStartedRpcsHour; +// Enables/Disables OpenCensus stats/tracing. It's only safe to do at the start +// of a program, before any channels/servers are built. +void EnableOpenCensusStats(bool enable); +void EnableOpenCensusTracing(bool enable); +// Gets the current status of OpenCensus stats/tracing +bool OpenCensusStatsEnabled(); +bool OpenCensusTracingEnabled(); + } // namespace grpc #endif /* GRPC_INTERNAL_CPP_EXT_FILTERS_CENSUS_GRPC_PLUGIN_H */ diff --git a/src/cpp/ext/filters/census/views.cc b/src/cpp/ext/filters/census/views.cc index 4b5b793c23d60..1dd20321dd9e3 100644 --- a/src/cpp/ext/filters/census/views.cc +++ b/src/cpp/ext/filters/census/views.cc @@ -93,9 +93,9 @@ const ViewDescriptor& ClientSentBytesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/sent_bytes_per_rpc/cumulative") - .set_measure(experimental::kRpcClientSentBytesPerRpcMeasureName) + .set_measure(kRpcClientSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -103,9 +103,9 @@ const ViewDescriptor& ClientReceivedBytesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/received_bytes_per_rpc/cumulative") - .set_measure(experimental::kRpcClientReceivedBytesPerRpcMeasureName) + .set_measure(kRpcClientReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -113,9 +113,9 @@ const ViewDescriptor& ClientRoundtripLatencyCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/roundtrip_latency/cumulative") - .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) + .set_measure(kRpcClientRoundtripLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -123,9 +123,9 @@ const ViewDescriptor& ClientServerLatencyCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/server_latency/cumulative") - .set_measure(experimental::kRpcClientServerLatencyMeasureName) + .set_measure(kRpcClientServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -133,9 +133,9 @@ const ViewDescriptor& ClientStartedRpcsCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/started_rpcs/cumulative") - .set_measure(experimental::kRpcClientStartedRpcsMeasureName) + .set_measure(kRpcClientStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -143,10 +143,10 @@ const ViewDescriptor& ClientCompletedRpcsCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/completed_rpcs/cumulative") - .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) + .set_measure(kRpcClientRoundtripLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ClientMethodTagKey()) - .add_column(experimental::ClientStatusTagKey()); + .add_column(ClientMethodTagKey()) + .add_column(ClientStatusTagKey()); return descriptor; } @@ -154,9 +154,9 @@ const ViewDescriptor& ClientSentMessagesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/received_messages_per_rpc/cumulative") - .set_measure(experimental::kRpcClientSentMessagesPerRpcMeasureName) + .set_measure(kRpcClientSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -164,10 +164,9 @@ const ViewDescriptor& ClientReceivedMessagesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/sent_messages_per_rpc/cumulative") - .set_measure( - experimental::kRpcClientReceivedMessagesPerRpcMeasureName) + .set_measure(kRpcClientReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -175,9 +174,9 @@ const ViewDescriptor& ClientRetriesPerCallCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/retries_per_call/cumulative") - .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) + .set_measure(kRpcClientRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -185,9 +184,9 @@ const ViewDescriptor& ClientRetriesCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/retries/cumulative") - .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) + .set_measure(kRpcClientRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -195,10 +194,9 @@ const ViewDescriptor& ClientTransparentRetriesPerCallCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/transparent_retries_per_call/cumulative") - .set_measure( - experimental::kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -206,10 +204,9 @@ const ViewDescriptor& ClientTransparentRetriesCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/transparent_retries/cumulative") - .set_measure( - experimental::kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -217,9 +214,9 @@ const ViewDescriptor& ClientRetryDelayPerCallCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/client/retry_delay_per_call/cumulative") - .set_measure(experimental::kRpcClientRetryDelayPerCallMeasureName) + .set_measure(kRpcClientRetryDelayPerCallMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -228,9 +225,9 @@ const ViewDescriptor& ServerSentBytesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/received_bytes_per_rpc/cumulative") - .set_measure(experimental::kRpcServerSentBytesPerRpcMeasureName) + .set_measure(kRpcServerSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -238,9 +235,9 @@ const ViewDescriptor& ServerReceivedBytesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/sent_bytes_per_rpc/cumulative") - .set_measure(experimental::kRpcServerReceivedBytesPerRpcMeasureName) + .set_measure(kRpcServerReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -248,9 +245,9 @@ const ViewDescriptor& ServerServerLatencyCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/elapsed_time/cumulative") - .set_measure(experimental::kRpcServerServerLatencyMeasureName) + .set_measure(kRpcServerServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -258,9 +255,9 @@ const ViewDescriptor& ServerStartedRpcsCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/started_rpcs/cumulative") - .set_measure(experimental::kRpcServerStartedRpcsMeasureName) + .set_measure(kRpcServerStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -268,10 +265,10 @@ const ViewDescriptor& ServerCompletedRpcsCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/completed_rpcs/cumulative") - .set_measure(experimental::kRpcServerServerLatencyMeasureName) + .set_measure(kRpcServerServerLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ServerMethodTagKey()) - .add_column(experimental::ServerStatusTagKey()); + .add_column(ServerMethodTagKey()) + .add_column(ServerStatusTagKey()); return descriptor; } @@ -279,9 +276,9 @@ const ViewDescriptor& ServerSentMessagesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/received_messages_per_rpc/cumulative") - .set_measure(experimental::kRpcServerSentMessagesPerRpcMeasureName) + .set_measure(kRpcServerSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -289,10 +286,9 @@ const ViewDescriptor& ServerReceivedMessagesPerRpcCumulative() { const static ViewDescriptor descriptor = ViewDescriptor() .set_name("grpc.io/server/sent_messages_per_rpc/cumulative") - .set_measure( - experimental::kRpcServerReceivedMessagesPerRpcMeasureName) + .set_measure(kRpcServerReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -301,9 +297,9 @@ const ViewDescriptor& ClientSentBytesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/sent_bytes_per_rpc/minute") - .set_measure(experimental::kRpcClientSentBytesPerRpcMeasureName) + .set_measure(kRpcClientSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -311,9 +307,9 @@ const ViewDescriptor& ClientReceivedBytesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/received_bytes_per_rpc/minute") - .set_measure(experimental::kRpcClientReceivedBytesPerRpcMeasureName) + .set_measure(kRpcClientReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -321,9 +317,9 @@ const ViewDescriptor& ClientRoundtripLatencyMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/roundtrip_latency/minute") - .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) + .set_measure(kRpcClientRoundtripLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -331,9 +327,9 @@ const ViewDescriptor& ClientServerLatencyMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/server_latency/minute") - .set_measure(experimental::kRpcClientServerLatencyMeasureName) + .set_measure(kRpcClientServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -341,9 +337,9 @@ const ViewDescriptor& ClientStartedRpcsMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/started_rpcs/minute") - .set_measure(experimental::kRpcClientStartedRpcsMeasureName) + .set_measure(kRpcClientStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -351,10 +347,10 @@ const ViewDescriptor& ClientCompletedRpcsMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/completed_rpcs/minute") - .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) + .set_measure(kRpcClientRoundtripLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ClientMethodTagKey()) - .add_column(experimental::ClientStatusTagKey()); + .add_column(ClientMethodTagKey()) + .add_column(ClientStatusTagKey()); return descriptor; } @@ -362,9 +358,9 @@ const ViewDescriptor& ClientSentMessagesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/sent_messages_per_rpc/minute") - .set_measure(experimental::kRpcClientSentMessagesPerRpcMeasureName) + .set_measure(kRpcClientSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -372,10 +368,9 @@ const ViewDescriptor& ClientReceivedMessagesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/received_messages_per_rpc/minute") - .set_measure( - experimental::kRpcClientReceivedMessagesPerRpcMeasureName) + .set_measure(kRpcClientReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -383,9 +378,9 @@ const ViewDescriptor& ClientRetriesPerCallMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/retries_per_call/minute") - .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) + .set_measure(kRpcClientRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -393,9 +388,9 @@ const ViewDescriptor& ClientRetriesMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/retries/minute") - .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) + .set_measure(kRpcClientRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -403,10 +398,9 @@ const ViewDescriptor& ClientTransparentRetriesPerCallMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/transparent_retries_per_call/minute") - .set_measure( - experimental::kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -414,10 +408,9 @@ const ViewDescriptor& ClientTransparentRetriesMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/transparent_retries/minute") - .set_measure( - experimental::kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -425,9 +418,9 @@ const ViewDescriptor& ClientRetryDelayPerCallMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/client/retry_delay_per_call/minute") - .set_measure(experimental::kRpcClientRetryDelayPerCallMeasureName) + .set_measure(kRpcClientRetryDelayPerCallMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -436,9 +429,9 @@ const ViewDescriptor& ServerSentBytesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/sent_bytes_per_rpc/minute") - .set_measure(experimental::kRpcServerSentBytesPerRpcMeasureName) + .set_measure(kRpcServerSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -446,9 +439,9 @@ const ViewDescriptor& ServerReceivedBytesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/received_bytes_per_rpc/minute") - .set_measure(experimental::kRpcServerReceivedBytesPerRpcMeasureName) + .set_measure(kRpcServerReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -456,9 +449,9 @@ const ViewDescriptor& ServerServerLatencyMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/server_latency/minute") - .set_measure(experimental::kRpcServerServerLatencyMeasureName) + .set_measure(kRpcServerServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -466,9 +459,9 @@ const ViewDescriptor& ServerStartedRpcsMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/started_rpcs/minute") - .set_measure(experimental::kRpcServerStartedRpcsMeasureName) + .set_measure(kRpcServerStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -476,10 +469,10 @@ const ViewDescriptor& ServerCompletedRpcsMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/completed_rpcs/minute") - .set_measure(experimental::kRpcServerServerLatencyMeasureName) + .set_measure(kRpcServerServerLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ServerMethodTagKey()) - .add_column(experimental::ServerStatusTagKey()); + .add_column(ServerMethodTagKey()) + .add_column(ServerStatusTagKey()); return descriptor; } @@ -487,9 +480,9 @@ const ViewDescriptor& ServerSentMessagesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/sent_messages_per_rpc/minute") - .set_measure(experimental::kRpcServerSentMessagesPerRpcMeasureName) + .set_measure(kRpcServerSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -497,10 +490,9 @@ const ViewDescriptor& ServerReceivedMessagesPerRpcMinute() { const static ViewDescriptor descriptor = MinuteDescriptor() .set_name("grpc.io/server/received_messages_per_rpc/minute") - .set_measure( - experimental::kRpcServerReceivedMessagesPerRpcMeasureName) + .set_measure(kRpcServerReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -509,9 +501,9 @@ const ViewDescriptor& ClientSentBytesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/sent_bytes_per_rpc/hour") - .set_measure(experimental::kRpcClientSentBytesPerRpcMeasureName) + .set_measure(kRpcClientSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -519,9 +511,9 @@ const ViewDescriptor& ClientReceivedBytesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/received_bytes_per_rpc/hour") - .set_measure(experimental::kRpcClientReceivedBytesPerRpcMeasureName) + .set_measure(kRpcClientReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -529,9 +521,9 @@ const ViewDescriptor& ClientRoundtripLatencyHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/roundtrip_latency/hour") - .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) + .set_measure(kRpcClientRoundtripLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -539,9 +531,9 @@ const ViewDescriptor& ClientServerLatencyHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/server_latency/hour") - .set_measure(experimental::kRpcClientServerLatencyMeasureName) + .set_measure(kRpcClientServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -549,9 +541,9 @@ const ViewDescriptor& ClientStartedRpcsHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/started_rpcs/hour") - .set_measure(experimental::kRpcClientStartedRpcsMeasureName) + .set_measure(kRpcClientStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -559,10 +551,10 @@ const ViewDescriptor& ClientCompletedRpcsHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/completed_rpcs/hour") - .set_measure(experimental::kRpcClientRoundtripLatencyMeasureName) + .set_measure(kRpcClientRoundtripLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ClientMethodTagKey()) - .add_column(experimental::ClientStatusTagKey()); + .add_column(ClientMethodTagKey()) + .add_column(ClientStatusTagKey()); return descriptor; } @@ -570,9 +562,9 @@ const ViewDescriptor& ClientSentMessagesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/sent_messages_per_rpc/hour") - .set_measure(experimental::kRpcClientSentMessagesPerRpcMeasureName) + .set_measure(kRpcClientSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -580,10 +572,9 @@ const ViewDescriptor& ClientReceivedMessagesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/received_messages_per_rpc/hour") - .set_measure( - experimental::kRpcClientReceivedMessagesPerRpcMeasureName) + .set_measure(kRpcClientReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -591,9 +582,9 @@ const ViewDescriptor& ClientRetriesPerCallHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/retries_per_call/hour") - .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) + .set_measure(kRpcClientRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -601,9 +592,9 @@ const ViewDescriptor& ClientRetriesHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/retries/hour") - .set_measure(experimental::kRpcClientRetriesPerCallMeasureName) + .set_measure(kRpcClientRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -611,10 +602,9 @@ const ViewDescriptor& ClientTransparentRetriesPerCallHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/transparent_retries_per_call/hour") - .set_measure( - experimental::kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -622,10 +612,9 @@ const ViewDescriptor& ClientTransparentRetriesHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/transparent_retries/hour") - .set_measure( - experimental::kRpcClientTransparentRetriesPerCallMeasureName) + .set_measure(kRpcClientTransparentRetriesPerCallMeasureName) .set_aggregation(Aggregation::Sum()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -633,9 +622,9 @@ const ViewDescriptor& ClientRetryDelayPerCallHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/client/retry_delay_per_call/hour") - .set_measure(experimental::kRpcClientRetryDelayPerCallMeasureName) + .set_measure(kRpcClientRetryDelayPerCallMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -644,9 +633,9 @@ const ViewDescriptor& ServerSentBytesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/sent_bytes_per_rpc/hour") - .set_measure(experimental::kRpcServerSentBytesPerRpcMeasureName) + .set_measure(kRpcServerSentBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -654,9 +643,9 @@ const ViewDescriptor& ServerReceivedBytesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/received_bytes_per_rpc/hour") - .set_measure(experimental::kRpcServerReceivedBytesPerRpcMeasureName) + .set_measure(kRpcServerReceivedBytesPerRpcMeasureName) .set_aggregation(BytesDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -664,9 +653,9 @@ const ViewDescriptor& ServerServerLatencyHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/server_latency/hour") - .set_measure(experimental::kRpcServerServerLatencyMeasureName) + .set_measure(kRpcServerServerLatencyMeasureName) .set_aggregation(MillisDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -674,9 +663,9 @@ const ViewDescriptor& ServerStartedRpcsHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/started_rpcs/hour") - .set_measure(experimental::kRpcServerStartedRpcsMeasureName) + .set_measure(kRpcServerStartedRpcsMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ClientMethodTagKey()); + .add_column(ClientMethodTagKey()); return descriptor; } @@ -684,10 +673,10 @@ const ViewDescriptor& ServerCompletedRpcsHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/completed_rpcs/hour") - .set_measure(experimental::kRpcServerServerLatencyMeasureName) + .set_measure(kRpcServerServerLatencyMeasureName) .set_aggregation(Aggregation::Count()) - .add_column(experimental::ServerMethodTagKey()) - .add_column(experimental::ServerStatusTagKey()); + .add_column(ServerMethodTagKey()) + .add_column(ServerStatusTagKey()); return descriptor; } @@ -695,9 +684,9 @@ const ViewDescriptor& ServerSentMessagesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/sent_messages_per_rpc/hour") - .set_measure(experimental::kRpcServerSentMessagesPerRpcMeasureName) + .set_measure(kRpcServerSentMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } @@ -705,10 +694,9 @@ const ViewDescriptor& ServerReceivedMessagesPerRpcHour() { const static ViewDescriptor descriptor = HourDescriptor() .set_name("grpc.io/server/received_messages_per_rpc/hour") - .set_measure( - experimental::kRpcServerReceivedMessagesPerRpcMeasureName) + .set_measure(kRpcServerReceivedMessagesPerRpcMeasureName) .set_aggregation(CountDistributionAggregation()) - .add_column(experimental::ServerMethodTagKey()); + .add_column(ServerMethodTagKey()); return descriptor; } From 01b03b4d75f0ba4e34708b85e6851c5a43be54ac Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 18 Oct 2022 01:20:01 +0000 Subject: [PATCH 6/8] clang tidy fixes --- include/grpcpp/opencensus.h | 2 - src/cpp/ext/filters/census/grpc_plugin.h | 184 +++++++++--------- .../census/stats_plugin_end2end_test.cc | 95 +++++++++ 3 files changed, 185 insertions(+), 96 deletions(-) diff --git a/include/grpcpp/opencensus.h b/include/grpcpp/opencensus.h index d01f5c5903bb5..d939b6fb01a65 100644 --- a/include/grpcpp/opencensus.h +++ b/include/grpcpp/opencensus.h @@ -95,7 +95,6 @@ const ::opencensus::stats::ViewDescriptor& ServerSentBytesPerRpcCumulative(); const ::opencensus::stats::ViewDescriptor& ServerReceivedBytesPerRpcCumulative(); const ::opencensus::stats::ViewDescriptor& ServerServerLatencyCumulative(); -const ::opencensus::stats::ViewDescriptor& ServerStartedCountCumulative(); const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsCumulative(); const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsCumulative(); const ::opencensus::stats::ViewDescriptor& ServerSentMessagesPerRpcCumulative(); @@ -145,7 +144,6 @@ const ::opencensus::stats::ViewDescriptor& ServerSentBytesPerRpcHour(); const ::opencensus::stats::ViewDescriptor& ServerReceivedMessagesPerRpcHour(); const ::opencensus::stats::ViewDescriptor& ServerReceivedBytesPerRpcHour(); const ::opencensus::stats::ViewDescriptor& ServerServerLatencyHour(); -const ::opencensus::stats::ViewDescriptor& ServerStartedCountHour(); const ::opencensus::stats::ViewDescriptor& ServerStartedRpcsHour(); const ::opencensus::stats::ViewDescriptor& ServerCompletedRpcsHour(); diff --git a/src/cpp/ext/filters/census/grpc_plugin.h b/src/cpp/ext/filters/census/grpc_plugin.h index d3e0982b66350..aab2897f10ef6 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.h +++ b/src/cpp/ext/filters/census/grpc_plugin.h @@ -25,100 +25,96 @@ namespace grpc { -// The tag keys set when recording RPC stats. -using experimental::ClientMethodTagKey; -using experimental::ClientStatusTagKey; -using experimental::ServerMethodTagKey; -using experimental::ServerStatusTagKey; - -// Names of measures used by the plugin--users can create views on these -// measures but should not record data for them. -using experimental::kRpcClientReceivedBytesPerRpcMeasureName; -using experimental::kRpcClientReceivedMessagesPerRpcMeasureName; -using experimental::kRpcClientRetriesPerCallMeasureName; -using experimental::kRpcClientRetryDelayPerCallMeasureName; -using experimental::kRpcClientRoundtripLatencyMeasureName; -using experimental::kRpcClientSentBytesPerRpcMeasureName; -using experimental::kRpcClientSentMessagesPerRpcMeasureName; -using experimental::kRpcClientServerLatencyMeasureName; -using experimental::kRpcClientStartedRpcsMeasureName; -using experimental::kRpcClientTransparentRetriesPerCallMeasureName; - -using experimental::kRpcServerReceivedBytesPerRpcMeasureName; -using experimental::kRpcServerReceivedMessagesPerRpcMeasureName; -using experimental::kRpcServerSentBytesPerRpcMeasureName; -using experimental::kRpcServerSentMessagesPerRpcMeasureName; -using experimental::kRpcServerServerLatencyMeasureName; -using experimental::kRpcServerStartedRpcsMeasureName; - -// Canonical gRPC view definitions. -using experimental::ClientCompletedRpcsCumulative; -using experimental::ClientReceivedBytesPerRpcCumulative; -using experimental::ClientReceivedMessagesPerRpcCumulative; -using experimental::ClientRetriesCumulative; -using experimental::ClientRetriesPerCallCumulative; -using experimental::ClientRetryDelayPerCallCumulative; -using experimental::ClientRoundtripLatencyCumulative; -using experimental::ClientSentBytesPerRpcCumulative; -using experimental::ClientSentMessagesPerRpcCumulative; -using experimental::ClientServerLatencyCumulative; -using experimental::ClientStartedRpcsCumulative; -using experimental::ClientTransparentRetriesCumulative; -using experimental::ClientTransparentRetriesPerCallCumulative; - -using experimental::ServerCompletedRpcsCumulative; -using experimental::ServerReceivedBytesPerRpcCumulative; -using experimental::ServerReceivedMessagesPerRpcCumulative; -using experimental::ServerSentBytesPerRpcCumulative; -using experimental::ServerSentMessagesPerRpcCumulative; -using experimental::ServerServerLatencyCumulative; -using experimental::ServerStartedCountCumulative; -using experimental::ServerStartedRpcsCumulative; - -using experimental::ClientCompletedRpcsMinute; -using experimental::ClientReceivedBytesPerRpcMinute; -using experimental::ClientReceivedMessagesPerRpcMinute; -using experimental::ClientRetriesMinute; -using experimental::ClientRetriesPerCallMinute; -using experimental::ClientRetryDelayPerCallMinute; -using experimental::ClientRoundtripLatencyMinute; -using experimental::ClientSentBytesPerRpcMinute; -using experimental::ClientSentMessagesPerRpcMinute; -using experimental::ClientServerLatencyMinute; -using experimental::ClientStartedRpcsMinute; -using experimental::ClientTransparentRetriesMinute; -using experimental::ClientTransparentRetriesPerCallMinute; - -using experimental::ServerCompletedRpcsMinute; -using experimental::ServerReceivedBytesPerRpcMinute; -using experimental::ServerReceivedMessagesPerRpcMinute; -using experimental::ServerSentBytesPerRpcMinute; -using experimental::ServerSentMessagesPerRpcMinute; -using experimental::ServerServerLatencyMinute; -using experimental::ServerStartedRpcsMinute; - -using experimental::ClientCompletedRpcsHour; -using experimental::ClientReceivedBytesPerRpcHour; -using experimental::ClientReceivedMessagesPerRpcHour; -using experimental::ClientRetriesHour; -using experimental::ClientRetriesPerCallHour; -using experimental::ClientRetryDelayPerCallHour; -using experimental::ClientRoundtripLatencyHour; -using experimental::ClientSentBytesPerRpcHour; -using experimental::ClientSentMessagesPerRpcHour; -using experimental::ClientServerLatencyHour; -using experimental::ClientStartedRpcsHour; -using experimental::ClientTransparentRetriesHour; -using experimental::ClientTransparentRetriesPerCallHour; - -using experimental::ServerCompletedRpcsHour; -using experimental::ServerReceivedBytesPerRpcHour; -using experimental::ServerReceivedMessagesPerRpcHour; -using experimental::ServerSentBytesPerRpcHour; -using experimental::ServerSentMessagesPerRpcHour; -using experimental::ServerServerLatencyHour; -using experimental::ServerStartedCountHour; -using experimental::ServerStartedRpcsHour; +// The following using declarations have been added to prevent breaking users +// that were directly using this header file. +using experimental::ClientMethodTagKey; // NOLINT +using experimental::ClientStatusTagKey; // NOLINT +using experimental::ServerMethodTagKey; // NOLINT +using experimental::ServerStatusTagKey; // NOLINT + +using experimental::kRpcClientReceivedBytesPerRpcMeasureName; // NOLINT +using experimental::kRpcClientReceivedMessagesPerRpcMeasureName; // NOLINT +using experimental::kRpcClientRetriesPerCallMeasureName; // NOLINT +using experimental::kRpcClientRetryDelayPerCallMeasureName; // NOLINT +using experimental::kRpcClientRoundtripLatencyMeasureName; // NOLINT +using experimental::kRpcClientSentBytesPerRpcMeasureName; // NOLINT +using experimental::kRpcClientSentMessagesPerRpcMeasureName; // NOLINT +using experimental::kRpcClientServerLatencyMeasureName; // NOLINT +using experimental::kRpcClientStartedRpcsMeasureName; // NOLINT +using experimental::kRpcClientTransparentRetriesPerCallMeasureName; // NOLINT + +using experimental::kRpcServerReceivedBytesPerRpcMeasureName; // NOLINT +using experimental::kRpcServerReceivedMessagesPerRpcMeasureName; // NOLINT +using experimental::kRpcServerSentBytesPerRpcMeasureName; // NOLINT +using experimental::kRpcServerSentMessagesPerRpcMeasureName; // NOLINT +using experimental::kRpcServerServerLatencyMeasureName; // NOLINT +using experimental::kRpcServerStartedRpcsMeasureName; // NOLINT + +using experimental::ClientCompletedRpcsCumulative; // NOLINT +using experimental::ClientReceivedBytesPerRpcCumulative; // NOLINT +using experimental::ClientReceivedMessagesPerRpcCumulative; // NOLINT +using experimental::ClientRetriesCumulative; // NOLINT +using experimental::ClientRetriesPerCallCumulative; // NOLINT +using experimental::ClientRetryDelayPerCallCumulative; // NOLINT +using experimental::ClientRoundtripLatencyCumulative; // NOLINT +using experimental::ClientSentBytesPerRpcCumulative; // NOLINT +using experimental::ClientSentMessagesPerRpcCumulative; // NOLINT +using experimental::ClientServerLatencyCumulative; // NOLINT +using experimental::ClientStartedRpcsCumulative; // NOLINT +using experimental::ClientTransparentRetriesCumulative; // NOLINT +using experimental::ClientTransparentRetriesPerCallCumulative; // NOLINT + +using experimental::ServerCompletedRpcsCumulative; // NOLINT +using experimental::ServerReceivedBytesPerRpcCumulative; // NOLINT +using experimental::ServerReceivedMessagesPerRpcCumulative; // NOLINT +using experimental::ServerSentBytesPerRpcCumulative; // NOLINT +using experimental::ServerSentMessagesPerRpcCumulative; // NOLINT +using experimental::ServerServerLatencyCumulative; // NOLINT +using experimental::ServerStartedRpcsCumulative; // NOLINT + +using experimental::ClientCompletedRpcsMinute; // NOLINT +using experimental::ClientReceivedBytesPerRpcMinute; // NOLINT +using experimental::ClientReceivedMessagesPerRpcMinute; // NOLINT +using experimental::ClientRetriesMinute; // NOLINT +using experimental::ClientRetriesPerCallMinute; // NOLINT +using experimental::ClientRetryDelayPerCallMinute; // NOLINT +using experimental::ClientRoundtripLatencyMinute; // NOLINT +using experimental::ClientSentBytesPerRpcMinute; // NOLINT +using experimental::ClientSentMessagesPerRpcMinute; // NOLINT +using experimental::ClientServerLatencyMinute; // NOLINT +using experimental::ClientStartedRpcsMinute; // NOLINT +using experimental::ClientTransparentRetriesMinute; // NOLINT +using experimental::ClientTransparentRetriesPerCallMinute; // NOLINT + +using experimental::ServerCompletedRpcsMinute; // NOLINT +using experimental::ServerReceivedBytesPerRpcMinute; // NOLINT +using experimental::ServerReceivedMessagesPerRpcMinute; // NOLINT +using experimental::ServerSentBytesPerRpcMinute; // NOLINT +using experimental::ServerSentMessagesPerRpcMinute; // NOLINT +using experimental::ServerServerLatencyMinute; // NOLINT +using experimental::ServerStartedRpcsMinute; // NOLINT + +using experimental::ClientCompletedRpcsHour; // NOLINT +using experimental::ClientReceivedBytesPerRpcHour; // NOLINT +using experimental::ClientReceivedMessagesPerRpcHour; // NOLINT +using experimental::ClientRetriesHour; // NOLINT +using experimental::ClientRetriesPerCallHour; // NOLINT +using experimental::ClientRetryDelayPerCallHour; // NOLINT +using experimental::ClientRoundtripLatencyHour; // NOLINT +using experimental::ClientSentBytesPerRpcHour; // NOLINT +using experimental::ClientSentMessagesPerRpcHour; // NOLINT +using experimental::ClientServerLatencyHour; // NOLINT +using experimental::ClientStartedRpcsHour; // NOLINT +using experimental::ClientTransparentRetriesHour; // NOLINT +using experimental::ClientTransparentRetriesPerCallHour; // NOLINT + +using experimental::ServerCompletedRpcsHour; // NOLINT +using experimental::ServerReceivedBytesPerRpcHour; // NOLINT +using experimental::ServerReceivedMessagesPerRpcHour; // NOLINT +using experimental::ServerSentBytesPerRpcHour; // NOLINT +using experimental::ServerSentMessagesPerRpcHour; // NOLINT +using experimental::ServerServerLatencyHour; // NOLINT +using experimental::ServerStartedRpcsHour; // NOLINT // Enables/Disables OpenCensus stats/tracing. It's only safe to do at the start // of a program, before any channels/servers are built. diff --git a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc index aa736e16ce723..a80b54313d707 100644 --- a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc +++ b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc @@ -847,6 +847,101 @@ TEST_F(StatsPluginEnd2EndTest, TestGlobalEnableOpenCensusTracing) { EnableOpenCensusTracing(true); } +TEST(StatsPluginDeclarationTest, Declarations) { + gpr_log(GPR_INFO, "%p", ClientMethodTagKey); + gpr_log(GPR_INFO, "%p", ClientStatusTagKey); + gpr_log(GPR_INFO, "%p", ServerMethodTagKey); + gpr_log(GPR_INFO, "%p", ServerStatusTagKey); + + // Names of measures used by the plugin--users can create views on these + // measures but should not record data for them. + gpr_log(GPR_INFO, "%p", kRpcClientReceivedBytesPerRpcMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcClientReceivedMessagesPerRpcMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcClientRetriesPerCallMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcClientRetryDelayPerCallMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcClientRoundtripLatencyMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcClientSentBytesPerRpcMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcClientSentMessagesPerRpcMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcClientServerLatencyMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcClientStartedRpcsMeasureName.data()); + gpr_log(GPR_INFO, "%p", + kRpcClientTransparentRetriesPerCallMeasureName.data()); + + gpr_log(GPR_INFO, "%p", kRpcServerReceivedBytesPerRpcMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcServerReceivedMessagesPerRpcMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcServerSentBytesPerRpcMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcServerSentMessagesPerRpcMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcServerServerLatencyMeasureName.data()); + gpr_log(GPR_INFO, "%p", kRpcServerStartedRpcsMeasureName.data()); + + // Canonical gRPC view definitions. + gpr_log(GPR_INFO, "%p", ClientCompletedRpcsCumulative); + gpr_log(GPR_INFO, "%p", ClientReceivedBytesPerRpcCumulative); + gpr_log(GPR_INFO, "%p", ClientReceivedMessagesPerRpcCumulative); + gpr_log(GPR_INFO, "%p", ClientRetriesCumulative); + gpr_log(GPR_INFO, "%p", ClientRetriesPerCallCumulative); + gpr_log(GPR_INFO, "%p", ClientRetryDelayPerCallCumulative); + gpr_log(GPR_INFO, "%p", ClientRoundtripLatencyCumulative); + gpr_log(GPR_INFO, "%p", ClientSentBytesPerRpcCumulative); + gpr_log(GPR_INFO, "%p", ClientSentMessagesPerRpcCumulative); + gpr_log(GPR_INFO, "%p", ClientServerLatencyCumulative); + gpr_log(GPR_INFO, "%p", ClientStartedRpcsCumulative); + gpr_log(GPR_INFO, "%p", ClientTransparentRetriesCumulative); + gpr_log(GPR_INFO, "%p", ClientTransparentRetriesPerCallCumulative); + + gpr_log(GPR_INFO, "%p", ServerCompletedRpcsCumulative); + gpr_log(GPR_INFO, "%p", ServerReceivedBytesPerRpcCumulative); + gpr_log(GPR_INFO, "%p", ServerReceivedMessagesPerRpcCumulative); + gpr_log(GPR_INFO, "%p", ServerSentBytesPerRpcCumulative); + gpr_log(GPR_INFO, "%p", ServerSentMessagesPerRpcCumulative); + gpr_log(GPR_INFO, "%p", ServerServerLatencyCumulative); + gpr_log(GPR_INFO, "%p", ServerStartedRpcsCumulative); + + gpr_log(GPR_INFO, "%p", ClientCompletedRpcsMinute); + gpr_log(GPR_INFO, "%p", ClientReceivedBytesPerRpcMinute); + gpr_log(GPR_INFO, "%p", ClientReceivedMessagesPerRpcMinute); + gpr_log(GPR_INFO, "%p", ClientRetriesMinute); + gpr_log(GPR_INFO, "%p", ClientRetriesPerCallMinute); + gpr_log(GPR_INFO, "%p", ClientRetryDelayPerCallMinute); + gpr_log(GPR_INFO, "%p", ClientRoundtripLatencyMinute); + gpr_log(GPR_INFO, "%p", ClientSentBytesPerRpcMinute); + gpr_log(GPR_INFO, "%p", ClientSentMessagesPerRpcMinute); + gpr_log(GPR_INFO, "%p", ClientServerLatencyMinute); + gpr_log(GPR_INFO, "%p", ClientStartedRpcsMinute); + gpr_log(GPR_INFO, "%p", ClientTransparentRetriesMinute); + gpr_log(GPR_INFO, "%p", ClientTransparentRetriesPerCallMinute); + + gpr_log(GPR_INFO, "%p", ServerCompletedRpcsMinute); + gpr_log(GPR_INFO, "%p", ServerReceivedBytesPerRpcMinute); + gpr_log(GPR_INFO, "%p", ServerReceivedMessagesPerRpcMinute); + gpr_log(GPR_INFO, "%p", ServerSentBytesPerRpcMinute); + gpr_log(GPR_INFO, "%p", ServerSentMessagesPerRpcMinute); + gpr_log(GPR_INFO, "%p", ServerServerLatencyMinute); + gpr_log(GPR_INFO, "%p", ServerStartedRpcsMinute); + + gpr_log(GPR_INFO, "%p", ClientCompletedRpcsHour); + gpr_log(GPR_INFO, "%p", ClientReceivedBytesPerRpcHour); + gpr_log(GPR_INFO, "%p", ClientReceivedMessagesPerRpcHour); + gpr_log(GPR_INFO, "%p", ClientRetriesHour); + gpr_log(GPR_INFO, "%p", ClientRetriesPerCallHour); + gpr_log(GPR_INFO, "%p", ClientRetryDelayPerCallHour); + gpr_log(GPR_INFO, "%p", ClientRoundtripLatencyHour); + gpr_log(GPR_INFO, "%p", ClientSentBytesPerRpcHour); + gpr_log(GPR_INFO, "%p", ClientSentMessagesPerRpcHour); + gpr_log(GPR_INFO, "%p", ClientServerLatencyHour); + gpr_log(GPR_INFO, "%p", ClientStartedRpcsHour); + gpr_log(GPR_INFO, "%p", ClientTransparentRetriesHour); + gpr_log(GPR_INFO, "%p", ClientTransparentRetriesPerCallHour); + + gpr_log(GPR_INFO, "%p", ServerCompletedRpcsHour); + gpr_log(GPR_INFO, "%p", ServerReceivedBytesPerRpcHour); + gpr_log(GPR_INFO, "%p", ServerReceivedMessagesPerRpcHour); + gpr_log(GPR_INFO, "%p", ServerSentBytesPerRpcHour); + gpr_log(GPR_INFO, "%p", ServerSentMessagesPerRpcHour); + gpr_log(GPR_INFO, "%p", ServerServerLatencyHour); + gpr_log(GPR_INFO, "%p", ServerStartedRpcsHour); +} + } // namespace } // namespace testing From 9bc0e4029d1981359b42ec9bd6736206db997b6f Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Tue, 18 Oct 2022 01:22:32 +0000 Subject: [PATCH 7/8] cleanup --- test/cpp/ext/filters/census/stats_plugin_end2end_test.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc index a80b54313d707..dc0b7ae8c6979 100644 --- a/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc +++ b/test/cpp/ext/filters/census/stats_plugin_end2end_test.cc @@ -847,14 +847,14 @@ TEST_F(StatsPluginEnd2EndTest, TestGlobalEnableOpenCensusTracing) { EnableOpenCensusTracing(true); } +// This test verifies that users depending on src/cpp/ext/filters/census header +// files can continue using the non-experimental names. TEST(StatsPluginDeclarationTest, Declarations) { gpr_log(GPR_INFO, "%p", ClientMethodTagKey); gpr_log(GPR_INFO, "%p", ClientStatusTagKey); gpr_log(GPR_INFO, "%p", ServerMethodTagKey); gpr_log(GPR_INFO, "%p", ServerStatusTagKey); - // Names of measures used by the plugin--users can create views on these - // measures but should not record data for them. gpr_log(GPR_INFO, "%p", kRpcClientReceivedBytesPerRpcMeasureName.data()); gpr_log(GPR_INFO, "%p", kRpcClientReceivedMessagesPerRpcMeasureName.data()); gpr_log(GPR_INFO, "%p", kRpcClientRetriesPerCallMeasureName.data()); @@ -874,7 +874,6 @@ TEST(StatsPluginDeclarationTest, Declarations) { gpr_log(GPR_INFO, "%p", kRpcServerServerLatencyMeasureName.data()); gpr_log(GPR_INFO, "%p", kRpcServerStartedRpcsMeasureName.data()); - // Canonical gRPC view definitions. gpr_log(GPR_INFO, "%p", ClientCompletedRpcsCumulative); gpr_log(GPR_INFO, "%p", ClientReceivedBytesPerRpcCumulative); gpr_log(GPR_INFO, "%p", ClientReceivedMessagesPerRpcCumulative); From 2a9aa6804168ec03d7f2d2c7c039dcf36a7d58fc Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Thu, 20 Oct 2022 20:22:18 +0000 Subject: [PATCH 8/8] Reviewer comments --- src/cpp/ext/filters/census/grpc_plugin.cc | 71 +++++++++++------------ 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/src/cpp/ext/filters/census/grpc_plugin.cc b/src/cpp/ext/filters/census/grpc_plugin.cc index fce236797e5a2..25afaf9306a81 100644 --- a/src/cpp/ext/filters/census/grpc_plugin.cc +++ b/src/cpp/ext/filters/census/grpc_plugin.cc @@ -80,28 +80,30 @@ ::opencensus::trace::Span GetSpanFromServerContext( ->Span(); } +namespace experimental { + // These measure definitions should be kept in sync across opencensus // implementations--see // https://github.com/census-instrumentation/opencensus-java/blob/master/contrib/grpc_metrics/src/main/java/io/opencensus/contrib/grpc/metrics/RpcMeasureConstants.java. -::opencensus::tags::TagKey experimental::ClientMethodTagKey() { +::opencensus::tags::TagKey ClientMethodTagKey() { static const auto method_tag_key = ::opencensus::tags::TagKey::Register("grpc_client_method"); return method_tag_key; } -::opencensus::tags::TagKey experimental::ClientStatusTagKey() { +::opencensus::tags::TagKey ClientStatusTagKey() { static const auto status_tag_key = ::opencensus::tags::TagKey::Register("grpc_client_status"); return status_tag_key; } -::opencensus::tags::TagKey experimental::ServerMethodTagKey() { +::opencensus::tags::TagKey ServerMethodTagKey() { static const auto method_tag_key = ::opencensus::tags::TagKey::Register("grpc_server_method"); return method_tag_key; } -::opencensus::tags::TagKey experimental::ServerStatusTagKey() { +::opencensus::tags::TagKey ServerStatusTagKey() { static const auto status_tag_key = ::opencensus::tags::TagKey::Register("grpc_server_status"); return status_tag_key; @@ -109,69 +111,62 @@ ::opencensus::tags::TagKey experimental::ServerStatusTagKey() { // Client ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientSentMessagesPerRpcMeasureName = + kRpcClientSentMessagesPerRpcMeasureName = "grpc.io/client/sent_messages_per_rpc"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientSentBytesPerRpcMeasureName = - "grpc.io/client/sent_bytes_per_rpc"; +ABSL_CONST_INIT const absl::string_view kRpcClientSentBytesPerRpcMeasureName = + "grpc.io/client/sent_bytes_per_rpc"; ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientReceivedMessagesPerRpcMeasureName = + kRpcClientReceivedMessagesPerRpcMeasureName = "grpc.io/client/received_messages_per_rpc"; ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientReceivedBytesPerRpcMeasureName = + kRpcClientReceivedBytesPerRpcMeasureName = "grpc.io/client/received_bytes_per_rpc"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientRoundtripLatencyMeasureName = - "grpc.io/client/roundtrip_latency"; +ABSL_CONST_INIT const absl::string_view kRpcClientRoundtripLatencyMeasureName = + "grpc.io/client/roundtrip_latency"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientServerLatencyMeasureName = - "grpc.io/client/server_latency"; +ABSL_CONST_INIT const absl::string_view kRpcClientServerLatencyMeasureName = + "grpc.io/client/server_latency"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientStartedRpcsMeasureName = - "grpc.io/client/started_rpcs"; +ABSL_CONST_INIT const absl::string_view kRpcClientStartedRpcsMeasureName = + "grpc.io/client/started_rpcs"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientRetriesPerCallMeasureName = - "grpc.io/client/retries_per_call"; +ABSL_CONST_INIT const absl::string_view kRpcClientRetriesPerCallMeasureName = + "grpc.io/client/retries_per_call"; ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientTransparentRetriesPerCallMeasureName = + kRpcClientTransparentRetriesPerCallMeasureName = "grpc.io/client/transparent_retries_per_call"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcClientRetryDelayPerCallMeasureName = - "grpc.io/client/retry_delay_per_call"; +ABSL_CONST_INIT const absl::string_view kRpcClientRetryDelayPerCallMeasureName = + "grpc.io/client/retry_delay_per_call"; // Server ABSL_CONST_INIT const absl::string_view - experimental::kRpcServerSentMessagesPerRpcMeasureName = + kRpcServerSentMessagesPerRpcMeasureName = "grpc.io/server/sent_messages_per_rpc"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcServerSentBytesPerRpcMeasureName = - "grpc.io/server/sent_bytes_per_rpc"; +ABSL_CONST_INIT const absl::string_view kRpcServerSentBytesPerRpcMeasureName = + "grpc.io/server/sent_bytes_per_rpc"; ABSL_CONST_INIT const absl::string_view - experimental::kRpcServerReceivedMessagesPerRpcMeasureName = + kRpcServerReceivedMessagesPerRpcMeasureName = "grpc.io/server/received_messages_per_rpc"; ABSL_CONST_INIT const absl::string_view - experimental::kRpcServerReceivedBytesPerRpcMeasureName = + kRpcServerReceivedBytesPerRpcMeasureName = "grpc.io/server/received_bytes_per_rpc"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcServerServerLatencyMeasureName = - "grpc.io/server/server_latency"; +ABSL_CONST_INIT const absl::string_view kRpcServerServerLatencyMeasureName = + "grpc.io/server/server_latency"; -ABSL_CONST_INIT const absl::string_view - experimental::kRpcServerStartedRpcsMeasureName = - "grpc.io/server/started_rpcs"; +ABSL_CONST_INIT const absl::string_view kRpcServerStartedRpcsMeasureName = + "grpc.io/server/started_rpcs"; + +} // namespace experimental std::atomic g_open_census_stats_enabled(true); std::atomic g_open_census_tracing_enabled(true);