reviewer feedback

3 files changed, 11 insertions, 32 deletions

diff --git a/src/core/ext/filters/client_channel/client_channel_channelz.h b/src/core/ext/filters/client_channel/client_channel_channelz.h
index 45df756b91..1bc555448c 100644
--- a/src/core/ext/filters/client_channel/client_channel_channelz.h
+++ b/src/core/ext/filters/client_channel/client_channel_channelz.h
@@ -45,20 +45,17 @@ class ClientChannelNode : public ChannelNode {
       grpc_channel* channel, size_t channel_tracer_max_nodes,
       bool is_top_level_channel);
 
+  ClientChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes,
+                    bool is_top_level_channel);
+  virtual ~ClientChannelNode() {}
+
   grpc_json* RenderJson() override;
 
   // Helper to create a channel arg to ensure this type of ChannelNode is
   // created.
   static grpc_arg CreateChannelArg();
 
- protected:
-  ClientChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes,
-                    bool is_top_level_channel);
-  virtual ~ClientChannelNode() {}
-
  private:
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_NEW
   grpc_channel_element* client_channel_;
 
   // helpers
@@ -80,9 +77,6 @@ class SubchannelNode : public CallCountingAndTracingNode {
   grpc_json* RenderJson() override;
 
  private:
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_NEW
-  intptr_t subchannel_uuid_;
   grpc_subchannel* subchannel_;
   UniquePtr<char> target_;
 
diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc
index eec2cd61b2..4fbc441c0a 100644
--- a/src/core/lib/channel/channelz.cc
+++ b/src/core/lib/channel/channelz.cc
@@ -41,9 +41,8 @@
 namespace grpc_core {
 namespace channelz {
 
-BaseNode::BaseNode(EntityType type) : type_(type) {
-  uuid_ = ChannelzRegistry::Register(this);
-}
+BaseNode::BaseNode(EntityType type)
+    : type_(type), uuid_(ChannelzRegistry::Register(this)) {}
 
 BaseNode::~BaseNode() { ChannelzRegistry::Unregister(uuid_); }
 
diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h
index 67cd1fec2d..5496163fb9 100644
--- a/src/core/lib/channel/channelz.h
+++ b/src/core/lib/channel/channelz.h
@@ -74,11 +74,9 @@ class BaseNode : public RefCounted<BaseNode> {
   intptr_t uuid() const { return uuid_; }
 
  private:
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_NEW
   friend class ChannelTrace;
   EntityType type_;
-  intptr_t uuid_;
+  const intptr_t uuid_;
 };
 
 // This class is the parent for the channelz entities that deal with Channels
@@ -109,9 +107,6 @@ class CallCountingAndTracingNode : public BaseNode {
   void PopulateCallData(grpc_json* json);
 
  private:
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_NEW
-
   // testing peer friend.
   friend class testing::CallCountingAndTracingNodePeer;
 
@@ -129,6 +124,10 @@ class ChannelNode : public CallCountingAndTracingNode {
       grpc_channel* channel, size_t channel_tracer_max_nodes,
       bool is_top_level_channel);
 
+  ChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes,
+              bool is_top_level_channel);
+  ~ChannelNode() override;
+
   grpc_json* RenderJson() override;
 
   void MarkChannelDestroyed() {
@@ -139,19 +138,12 @@ class ChannelNode : public CallCountingAndTracingNode {
   bool ChannelIsDestroyed() { return channel_ == nullptr; }
 
  protected:
-  ChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes,
-              bool is_top_level_channel);
-  ~ChannelNode() override;
   // provides view of target for child.
   char* target_view() { return target_.get(); }
 
  private:
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_NEW
-
   grpc_channel* channel_ = nullptr;
   UniquePtr<char> target_;
-  intptr_t channel_uuid_;
 };
 
 // Handles channelz bookkeeping for servers
@@ -162,10 +154,6 @@ class ServerNode : public CallCountingAndTracingNode {
       : CallCountingAndTracingNode(EntityType::kServer,
                                    channel_tracer_max_nodes) {}
   ~ServerNode() override {}
-
- private:
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_NEW
 };
 
 // Handles channelz bookkeeping for sockets
@@ -176,8 +164,6 @@ class SocketNode : public BaseNode {
   ~SocketNode() override {}
 
  private:
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_DELETE
-  GPRC_ALLOW_CLASS_TO_USE_NON_PUBLIC_NEW
 };
 
 // Creation functions