impl(storage): configure gRPC ClientContext using CurrentOptions (#9453)

dbolduc · web-flow · commit ead714bc1513 · 2022-07-12T13:05:18.000-04:00
diff --git a/google/cloud/storage/internal/grpc_configure_client_context.h b/google/cloud/storage/internal/grpc_configure_client_context.h
@@ -17,6 +17,7 @@
 
 #include "google/cloud/storage/internal/generic_request.h"
 #include "google/cloud/storage/version.h"
+#include "google/cloud/grpc_options.h"
 #include <grpcpp/client_context.h>
 
 namespace google {
@@ -57,6 +58,9 @@ void ApplyQueryParameters(grpc::ClientContext& context, Request const& request,
     if (!prefix.empty()) field_mask = prefix + "(" + field_mask + ")";
     context.AddMetadata("x-goog-fieldmask", std::move(field_mask));
   }
+
+  google::cloud::internal::ConfigureContext(
+      context, google::cloud::internal::CurrentOptions());
 }
 
 }  // namespace internal
diff --git a/google/cloud/storage/internal/grpc_configure_client_context_test.cc b/google/cloud/storage/internal/grpc_configure_client_context_test.cc
@@ -27,6 +27,7 @@ namespace {
 using ::google::cloud::testing_util::ValidateMetadataFixture;
 using ::testing::Contains;
 using ::testing::IsEmpty;
+using ::testing::MockFunction;
 using ::testing::Pair;
 
 class GrpcConfigureClientContext : public ::testing::Test {
@@ -101,6 +102,19 @@ TEST_F(GrpcConfigureClientContext, ApplyQueryParametersQuotaUserAndUserIp) {
   }
 }
 
+TEST_F(GrpcConfigureClientContext, ApplyQueryParametersGrpcOptions) {
+  MockFunction<void(grpc::ClientContext&)> mock;
+  EXPECT_CALL(mock, Call);
+
+  google::cloud::internal::OptionsSpan span(
+      Options{}.set<google::cloud::internal::GrpcSetupOption>(
+          mock.AsStdFunction()));
+
+  grpc::ClientContext context;
+  ApplyQueryParameters(context,
+                       ReadObjectRangeRequest("test-bucket", "test-object"));
+}
+
 }  // namespace
 }  // namespace internal
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`#include "google/cloud/storage/internal/generic_request.h"`
`19`	`19`	`#include "google/cloud/storage/version.h"`
	`20`	`+#include "google/cloud/grpc_options.h"`
`20`	`21`	`#include <grpcpp/client_context.h>`
`21`	`22`
`22`	`23`	`namespace google {`
`@@ -57,6 +58,9 @@ void ApplyQueryParameters(grpc::ClientContext& context, Request const& request,`
`57`	`58`	`if (!prefix.empty()) field_mask = prefix + "(" + field_mask + ")";`
`58`	`59`	`context.AddMetadata("x-goog-fieldmask", std::move(field_mask));`
`59`	`60`	`}`
	`61`	`+`
	`62`	`+ google::cloud::internal::ConfigureContext(`
	`63`	`+ context, google::cloud::internal::CurrentOptions());`
`60`	`64`	`}`
`61`	`65`
`62`	`66`	`} // namespace internal`