GcpObservabilityConfig: s/disabled/enabled (#30905)

pull/30930/head
Yash Tibrewal 3 years ago committed by GitHub
parent f7f4c9b584
commit ebcda5f0c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      src/cpp/ext/gcp/observability_config.h
  2. 19
      test/cpp/ext/gcp/observability_config_test.cc

@ -29,40 +29,40 @@ namespace internal {
struct GcpObservabilityConfig { struct GcpObservabilityConfig {
struct CloudLogging { struct CloudLogging {
bool enabled = false; bool disabled = false;
static const grpc_core::JsonLoaderInterface* JsonLoader( static const grpc_core::JsonLoaderInterface* JsonLoader(
const grpc_core::JsonArgs&) { const grpc_core::JsonArgs&) {
static const auto* loader = static const auto* loader =
grpc_core::JsonObjectLoader<CloudLogging>() grpc_core::JsonObjectLoader<CloudLogging>()
.OptionalField("enabled", &CloudLogging::enabled) .OptionalField("disabled", &CloudLogging::disabled)
.Finish(); .Finish();
return loader; return loader;
} }
}; };
struct CloudMonitoring { struct CloudMonitoring {
bool enabled = false; bool disabled = false;
static const grpc_core::JsonLoaderInterface* JsonLoader( static const grpc_core::JsonLoaderInterface* JsonLoader(
const grpc_core::JsonArgs&) { const grpc_core::JsonArgs&) {
static const auto* loader = static const auto* loader =
grpc_core::JsonObjectLoader<CloudMonitoring>() grpc_core::JsonObjectLoader<CloudMonitoring>()
.OptionalField("enabled", &CloudMonitoring::enabled) .OptionalField("disabled", &CloudMonitoring::disabled)
.Finish(); .Finish();
return loader; return loader;
} }
}; };
struct CloudTrace { struct CloudTrace {
bool enabled = false; bool disabled = false;
float sampling_rate = 0; float sampling_rate = 0;
static const grpc_core::JsonLoaderInterface* JsonLoader( static const grpc_core::JsonLoaderInterface* JsonLoader(
const grpc_core::JsonArgs&) { const grpc_core::JsonArgs&) {
static const auto* loader = static const auto* loader =
grpc_core::JsonObjectLoader<CloudTrace>() grpc_core::JsonObjectLoader<CloudTrace>()
.OptionalField("enabled", &CloudTrace::enabled) .OptionalField("disabled", &CloudTrace::disabled)
.OptionalField("sampling_rate", &CloudTrace::sampling_rate) .OptionalField("sampling_rate", &CloudTrace::sampling_rate)
.Finish(); .Finish();
return loader; return loader;

@ -32,13 +32,13 @@ namespace {
TEST(GcpObservabilityConfigJsonParsingTest, Basic) { TEST(GcpObservabilityConfigJsonParsingTest, Basic) {
const char* json_str = R"json({ const char* json_str = R"json({
"cloud_logging": { "cloud_logging": {
"enabled": true "disabled": true
}, },
"cloud_monitoring": { "cloud_monitoring": {
"enabled": true "disabled": true
}, },
"cloud_trace": { "cloud_trace": {
"enabled": true, "disabled": true,
"sampling_rate": 0.05 "sampling_rate": 0.05
}, },
"project_id": "project" "project_id": "project"
@ -49,9 +49,9 @@ TEST(GcpObservabilityConfigJsonParsingTest, Basic) {
auto config = grpc_core::LoadFromJson<GcpObservabilityConfig>( auto config = grpc_core::LoadFromJson<GcpObservabilityConfig>(
*json, grpc_core::JsonArgs(), &errors); *json, grpc_core::JsonArgs(), &errors);
ASSERT_TRUE(errors.ok()) << errors.status(); ASSERT_TRUE(errors.ok()) << errors.status();
EXPECT_TRUE(config.cloud_logging.enabled); EXPECT_TRUE(config.cloud_logging.disabled);
EXPECT_TRUE(config.cloud_monitoring.enabled); EXPECT_TRUE(config.cloud_monitoring.disabled);
EXPECT_TRUE(config.cloud_trace.enabled); EXPECT_TRUE(config.cloud_trace.disabled);
EXPECT_FLOAT_EQ(config.cloud_trace.sampling_rate, 0.05); EXPECT_FLOAT_EQ(config.cloud_trace.sampling_rate, 0.05);
EXPECT_EQ(config.project_id, "project"); EXPECT_EQ(config.project_id, "project");
} }
@ -65,9 +65,10 @@ TEST(GcpObservabilityConfigJsonParsingTest, Defaults) {
auto config = grpc_core::LoadFromJson<GcpObservabilityConfig>( auto config = grpc_core::LoadFromJson<GcpObservabilityConfig>(
*json, grpc_core::JsonArgs(), &errors); *json, grpc_core::JsonArgs(), &errors);
ASSERT_TRUE(errors.ok()) << errors.status(); ASSERT_TRUE(errors.ok()) << errors.status();
EXPECT_FALSE(config.cloud_logging.enabled); EXPECT_FALSE(config.cloud_logging.disabled);
EXPECT_FALSE(config.cloud_monitoring.enabled); EXPECT_FALSE(config.cloud_monitoring.disabled);
EXPECT_FALSE(config.cloud_trace.enabled); EXPECT_FALSE(config.cloud_trace.disabled);
EXPECT_FLOAT_EQ(config.cloud_trace.sampling_rate, 0);
EXPECT_TRUE(config.project_id.empty()); EXPECT_TRUE(config.project_id.empty());
} }

Loading…
Cancel
Save