Rename channelz Channel to ChannelNode

8 files changed, 36 insertions, 35 deletions

diff --git a/src/core/lib/channel/channel_trace.cc b/src/core/lib/channel/channel_trace.cc
index 4c29df42f4..0f655d8716 100644
--- a/src/core/lib/channel/channel_trace.cc
+++ b/src/core/lib/channel/channel_trace.cc
@@ -41,9 +41,9 @@
 namespace grpc_core {
 namespace channelz {
 
-ChannelTrace::TraceEvent::TraceEvent(Severity severity, grpc_slice data,
-                                     RefCountedPtr<Channel> referenced_channel,
-                                     ReferencedType type)
+ChannelTrace::TraceEvent::TraceEvent(
+    Severity severity, grpc_slice data,
+    RefCountedPtr<ChannelNode> referenced_channel, ReferencedType type)
     : severity_(severity),
       data_(data),
       timestamp_(grpc_millis_to_timespec(grpc_core::ExecCtx::Get()->Now(),
@@ -112,7 +112,7 @@ void ChannelTrace::AddTraceEvent(Severity severity, grpc_slice data) {
 
 void ChannelTrace::AddTraceEventReferencingChannel(
     Severity severity, grpc_slice data,
-    RefCountedPtr<Channel> referenced_channel) {
+    RefCountedPtr<ChannelNode> referenced_channel) {
   if (max_list_size_ == 0) return;  // tracing is disabled if max_events == 0
   // create and fill up the new event
   AddTraceEventHelper(New<TraceEvent>(
@@ -121,7 +121,7 @@ void ChannelTrace::AddTraceEventReferencingChannel(
 
 void ChannelTrace::AddTraceEventReferencingSubchannel(
     Severity severity, grpc_slice data,
-    RefCountedPtr<Channel> referenced_subchannel) {
+    RefCountedPtr<ChannelNode> referenced_subchannel) {
   if (max_list_size_ == 0) return;  // tracing is disabled if max_events == 0
   // create and fill up the new event
   AddTraceEventHelper(New<TraceEvent>(severity, data,
diff --git a/src/core/lib/channel/channel_trace.h b/src/core/lib/channel/channel_trace.h
index f6021c3224..0dd162a777 100644
--- a/src/core/lib/channel/channel_trace.h
+++ b/src/core/lib/channel/channel_trace.h
@@ -30,7 +30,7 @@
 namespace grpc_core {
 namespace channelz {
 
-class Channel;
+class ChannelNode;
 
 // Object used to hold live data for a channel. This data is exposed via the
 // channelz service:
@@ -64,10 +64,10 @@ class ChannelTrace {
   // slice.
   void AddTraceEventReferencingChannel(
       Severity severity, grpc_slice data,
-      RefCountedPtr<Channel> referenced_channel);
+      RefCountedPtr<ChannelNode> referenced_channel);
   void AddTraceEventReferencingSubchannel(
       Severity severity, grpc_slice data,
-      RefCountedPtr<Channel> referenced_subchannel);
+      RefCountedPtr<ChannelNode> referenced_subchannel);
 
   // Creates and returns the raw grpc_json object, so a parent channelz
   // object may incorporate the json before rendering.
@@ -82,7 +82,8 @@ class ChannelTrace {
    public:
     // Constructor for a TraceEvent that references a different channel.
     TraceEvent(Severity severity, grpc_slice data,
-               RefCountedPtr<Channel> referenced_channel, ReferencedType type);
+               RefCountedPtr<ChannelNode> referenced_channel,
+               ReferencedType type);
 
     // Constructor for a TraceEvent that does not reverence a different
     // channel.
@@ -104,7 +105,7 @@ class ChannelTrace {
     gpr_timespec timestamp_;
     TraceEvent* next_;
     // the tracer object for the (sub)channel that this trace event refers to.
-    RefCountedPtr<Channel> referenced_channel_;
+    RefCountedPtr<ChannelNode> referenced_channel_;
     // the type that the referenced tracer points to. Unused if this trace
     // does not point to any channel or subchannel
     ReferencedType referenced_type_;
diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc
index 42b169dffd..799eb8bed1 100644
--- a/src/core/lib/channel/channelz.cc
+++ b/src/core/lib/channel/channelz.cc
@@ -89,7 +89,7 @@ grpc_json* add_num_str(grpc_json* parent, grpc_json* it, const char* name,
 
 }  // namespace
 
-Channel::Channel(grpc_channel* channel, size_t channel_tracer_max_nodes)
+ChannelNode::ChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes)
     : channel_(channel),
       target_(UniquePtr<char>(grpc_channel_get_target(channel_))),
       channel_uuid_(ChannelzRegistry::Register(this)) {
@@ -98,18 +98,18 @@ Channel::Channel(grpc_channel* channel, size_t channel_tracer_max_nodes)
                            (gpr_atm)ExecCtx::Get()->Now());
 }
 
-Channel::~Channel() {
+ChannelNode::~ChannelNode() {
   trace_.Destroy();
   ChannelzRegistry::Unregister(channel_uuid_);
 }
 
-void Channel::RecordCallStarted() {
+void ChannelNode::RecordCallStarted() {
   gpr_atm_no_barrier_fetch_add(&calls_started_, (gpr_atm)1);
   gpr_atm_no_barrier_store(&last_call_started_millis_,
                            (gpr_atm)ExecCtx::Get()->Now());
 }
 
-grpc_connectivity_state Channel::GetConnectivityState() {
+grpc_connectivity_state ChannelNode::GetConnectivityState() {
   if (channel_ == nullptr) {
     return GRPC_CHANNEL_SHUTDOWN;
   } else {
@@ -117,7 +117,7 @@ grpc_connectivity_state Channel::GetConnectivityState() {
   }
 }
 
-char* Channel::RenderJSON() {
+char* ChannelNode::RenderJSON() {
   // We need to track these three json objects to build our object
   grpc_json* top_level_json = grpc_json_create(GRPC_JSON_OBJECT);
   grpc_json* json = top_level_json;
diff --git a/src/core/lib/channel/channelz.h b/src/core/lib/channel/channelz.h
index 68b7c8d26b..62dc817b6a 100644
--- a/src/core/lib/channel/channelz.h
+++ b/src/core/lib/channel/channelz.h
@@ -35,13 +35,13 @@ namespace grpc_core {
 namespace channelz {
 
 namespace testing {
-class ChannelPeer;
+class ChannelNodePeer;
 }
 
-class Channel : public RefCounted<Channel> {
+class ChannelNode : public RefCounted<ChannelNode> {
  public:
-  Channel(grpc_channel* channel, size_t channel_tracer_max_nodes);
-  ~Channel();
+  ChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes);
+  ~ChannelNode();
 
   void RecordCallStarted();
   void RecordCallFailed() {
@@ -64,7 +64,7 @@ class Channel : public RefCounted<Channel> {
 
  private:
   // testing peer friend.
-  friend class testing::ChannelPeer;
+  friend class testing::ChannelNodePeer;
 
   // helper for getting connectivity state.
   grpc_connectivity_state GetConnectivityState();
diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc
index 65071672f2..33b9908a57 100644
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@@ -478,7 +478,7 @@ grpc_error* grpc_call_create(const grpc_call_create_args* args,
                                                &call->pollent);
   }
 
-  grpc_core::channelz::Channel* channelz_channel =
+  grpc_core::channelz::ChannelNode* channelz_channel =
       grpc_channel_get_channelz_node(call->channel);
   channelz_channel->RecordCallStarted();
 
@@ -1260,7 +1260,7 @@ static void post_batch_completion(batch_control* bctl) {
                        call->final_op.server.cancelled, nullptr, nullptr);
     }
 
-    grpc_core::channelz::Channel* channelz_channel =
+    grpc_core::channelz::ChannelNode* channelz_channel =
         grpc_channel_get_channelz_node(call->channel);
     if (*call->final_op.client.status != GRPC_STATUS_OK) {
       channelz_channel->RecordCallFailed();
diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
index d2b52dad2f..7dcfbc97cc 100644
--- a/src/core/lib/surface/channel.cc
+++ b/src/core/lib/surface/channel.cc
@@ -67,7 +67,7 @@ struct grpc_channel {
   gpr_mu registered_call_mu;
   registered_call* registered_calls;
 
-  grpc_core::RefCountedPtr<grpc_core::channelz::Channel> channelz_channel;
+  grpc_core::RefCountedPtr<grpc_core::channelz::ChannelNode> channelz_channel;
 
   char* target;
 };
@@ -147,7 +147,7 @@ grpc_channel* grpc_channel_create_with_builder(
 
   grpc_channel_args_destroy(args);
   channel->channelz_channel =
-      grpc_core::MakeRefCounted<grpc_core::channelz::Channel>(
+      grpc_core::MakeRefCounted<grpc_core::channelz::ChannelNode>(
           channel, channel_tracer_max_nodes);
   channel->channelz_channel->trace()->AddTraceEvent(
       grpc_core::channelz::ChannelTrace::Severity::Info,
@@ -190,7 +190,7 @@ char* grpc_channel_render_channelz(grpc_channel* channel) {
   return channel->channelz_channel->RenderJSON();
 }
 
-grpc_core::channelz::Channel* grpc_channel_get_channelz_node(
+grpc_core::channelz::ChannelNode* grpc_channel_get_channelz_node(
     grpc_channel* channel) {
   return channel->channelz_channel.get();
 }
diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h
index 6d2e1931e6..e5ff2c3596 100644
--- a/src/core/lib/surface/channel.h
+++ b/src/core/lib/surface/channel.h
@@ -51,7 +51,7 @@ grpc_call* grpc_channel_create_pollset_set_call(
 /** Get a (borrowed) pointer to this channels underlying channel stack */
 grpc_channel_stack* grpc_channel_get_channel_stack(grpc_channel* channel);
 
-grpc_core::channelz::Channel* grpc_channel_get_channelz_node(
+grpc_core::channelz::ChannelNode* grpc_channel_get_channelz_node(
     grpc_channel* channel);
 
 /** Get a grpc_mdelem of grpc-status: X where X is the numeric value of
diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc
index 262ca38ee0..8ef91c3b09 100644
--- a/test/core/channel/channelz_test.cc
+++ b/test/core/channel/channelz_test.cc
@@ -44,16 +44,16 @@ namespace channelz {
 namespace testing {
 
 // testing peer to access channel internals
-class ChannelPeer {
+class ChannelNodePeer {
  public:
-  ChannelPeer(Channel* channel) : channel_(channel) {}
+  ChannelNodePeer(ChannelNode* channel) : channel_(channel) {}
   grpc_millis last_call_started_millis() {
     return (grpc_millis)gpr_atm_no_barrier_load(
         &channel_->last_call_started_millis_);
   }
 
  private:
-  Channel* channel_;
+  ChannelNode* channel_;
 };
 
 namespace {
@@ -111,15 +111,15 @@ void ValidateCounters(char* json_str, validate_channel_data_args args) {
   grpc_json_destroy(json);
 }
 
-void ValidateChannel(Channel* channel, validate_channel_data_args args) {
+void ValidateChannel(ChannelNode* channel, validate_channel_data_args args) {
   char* json_str = channel->RenderJSON();
   grpc::testing::ValidateChannelProtoJsonTranslation(json_str);
   ValidateCounters(json_str, args);
   gpr_free(json_str);
 }
 
-grpc_millis GetLastCallStartedMillis(Channel* channel) {
-  ChannelPeer peer(channel);
+grpc_millis GetLastCallStartedMillis(ChannelNode* channel) {
+  ChannelNodePeer peer(channel);
   return peer.last_call_started_millis();
 }
 
@@ -137,7 +137,7 @@ TEST_P(ChannelzChannelTest, BasicChannel) {
   grpc_core::ExecCtx exec_ctx;
   ChannelFixture channel(GetParam());
   intptr_t uuid = grpc_channel_get_uuid(channel.channel());
-  Channel* channelz_channel = ChannelzRegistry::Get<Channel>(uuid);
+  ChannelNode* channelz_channel = ChannelzRegistry::Get<ChannelNode>(uuid);
   char* json_str = channelz_channel->RenderJSON();
   ValidateCounters(json_str, {0, 0, 0});
   gpr_free(json_str);
@@ -147,7 +147,7 @@ TEST_P(ChannelzChannelTest, BasicChannelAPIFunctionality) {
   grpc_core::ExecCtx exec_ctx;
   ChannelFixture channel(GetParam());
   intptr_t uuid = grpc_channel_get_uuid(channel.channel());
-  Channel* channelz_channel = ChannelzRegistry::Get<Channel>(uuid);
+  ChannelNode* channelz_channel = ChannelzRegistry::Get<ChannelNode>(uuid);
   channelz_channel->RecordCallStarted();
   channelz_channel->RecordCallFailed();
   channelz_channel->RecordCallSucceeded();
@@ -165,7 +165,7 @@ TEST_P(ChannelzChannelTest, LastCallStartedMillis) {
   grpc_core::ExecCtx exec_ctx;
   ChannelFixture channel(GetParam());
   intptr_t uuid = grpc_channel_get_uuid(channel.channel());
-  Channel* channelz_channel = ChannelzRegistry::Get<Channel>(uuid);
+  ChannelNode* channelz_channel = ChannelzRegistry::Get<ChannelNode>(uuid);
   // start a call to set the last call started timestamp
   channelz_channel->RecordCallStarted();
   grpc_millis millis1 = GetLastCallStartedMillis(channelz_channel);