impl(GCS+gRPC): fix GrpcMetrics*Option names (#14116)

coryan · web-flow · commit 7e7070ec67ad · 2024-05-02T15:51:18.000Z
diff --git a/google/cloud/storage/grpc_plugin.h b/google/cloud/storage/grpc_plugin.h
@@ -81,7 +81,7 @@ google::cloud::storage::Client DefaultGrpcClient(Options opts = {});
  * https://github.com/grpc/proposal/blob/master/A78-grpc-metrics-wrr-pf-xds.md
  * [Google Cloud Monitoring]: https://cloud.google.com/monitoring/docs
  */
-struct EnableGrpcMetrics {
+struct EnableGrpcMetricsOption {
   using Type = bool;
 };
 
@@ -90,11 +90,11 @@ struct EnableGrpcMetrics {
  *
  * When `EnableGrpcMetrics` is enabled, this option controls the frequency at
  * which metrics are exported to [Google Cloud Monitoring]. The default is 60
- * seconds. Values below 60 seconds are ignored.
+ * seconds. Values below 5 seconds are ignored.
  *
  * [Google Cloud Monitoring]: https://cloud.google.com/monitoring/docs
  */
-struct GrpcMetricsPeriod {
+struct GrpcMetricsPeriodOption {
   using Type = std::chrono::seconds;
 };
 
diff --git a/google/cloud/storage/internal/grpc/default_options.cc b/google/cloud/storage/internal/grpc/default_options.cc
@@ -87,11 +87,13 @@ Options DefaultOptionsGrpc(Options options) {
       Options{}
           .set<EndpointOption>(ep)
           .set<AuthorityOption>(ep)
-          .set<storage_experimental::EnableGrpcMetrics>(true)
-          .set<storage_experimental::GrpcMetricsPeriod>(kDefaultMetricsPeriod));
-  if (options.get<storage_experimental::GrpcMetricsPeriod>() <
+          .set<storage_experimental::EnableGrpcMetricsOption>(true)
+          .set<storage_experimental::GrpcMetricsPeriodOption>(
+              kDefaultMetricsPeriod));
+  if (options.get<storage_experimental::GrpcMetricsPeriodOption>() <
       kMinMetricsPeriod) {
-    options.set<storage_experimental::GrpcMetricsPeriod>(kMinMetricsPeriod);
+    options.set<storage_experimental::GrpcMetricsPeriodOption>(
+        kMinMetricsPeriod);
   }
   // We can only compute this once the endpoint is known, so take an additional
   // step.
diff --git a/google/cloud/storage/internal/grpc/default_options_test.cc b/google/cloud/storage/internal/grpc/default_options_test.cc
@@ -122,26 +122,26 @@ TEST(DefaultOptionsGrpc, DefaultOptionsUploadBuffer) {
 
 TEST(DefaultOptionsGrpc, MetricsEnabled) {
   auto const options = DefaultOptionsGrpc(Options{});
-  EXPECT_TRUE(options.get<storage_experimental::EnableGrpcMetrics>());
+  EXPECT_TRUE(options.get<storage_experimental::EnableGrpcMetricsOption>());
 }
 
 TEST(DefaultOptionsGrpc, MetricsPeriod) {
   auto const options = DefaultOptionsGrpc(Options{});
-  EXPECT_GE(options.get<storage_experimental::GrpcMetricsPeriod>(),
+  EXPECT_GE(options.get<storage_experimental::GrpcMetricsPeriodOption>(),
             std::chrono::seconds(60));
 }
 
 TEST(DefaultOptionsGrpc, MinMetricsPeriod) {
-  auto const o0 =
-      DefaultOptionsGrpc(Options{}.set<storage_experimental::GrpcMetricsPeriod>(
+  auto const o0 = DefaultOptionsGrpc(
+      Options{}.set<storage_experimental::GrpcMetricsPeriodOption>(
           std::chrono::seconds(0)));
-  EXPECT_GT(o0.get<storage_experimental::GrpcMetricsPeriod>(),
+  EXPECT_GT(o0.get<storage_experimental::GrpcMetricsPeriodOption>(),
             std::chrono::seconds(0));
 
-  auto const m5 =
-      DefaultOptionsGrpc(Options{}.set<storage_experimental::GrpcMetricsPeriod>(
+  auto const m5 = DefaultOptionsGrpc(
+      Options{}.set<storage_experimental::GrpcMetricsPeriodOption>(
           std::chrono::seconds(-5)));
-  EXPECT_GT(m5.get<storage_experimental::GrpcMetricsPeriod>(),
+  EXPECT_GT(m5.get<storage_experimental::GrpcMetricsPeriodOption>(),
             std::chrono::seconds(0));
 }
 
