From 69f8d308cb5aa7a7be796cc902acd856e0aec0d3 Mon Sep 17 00:00:00 2001 From: Karthik Ravi Shankar Date: Mon, 13 Jul 2020 14:50:33 -0700 Subject: [PATCH] Move LoadReportingServiceServerBuilderOption from ::grpc_impl to ::grpc Reverts: https://github.com/grpc/grpc/pull/18419/files --- BUILD | 1 - include/grpcpp/ext/server_load_reporting.h | 31 +++++++---- .../grpcpp/ext/server_load_reporting_impl.h | 54 ------------------- ...reporting_service_server_builder_option.cc | 4 +- src/cpp/server/load_reporter/util.cc | 4 +- 5 files changed, 25 insertions(+), 69 deletions(-) delete mode 100644 include/grpcpp/ext/server_load_reporting_impl.h diff --git a/BUILD b/BUILD index 48fa1dfdb4a..ed66ec6f59f 100644 --- a/BUILD +++ b/BUILD @@ -1610,7 +1610,6 @@ grpc_cc_library( language = "c++", public_hdrs = [ "include/grpcpp/ext/server_load_reporting.h", - "include/grpcpp/ext/server_load_reporting_impl.h", ], deps = [ "lb_server_load_reporting_filter", diff --git a/include/grpcpp/ext/server_load_reporting.h b/include/grpcpp/ext/server_load_reporting.h index ecc40c3df27..7f681eb1968 100644 --- a/include/grpcpp/ext/server_load_reporting.h +++ b/include/grpcpp/ext/server_load_reporting.h @@ -19,22 +19,33 @@ #ifndef GRPCPP_EXT_SERVER_LOAD_REPORTING_H #define GRPCPP_EXT_SERVER_LOAD_REPORTING_H -#include +#include + +#include +#include +#include +#include namespace grpc { namespace load_reporter { namespace experimental { -typedef ::grpc_impl::load_reporter::experimental:: - LoadReportingServiceServerBuilderOption - LoadReportingServiceServerBuilderOption; +// The ServerBuilderOption to enable server-side load reporting feature. To +// enable the feature, please make sure the binary builds with the +// grpcpp_server_load_reporting library and set this option in the +// ServerBuilder. +class LoadReportingServiceServerBuilderOption + : public grpc::ServerBuilderOption { + public: + void UpdateArguments(::grpc::ChannelArguments* args) override; + void UpdatePlugins(std::vector>* + plugins) override; +}; -static inline void AddLoadReportingCost(grpc::ServerContext* ctx, - const std::string& cost_name, - double cost_value) { - ::grpc_impl::load_reporter::experimental::AddLoadReportingCost(ctx, cost_name, - cost_value); -} +// Adds the load reporting cost with \a cost_name and \a cost_value in the +// trailing metadata of the server context. +void AddLoadReportingCost(grpc::ServerContext* ctx, + const std::string& cost_name, double cost_value); } // namespace experimental } // namespace load_reporter diff --git a/include/grpcpp/ext/server_load_reporting_impl.h b/include/grpcpp/ext/server_load_reporting_impl.h deleted file mode 100644 index 30eeef0ccd4..00000000000 --- a/include/grpcpp/ext/server_load_reporting_impl.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * - * Copyright 2018 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#ifndef GRPCPP_EXT_SERVER_LOAD_REPORTING_IMPL_H -#define GRPCPP_EXT_SERVER_LOAD_REPORTING_IMPL_H - -#include - -#include -#include -#include -#include - -namespace grpc_impl { -namespace load_reporter { -namespace experimental { - -// The ServerBuilderOption to enable server-side load reporting feature. To -// enable the feature, please make sure the binary builds with the -// grpcpp_server_load_reporting library and set this option in the -// ServerBuilder. -class LoadReportingServiceServerBuilderOption - : public grpc::ServerBuilderOption { - public: - void UpdateArguments(::grpc::ChannelArguments* args) override; - void UpdatePlugins(std::vector>* - plugins) override; -}; - -// Adds the load reporting cost with \a cost_name and \a cost_value in the -// trailing metadata of the server context. -void AddLoadReportingCost(grpc::ServerContext* ctx, - const std::string& cost_name, double cost_value); - -} // namespace experimental -} // namespace load_reporter -} // namespace grpc_impl - -#endif // GRPCPP_EXT_SERVER_LOAD_REPORTING_IMPL_H diff --git a/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc b/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc index ab63bebb792..43ad7021896 100644 --- a/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc +++ b/src/cpp/server/load_reporter/load_reporting_service_server_builder_option.cc @@ -22,7 +22,7 @@ #include "src/cpp/server/load_reporter/load_reporting_service_server_builder_plugin.h" -namespace grpc_impl { +namespace grpc { namespace load_reporter { namespace experimental { @@ -39,4 +39,4 @@ void LoadReportingServiceServerBuilderOption::UpdatePlugins( } // namespace experimental } // namespace load_reporter -} // namespace grpc_impl +} // namespace grpc diff --git a/src/cpp/server/load_reporter/util.cc b/src/cpp/server/load_reporter/util.cc index 59847f69092..4f05a5b8c04 100644 --- a/src/cpp/server/load_reporter/util.cc +++ b/src/cpp/server/load_reporter/util.cc @@ -24,7 +24,7 @@ #include -namespace grpc_impl { +namespace grpc { namespace load_reporter { namespace experimental { @@ -44,4 +44,4 @@ void AddLoadReportingCost(grpc::ServerContext* ctx, } // namespace experimental } // namespace load_reporter -} // namespace grpc_impl +} // namespace grpc