Move ChannelzServicePlugin to public, experimental

CMakeLists.txt

@@ -4738,6 +4738,15 @@ target_link_libraries(grpcpp_channelz
   grpc
 )
 
+foreach(_hdr
+  include/grpcpp/ext/channelz_service_plugin.h
+)
+  string(REPLACE "include/" "" _path ${_hdr})
+  get_filename_component(_path ${_path} PATH)
+  install(FILES ${_hdr}
+    DESTINATION "${gRPC_INSTALL_INCLUDEDIR}/${_path}"
+  )
+endforeach()
 endif (gRPC_BUILD_CODEGEN)
 
 

Makefile

@@ -7048,6 +7048,7 @@ LIBGRPCPP_CHANNELZ_SRC = \
     $(GENDIR)/src/proto/grpc/channelz/channelz.pb.cc $(GENDIR)/src/proto/grpc/channelz/channelz.grpc.pb.cc \
 
 PUBLIC_HEADERS_CXX += \
+    include/grpcpp/ext/channelz_service_plugin.h \
 
 LIBGRPCPP_CHANNELZ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPCPP_CHANNELZ_SRC))))
 

build.yaml

@@ -1854,9 +1854,10 @@ libs:
 - name: grpcpp_channelz
   build: all
   language: c++
+  public_headers:
+  - include/grpcpp/ext/channelz_service_plugin.h
   headers:
   - src/cpp/server/channelz/channelz_service.h
-  - src/cpp/server/channelz/channelz_service_plugin.h
   src:
   - src/cpp/server/channelz/channelz_service.cc
   - src/cpp/server/channelz/channelz_service_plugin.cc

include/grpcpp/ext/channelz_service_plugin.h

@@ -29,7 +29,10 @@
 
 namespace grpc {
 namespace channelz {
+namespace experimental {
 
+// This plugin is experimental for now. Track progress in
+// https://github.com/grpc/grpc/issues/15988.
 class ChannelzServicePlugin : public ::grpc::ServerBuilderPlugin {
  public:
   ChannelzServicePlugin();
@@ -48,6 +51,7 @@ class ChannelzServicePlugin : public ::grpc::ServerBuilderPlugin {
 /// be called at static initialization time.
 void InitChannelzServerBuilderPlugin();
 
+}  // namespace experimental
 }  // namespace channelz
 }  // namespace grpc
 

src/cpp/server/channelz/channelz_service_plugin.cc

@@ -18,8 +18,7 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/cpp/server/channelz/channelz_service_plugin.h"
-
+#include <grpcpp/ext/channelz_service_plugin.h>
 #include <grpcpp/impl/server_builder_plugin.h>
 #include <grpcpp/impl/server_initializer.h>
 #include <grpcpp/server.h>
@@ -28,6 +27,7 @@
 
 namespace grpc {
 namespace channelz {
+namespace experimental {
 
 ChannelzServicePlugin::ChannelzServicePlugin()
     : channelz_service_(new grpc::ChannelzService()) {}
@@ -78,5 +78,6 @@ struct StaticChannelServicePluginInitializer {
   }
 } static_channelz_service_plugin_initializer;
 
+}  // namespace experimental
 }  // namespace channelz
 }  // namespace grpc

test/cpp/end2end/channelz_service_test.cc

@@ -28,7 +28,7 @@
 #include <grpcpp/server_builder.h>
 #include <grpcpp/server_context.h>
 
-#include "src/cpp/server/channelz/channelz_service_plugin.h"
+#include <grpcpp/ext/channelz_service_plugin.h>
 #include "src/proto/grpc/channelz/channelz.grpc.pb.h"
 #include "src/proto/grpc/testing/echo.grpc.pb.h"
 #include "test/core/util/port.h"
@@ -179,7 +179,7 @@ class ChannelzServerTest : public ::testing::Test {
   std::vector<BackendData> backends_;
 
   // ensure channel server is linked in.
-  channelz::ChannelzServicePlugin plugin_;
+  channelz::experimental::ChannelzServicePlugin plugin_;
 };
 
 TEST_F(ChannelzServerTest, BasicTest) {

tools/run_tests/generated/sources_and_headers.json

@@ -7556,17 +7556,17 @@
       "grpcpp_channelz_proto"
     ], 
     "headers": [
-      "src/cpp/server/channelz/channelz_service.h", 
-      "src/cpp/server/channelz/channelz_service_plugin.h"
+      "include/grpcpp/ext/channelz_service_plugin.h", 
+      "src/cpp/server/channelz/channelz_service.h"
     ], 
     "is_filegroup": false, 
     "language": "c++", 
     "name": "grpcpp_channelz", 
     "src": [
+      "include/grpcpp/ext/channelz_service_plugin.h", 
       "src/cpp/server/channelz/channelz_service.cc", 
       "src/cpp/server/channelz/channelz_service.h", 
-      "src/cpp/server/channelz/channelz_service_plugin.cc", 
-      "src/cpp/server/channelz/channelz_service_plugin.h"
+      "src/cpp/server/channelz/channelz_service_plugin.cc"
     ], 
     "third_party": false, 
     "type": "lib"