Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace metric name functions with just string constants

Browse Source
pull/35348/head
Yash Tibrewal 1 year ago
parent e4324a712e
commit e32328825e
4 changed files with 143 additions and 157 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      include/grpcpp/ext/otel_plugin.h
  2. 181
      src/cpp/ext/otel/otel_plugin.cc
  3. 16
      test/cpp/ext/csm/metadata_exchange_test.cc
  4. 70
      test/cpp/ext/otel/otel_plugin_test.cc

33
include/grpcpp/ext/otel_plugin.h
Unescape View File

@ -37,20 +37,6 @@ class OpenTelemetryPluginBuilderImpl;
} // namespace internal } // namespace internal
namespace experimental { namespace experimental {
// Metrics
absl::string_view OpenTelemetryClientAttemptStartedInstrumentName();
absl::string_view OpenTelemetryClientAttemptStartedInstrumentName();
absl::string_view OpenTelemetryClientAttemptDurationInstrumentName();
absl::string_view
OpenTelemetryClientAttemptSentTotalCompressedMessageSizeInstrumentName();
absl::string_view
OpenTelemetryClientAttemptRcvdTotalCompressedMessageSizeInstrumentName();
absl::string_view OpenTelemetryServerCallStartedInstrumentName();
absl::string_view OpenTelemetryServerCallDurationInstrumentName();
absl::string_view
OpenTelemetryServerCallSentTotalCompressedMessageSizeInstrumentName();
absl::string_view
OpenTelemetryServerCallRcvdTotalCompressedMessageSizeInstrumentName();
/// The most common way to use this API is - /// The most common way to use this API is -
/// ///
@ -67,8 +53,27 @@ OpenTelemetryServerCallRcvdTotalCompressedMessageSizeInstrumentName();
/// grpc.server.call.rcvd_total_compressed_message_size /// grpc.server.call.rcvd_total_compressed_message_size
class OpenTelemetryPluginBuilder { class OpenTelemetryPluginBuilder {
public: public:
/// Metrics
static constexpr absl::string_view kClientAttemptStartedInstrumentName = static constexpr absl::string_view kClientAttemptStartedInstrumentName =
"grpc.client.attempt.started"; "grpc.client.attempt.started";
static constexpr absl::string_view kClientAttemptDurationInstrumentName =
"grpc.client.attempt.duration";
static constexpr absl::string_view
kClientAttemptSentTotalCompressedMessageSizeInstrumentName =
"grpc.client.attempt.sent_total_compressed_message_size";
static constexpr absl::string_view
kClientAttemptRcvdTotalCompressedMessageSizeInstrumentName =
"grpc.client.attempt.rcvd_total_compressed_message_size";
static constexpr absl::string_view kServerCallStartedInstrumentName =
"grpc.server.call.started";
static constexpr absl::string_view kServerCallDurationInstrumentName =
"grpc.server.call.duration";
static constexpr absl::string_view
kServerCallSentTotalCompressedMessageSizeInstrumentName =
"grpc.server.call.sent_total_compressed_message_size";
static constexpr absl::string_view
kServerCallRcvdTotalCompressedMessageSizeInstrumentName =
"grpc.server.call.rcvd_total_compressed_message_size";
OpenTelemetryPluginBuilder(); OpenTelemetryPluginBuilder();
/// If `SetMeterProvider()` is not called, no metrics are collected. /// If `SetMeterProvider()` is not called, no metrics are collected.

181
src/cpp/ext/otel/otel_plugin.cc
Unescape View File

@ -61,26 +61,24 @@ absl::string_view OpenTelemetryTargetKey() { return "grpc.target"; }
namespace { namespace {
absl::flat_hash_set<std::string> BaseMetrics() { absl::flat_hash_set<std::string> BaseMetrics() {
return absl::flat_hash_set<std::string>{ return absl::flat_hash_set<std::string>{
std::string(grpc::experimental:: std::string(grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptStartedInstrumentName()), kClientAttemptStartedInstrumentName),
std::string(grpc::experimental:: std::string(grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptDurationInstrumentName()), kClientAttemptDurationInstrumentName),
std::string( std::string(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptSentTotalCompressedMessageSizeInstrumentName()), kClientAttemptSentTotalCompressedMessageSizeInstrumentName),
std::string( std::string(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptRcvdTotalCompressedMessageSizeInstrumentName()), kClientAttemptRcvdTotalCompressedMessageSizeInstrumentName),
std::string( std::string(grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental::OpenTelemetryServerCallStartedInstrumentName()), kServerCallStartedInstrumentName),
std::string( std::string(grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental::OpenTelemetryServerCallDurationInstrumentName()), kServerCallDurationInstrumentName),
std::string( std::string(grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental:: kServerCallSentTotalCompressedMessageSizeInstrumentName),
OpenTelemetryServerCallSentTotalCompressedMessageSizeInstrumentName()), std::string(grpc::experimental::OpenTelemetryPluginBuilder::
std::string( kServerCallRcvdTotalCompressedMessageSizeInstrumentName)};
grpc::experimental::
OpenTelemetryServerCallRcvdTotalCompressedMessageSizeInstrumentName())};
} }
} // namespace } // namespace
@ -164,78 +162,76 @@ void OpenTelemetryPluginBuilderImpl::BuildAndRegisterGlobal() {
return; return;
} }
auto meter = meter_provider->GetMeter("grpc-c++", GRPC_CPP_VERSION_STRING); auto meter = meter_provider->GetMeter("grpc-c++", GRPC_CPP_VERSION_STRING);
if (metrics_.contains( if (metrics_.contains(grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental:: kClientAttemptStartedInstrumentName)) {
OpenTelemetryClientAttemptStartedInstrumentName())) {
g_otel_plugin_state_->client.attempt.started = meter->CreateUInt64Counter( g_otel_plugin_state_->client.attempt.started = meter->CreateUInt64Counter(
std::string(grpc::experimental:: std::string(grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptStartedInstrumentName()), kClientAttemptStartedInstrumentName),
"Number of client call attempts started", "{attempt}"); "Number of client call attempts started", "{attempt}");
} }
if (metrics_.contains( if (metrics_.contains(grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental:: kClientAttemptDurationInstrumentName)) {
OpenTelemetryClientAttemptDurationInstrumentName())) {
g_otel_plugin_state_->client.attempt.duration = g_otel_plugin_state_->client.attempt.duration =
meter->CreateDoubleHistogram( meter->CreateDoubleHistogram(
std::string(grpc::experimental:: std::string(grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptDurationInstrumentName()), kClientAttemptDurationInstrumentName),
"End-to-end time taken to complete a client call attempt", "s"); "End-to-end time taken to complete a client call attempt", "s");
} }
if (metrics_.contains( if (metrics_.contains(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptSentTotalCompressedMessageSizeInstrumentName())) { kClientAttemptSentTotalCompressedMessageSizeInstrumentName)) {
g_otel_plugin_state_->client.attempt g_otel_plugin_state_->client.attempt.sent_total_compressed_message_size =
.sent_total_compressed_message_size = meter->CreateUInt64Histogram( meter->CreateUInt64Histogram(
std::string( std::string(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptSentTotalCompressedMessageSizeInstrumentName()), kClientAttemptSentTotalCompressedMessageSizeInstrumentName),
"Compressed message bytes sent per client call attempt", "By"); "Compressed message bytes sent per client call attempt", "By");
} }
if (metrics_.contains( if (metrics_.contains(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptRcvdTotalCompressedMessageSizeInstrumentName())) { kClientAttemptRcvdTotalCompressedMessageSizeInstrumentName)) {
g_otel_plugin_state_->client.attempt g_otel_plugin_state_->client.attempt.rcvd_total_compressed_message_size =
.rcvd_total_compressed_message_size = meter->CreateUInt64Histogram( meter->CreateUInt64Histogram(
std::string( std::string(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptRcvdTotalCompressedMessageSizeInstrumentName()), kClientAttemptRcvdTotalCompressedMessageSizeInstrumentName),
"Compressed message bytes received per call attempt", "By"); "Compressed message bytes received per call attempt", "By");
} }
if (metrics_.contains( if (metrics_.contains(grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental::OpenTelemetryServerCallStartedInstrumentName())) { kServerCallStartedInstrumentName)) {
g_otel_plugin_state_->server.call.started = meter->CreateUInt64Counter( g_otel_plugin_state_->server.call.started = meter->CreateUInt64Counter(
std::string( std::string(grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental::OpenTelemetryServerCallStartedInstrumentName()), kServerCallStartedInstrumentName),
"Number of server calls started", "{call}"); "Number of server calls started", "{call}");
} }
if (metrics_.contains(grpc::experimental:: if (metrics_.contains(grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryServerCallDurationInstrumentName())) { kServerCallDurationInstrumentName)) {
g_otel_plugin_state_->server.call.duration = meter->CreateDoubleHistogram( g_otel_plugin_state_->server.call.duration = meter->CreateDoubleHistogram(
std::string(grpc::experimental:: std::string(grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryServerCallDurationInstrumentName()), kServerCallDurationInstrumentName),
"End-to-end time taken to complete a call from server transport's " "End-to-end time taken to complete a call from server transport's "
"perspective", "perspective",
"s"); "s");
} }
if (metrics_.contains( if (metrics_.contains(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryServerCallSentTotalCompressedMessageSizeInstrumentName())) { kServerCallSentTotalCompressedMessageSizeInstrumentName)) {
g_otel_plugin_state_->server.call g_otel_plugin_state_->server.call.sent_total_compressed_message_size =
.sent_total_compressed_message_size = meter->CreateUInt64Histogram( meter->CreateUInt64Histogram(
std::string( std::string(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryServerCallSentTotalCompressedMessageSizeInstrumentName()), kServerCallSentTotalCompressedMessageSizeInstrumentName),
"Compressed message bytes sent per server call", "By"); "Compressed message bytes sent per server call", "By");
} }
if (metrics_.contains( if (metrics_.contains(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryServerCallRcvdTotalCompressedMessageSizeInstrumentName())) { kServerCallRcvdTotalCompressedMessageSizeInstrumentName)) {
g_otel_plugin_state_->server.call g_otel_plugin_state_->server.call.rcvd_total_compressed_message_size =
.rcvd_total_compressed_message_size = meter->CreateUInt64Histogram( meter->CreateUInt64Histogram(
std::string( std::string(
grpc::experimental:: grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryServerCallRcvdTotalCompressedMessageSizeInstrumentName()), kServerCallRcvdTotalCompressedMessageSizeInstrumentName),
"Compressed message bytes received per server call", "By"); "Compressed message bytes received per server call", "By");
} }
g_otel_plugin_state_->labels_injector = std::move(labels_injector_); g_otel_plugin_state_->labels_injector = std::move(labels_injector_);
g_otel_plugin_state_->target_attribute_filter = g_otel_plugin_state_->target_attribute_filter =
@ -269,41 +265,20 @@ namespace experimental {
constexpr absl::string_view constexpr absl::string_view
OpenTelemetryPluginBuilder::kClientAttemptStartedInstrumentName; OpenTelemetryPluginBuilder::kClientAttemptStartedInstrumentName;
constexpr absl::string_view
absl::string_view OpenTelemetryClientAttemptStartedInstrumentName() { OpenTelemetryPluginBuilder::kClientAttemptDurationInstrumentName;
return "grpc.client.attempt.started"; constexpr absl::string_view OpenTelemetryPluginBuilder::
} kClientAttemptSentTotalCompressedMessageSizeInstrumentName;
absl::string_view OpenTelemetryClientAttemptDurationInstrumentName() { constexpr absl::string_view OpenTelemetryPluginBuilder::
return "grpc.client.attempt.duration"; kClientAttemptRcvdTotalCompressedMessageSizeInstrumentName;
} constexpr absl::string_view
OpenTelemetryPluginBuilder::kServerCallStartedInstrumentName;
absl::string_view constexpr absl::string_view
OpenTelemetryClientAttemptSentTotalCompressedMessageSizeInstrumentName() { OpenTelemetryPluginBuilder::kServerCallDurationInstrumentName;
return "grpc.client.attempt.sent_total_compressed_message_size"; constexpr absl::string_view OpenTelemetryPluginBuilder::
} kServerCallSentTotalCompressedMessageSizeInstrumentName;
constexpr absl::string_view OpenTelemetryPluginBuilder::
absl::string_view kServerCallRcvdTotalCompressedMessageSizeInstrumentName;
OpenTelemetryClientAttemptRcvdTotalCompressedMessageSizeInstrumentName() {
return "grpc.client.attempt.rcvd_total_compressed_message_size";
}
absl::string_view OpenTelemetryServerCallStartedInstrumentName() {
return "grpc.server.call.started";
}
absl::string_view OpenTelemetryServerCallDurationInstrumentName() {
return "grpc.server.call.duration";
}
absl::string_view
OpenTelemetryServerCallSentTotalCompressedMessageSizeInstrumentName() {
return "grpc.server.call.sent_total_compressed_message_size";
}
absl::string_view
OpenTelemetryServerCallRcvdTotalCompressedMessageSizeInstrumentName() {
return "grpc.server.call.rcvd_total_compressed_message_size";
}
// //
// OpenTelemetryPluginBuilder // OpenTelemetryPluginBuilder

16
test/cpp/ext/csm/metadata_exchange_test.cc
Unescape View File

@ -230,8 +230,8 @@ TEST_P(MetadataExchangeTest, ClientAttemptStarted) {
} }
TEST_P(MetadataExchangeTest, ClientAttemptDuration) { TEST_P(MetadataExchangeTest, ClientAttemptDuration) {
Init(/*metric_names=*/{ Init(/*metric_names=*/{grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental::OpenTelemetryClientAttemptDurationInstrumentName()}); kClientAttemptDurationInstrumentName});
SendRPC(); SendRPC();
const char* kMetricName = "grpc.client.attempt.duration"; const char* kMetricName = "grpc.client.attempt.duration";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -256,8 +256,8 @@ TEST_P(MetadataExchangeTest, ClientAttemptDuration) {
// Verify that grpc.server.call.started does not get service mesh attributes // Verify that grpc.server.call.started does not get service mesh attributes
TEST_P(MetadataExchangeTest, ServerCallStarted) { TEST_P(MetadataExchangeTest, ServerCallStarted) {
Init( Init(
/*metric_names=*/{ /*metric_names=*/{grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental::OpenTelemetryServerCallStartedInstrumentName()}); kServerCallStartedInstrumentName});
SendRPC(); SendRPC();
const char* kMetricName = "grpc.server.call.started"; const char* kMetricName = "grpc.server.call.started";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -277,8 +277,8 @@ TEST_P(MetadataExchangeTest, ServerCallStarted) {
TEST_P(MetadataExchangeTest, ServerCallDuration) { TEST_P(MetadataExchangeTest, ServerCallDuration) {
Init( Init(
/*metric_names=*/{ /*metric_names=*/{grpc::experimental::OpenTelemetryPluginBuilder::
grpc::experimental::OpenTelemetryServerCallDurationInstrumentName()}); kServerCallDurationInstrumentName});
SendRPC(); SendRPC();
const char* kMetricName = "grpc.server.call.duration"; const char* kMetricName = "grpc.server.call.duration";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -301,8 +301,8 @@ TEST_P(MetadataExchangeTest, ServerCallDuration) {
// Test that the server records unknown when the client does not send metadata // Test that the server records unknown when the client does not send metadata
TEST_P(MetadataExchangeTest, ClientDoesNotSendMetadata) { TEST_P(MetadataExchangeTest, ClientDoesNotSendMetadata) {
Init( Init(
/*metric_names=*/{grpc::experimental:: /*metric_names=*/{grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryServerCallDurationInstrumentName()}, kServerCallDurationInstrumentName},
/*enable_client_side_injector=*/false); /*enable_client_side_injector=*/false);
SendRPC(); SendRPC();
const char* kMetricName = "grpc.server.call.duration"; const char* kMetricName = "grpc.server.call.duration";

70
test/cpp/ext/otel/otel_plugin_test.cc
Unescape View File

@ -51,7 +51,8 @@ TEST(OpenTelemetryPluginBuildTest, Basic) {
} }
TEST_F(OpenTelemetryPluginEnd2EndTest, ClientAttemptStarted) { TEST_F(OpenTelemetryPluginEnd2EndTest, ClientAttemptStarted) {
Init({grpc::experimental::OpenTelemetryClientAttemptStartedInstrumentName()}); Init({grpc::experimental::OpenTelemetryPluginBuilder::
kClientAttemptStartedInstrumentName});
SendRPC(); SendRPC();
const char* kMetricName = "grpc.client.attempt.started"; const char* kMetricName = "grpc.client.attempt.started";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -79,8 +80,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, ClientAttemptStarted) {
} }
TEST_F(OpenTelemetryPluginEnd2EndTest, ClientAttemptDuration) { TEST_F(OpenTelemetryPluginEnd2EndTest, ClientAttemptDuration) {
Init( Init({grpc::experimental::OpenTelemetryPluginBuilder::
{grpc::experimental::OpenTelemetryClientAttemptDurationInstrumentName()}); kClientAttemptDurationInstrumentName});
SendRPC(); SendRPC();
const char* kMetricName = "grpc.client.attempt.duration"; const char* kMetricName = "grpc.client.attempt.duration";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -112,9 +113,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, ClientAttemptDuration) {
TEST_F(OpenTelemetryPluginEnd2EndTest, TEST_F(OpenTelemetryPluginEnd2EndTest,
ClientAttemptSentTotalCompressedMessageSize) { ClientAttemptSentTotalCompressedMessageSize) {
Init( Init({grpc::experimental::OpenTelemetryPluginBuilder::
{grpc::experimental:: kClientAttemptSentTotalCompressedMessageSizeInstrumentName});
OpenTelemetryClientAttemptSentTotalCompressedMessageSizeInstrumentName()});
SendRPC(); SendRPC();
const char* kMetricName = const char* kMetricName =
"grpc.client.attempt.sent_total_compressed_message_size"; "grpc.client.attempt.sent_total_compressed_message_size";
@ -148,9 +148,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest,
TEST_F(OpenTelemetryPluginEnd2EndTest, TEST_F(OpenTelemetryPluginEnd2EndTest,
ClientAttemptRcvdTotalCompressedMessageSize) { ClientAttemptRcvdTotalCompressedMessageSize) {
Init( Init({grpc::experimental::OpenTelemetryPluginBuilder::
{grpc::experimental:: kClientAttemptRcvdTotalCompressedMessageSizeInstrumentName});
OpenTelemetryClientAttemptRcvdTotalCompressedMessageSizeInstrumentName()});
SendRPC(); SendRPC();
const char* kMetricName = const char* kMetricName =
"grpc.client.attempt.rcvd_total_compressed_message_size"; "grpc.client.attempt.rcvd_total_compressed_message_size";
@ -183,7 +182,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest,
} }
TEST_F(OpenTelemetryPluginEnd2EndTest, ServerCallStarted) { TEST_F(OpenTelemetryPluginEnd2EndTest, ServerCallStarted) {
Init({grpc::experimental::OpenTelemetryServerCallStartedInstrumentName()}); Init({grpc::experimental::OpenTelemetryPluginBuilder::
kServerCallStartedInstrumentName});
SendRPC(); SendRPC();
const char* kMetricName = "grpc.server.call.started"; const char* kMetricName = "grpc.server.call.started";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -207,7 +207,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, ServerCallStarted) {
} }
TEST_F(OpenTelemetryPluginEnd2EndTest, ServerCallDuration) { TEST_F(OpenTelemetryPluginEnd2EndTest, ServerCallDuration) {
Init({grpc::experimental::OpenTelemetryServerCallDurationInstrumentName()}); Init({grpc::experimental::OpenTelemetryPluginBuilder::
kServerCallDurationInstrumentName});
SendRPC(); SendRPC();
const char* kMetricName = "grpc.server.call.duration"; const char* kMetricName = "grpc.server.call.duration";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -235,9 +236,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, ServerCallDuration) {
TEST_F(OpenTelemetryPluginEnd2EndTest, TEST_F(OpenTelemetryPluginEnd2EndTest,
ServerCallSentTotalCompressedMessageSize) { ServerCallSentTotalCompressedMessageSize) {
Init( Init({grpc::experimental::OpenTelemetryPluginBuilder::
{grpc::experimental:: kServerCallSentTotalCompressedMessageSizeInstrumentName});
OpenTelemetryServerCallSentTotalCompressedMessageSizeInstrumentName()});
SendRPC(); SendRPC();
const char* kMetricName = const char* kMetricName =
"grpc.server.call.sent_total_compressed_message_size"; "grpc.server.call.sent_total_compressed_message_size";
@ -267,9 +267,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest,
TEST_F(OpenTelemetryPluginEnd2EndTest, TEST_F(OpenTelemetryPluginEnd2EndTest,
ServerCallRcvdTotalCompressedMessageSize) { ServerCallRcvdTotalCompressedMessageSize) {
Init( Init({grpc::experimental::OpenTelemetryPluginBuilder::
{grpc::experimental:: kServerCallRcvdTotalCompressedMessageSizeInstrumentName});
OpenTelemetryServerCallRcvdTotalCompressedMessageSizeInstrumentName()});
SendRPC(); SendRPC();
const char* kMetricName = const char* kMetricName =
"grpc.server.call.rcvd_total_compressed_message_size"; "grpc.server.call.rcvd_total_compressed_message_size";
@ -299,7 +298,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest,
// Make sure that no meter provider results in normal operations. // Make sure that no meter provider results in normal operations.
TEST_F(OpenTelemetryPluginEnd2EndTest, NoMeterProviderRegistered) { TEST_F(OpenTelemetryPluginEnd2EndTest, NoMeterProviderRegistered) {
Init({grpc::experimental::OpenTelemetryClientAttemptStartedInstrumentName()}, Init({grpc::experimental::OpenTelemetryPluginBuilder::
kClientAttemptStartedInstrumentName},
/*resource=*/opentelemetry::sdk::resource::Resource::Create({}), /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/true); /*test_no_meter_provider=*/true);
@ -308,8 +308,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, NoMeterProviderRegistered) {
// Test that a channel selector returning true records metrics on the channel. // Test that a channel selector returning true records metrics on the channel.
TEST_F(OpenTelemetryPluginEnd2EndTest, TargetSelectorReturnsTrue) { TEST_F(OpenTelemetryPluginEnd2EndTest, TargetSelectorReturnsTrue) {
Init({grpc::experimental:: Init({grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptStartedInstrumentName()}, /*resource=*/ kClientAttemptStartedInstrumentName}, /*resource=*/
opentelemetry::sdk::resource::Resource::Create({}), opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/false, /*test_no_meter_provider=*/false,
@ -344,8 +344,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, TargetSelectorReturnsTrue) {
// Test that a target selector returning false does not record metrics on the // Test that a target selector returning false does not record metrics on the
// channel. // channel.
TEST_F(OpenTelemetryPluginEnd2EndTest, TargetSelectorReturnsFalse) { TEST_F(OpenTelemetryPluginEnd2EndTest, TargetSelectorReturnsFalse) {
Init({grpc::experimental:: Init({grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptStartedInstrumentName()}, /*resource=*/ kClientAttemptStartedInstrumentName}, /*resource=*/
opentelemetry::sdk::resource::Resource::Create({}), opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/false, /*test_no_meter_provider=*/false,
@ -363,8 +363,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, TargetSelectorReturnsFalse) {
// Test that a target attribute filter returning true records metrics with the // Test that a target attribute filter returning true records metrics with the
// target as is on the channel. // target as is on the channel.
TEST_F(OpenTelemetryPluginEnd2EndTest, TargetAttributeFilterReturnsTrue) { TEST_F(OpenTelemetryPluginEnd2EndTest, TargetAttributeFilterReturnsTrue) {
Init({grpc::experimental:: Init({grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptStartedInstrumentName()}, /*resource=*/ kClientAttemptStartedInstrumentName}, /*resource=*/
opentelemetry::sdk::resource::Resource::Create({}), opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/false, /*test_no_meter_provider=*/false,
@ -401,8 +401,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, TargetAttributeFilterReturnsTrue) {
// Test that a target attribute filter returning false records metrics with the // Test that a target attribute filter returning false records metrics with the
// target as "other". // target as "other".
TEST_F(OpenTelemetryPluginEnd2EndTest, TargetAttributeFilterReturnsFalse) { TEST_F(OpenTelemetryPluginEnd2EndTest, TargetAttributeFilterReturnsFalse) {
Init({grpc::experimental:: Init({grpc::experimental::OpenTelemetryPluginBuilder::
OpenTelemetryClientAttemptStartedInstrumentName()}, /*resource=*/ kClientAttemptStartedInstrumentName}, /*resource=*/
opentelemetry::sdk::resource::Resource::Create({}), opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/false, /*test_no_meter_provider=*/false,
@ -438,7 +438,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, TargetAttributeFilterReturnsFalse) {
// Test that generic method names are scrubbed properly on the client side. // Test that generic method names are scrubbed properly on the client side.
TEST_F(OpenTelemetryPluginEnd2EndTest, GenericClientRpc) { TEST_F(OpenTelemetryPluginEnd2EndTest, GenericClientRpc) {
Init({grpc::experimental::OpenTelemetryClientAttemptStartedInstrumentName()}); Init({grpc::experimental::OpenTelemetryPluginBuilder::
kClientAttemptStartedInstrumentName});
SendGenericRPC(); SendGenericRPC();
const char* kMetricName = "grpc.client.attempt.started"; const char* kMetricName = "grpc.client.attempt.started";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -469,7 +470,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, GenericClientRpc) {
// the method attribute filter is set and it returns false. // the method attribute filter is set and it returns false.
TEST_F(OpenTelemetryPluginEnd2EndTest, TEST_F(OpenTelemetryPluginEnd2EndTest,
GenericClientRpcWithMethodAttributeFilterReturningFalse) { GenericClientRpcWithMethodAttributeFilterReturningFalse) {
Init({grpc::experimental::OpenTelemetryClientAttemptStartedInstrumentName()}, Init({grpc::experimental::OpenTelemetryPluginBuilder::
kClientAttemptStartedInstrumentName},
/*resource=*/opentelemetry::sdk::resource::Resource::Create({}), /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/false, /*test_no_meter_provider=*/false,
@ -508,7 +510,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest,
// the method attribute filter is set and it returns true. // the method attribute filter is set and it returns true.
TEST_F(OpenTelemetryPluginEnd2EndTest, TEST_F(OpenTelemetryPluginEnd2EndTest,
GenericClientRpcWithMethodAttributeFilterReturningTrue) { GenericClientRpcWithMethodAttributeFilterReturningTrue) {
Init({grpc::experimental::OpenTelemetryClientAttemptStartedInstrumentName()}, Init({grpc::experimental::OpenTelemetryPluginBuilder::
kClientAttemptStartedInstrumentName},
/*resource=*/opentelemetry::sdk::resource::Resource::Create({}), /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/false, /*test_no_meter_provider=*/false,
@ -545,7 +548,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest,
// Test that generic method names are scrubbed properly on the server side. // Test that generic method names are scrubbed properly on the server side.
TEST_F(OpenTelemetryPluginEnd2EndTest, GenericServerRpc) { TEST_F(OpenTelemetryPluginEnd2EndTest, GenericServerRpc) {
Init({grpc::experimental::OpenTelemetryServerCallDurationInstrumentName()}); Init({grpc::experimental::OpenTelemetryPluginBuilder::
kServerCallDurationInstrumentName});
SendGenericRPC(); SendGenericRPC();
const char* kMetricName = "grpc.server.call.duration"; const char* kMetricName = "grpc.server.call.duration";
auto data = ReadCurrentMetricsData( auto data = ReadCurrentMetricsData(
@ -575,7 +579,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest, GenericServerRpc) {
// the method attribute filter is set and it returns false. // the method attribute filter is set and it returns false.
TEST_F(OpenTelemetryPluginEnd2EndTest, TEST_F(OpenTelemetryPluginEnd2EndTest,
GenericServerRpcWithMethodAttributeFilterReturningFalse) { GenericServerRpcWithMethodAttributeFilterReturningFalse) {
Init({grpc::experimental::OpenTelemetryServerCallDurationInstrumentName()}, Init({grpc::experimental::OpenTelemetryPluginBuilder::
kServerCallDurationInstrumentName},
/*resource=*/opentelemetry::sdk::resource::Resource::Create({}), /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/false, /*test_no_meter_provider=*/false,
@ -613,7 +618,8 @@ TEST_F(OpenTelemetryPluginEnd2EndTest,
// the method attribute filter is set and it returns true. // the method attribute filter is set and it returns true.
TEST_F(OpenTelemetryPluginEnd2EndTest, TEST_F(OpenTelemetryPluginEnd2EndTest,
GenericServerRpcWithMethodAttributeFilterReturningTrue) { GenericServerRpcWithMethodAttributeFilterReturningTrue) {
Init({grpc::experimental::OpenTelemetryServerCallDurationInstrumentName()}, Init({grpc::experimental::OpenTelemetryPluginBuilder::
kServerCallDurationInstrumentName},
/*resource=*/opentelemetry::sdk::resource::Resource::Create({}), /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
/*labels_injector=*/nullptr, /*labels_injector=*/nullptr,
/*test_no_meter_provider=*/false, /*test_no_meter_provider=*/false,

Write Preview
Loading…
Cancel
Save