Reviewer feedback

2 files changed, 3 insertions, 17 deletions

diff --git a/src/core/lib/channel/channelz.cc b/src/core/lib/channel/channelz.cc
index 40c0932f3f..3550fc0551 100644
--- a/src/core/lib/channel/channelz.cc
+++ b/src/core/lib/channel/channelz.cc
@@ -89,14 +89,9 @@ grpc_json* add_num_str(grpc_json* parent, grpc_json* it, const char* name,
 
 }  // namespace
 
-ChannelNode::ChannelNode(bool enabled, grpc_channel* channel,
-                         size_t channel_tracer_max_nodes)
-    : enabled_(enabled),
-      channel_(channel),
-      target_(nullptr),
-      channel_uuid_(-1) {
+ChannelNode::ChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes)
+    : channel_(channel), target_(nullptr), channel_uuid_(-1) {
   trace_.Init(channel_tracer_max_nodes);
-  if (!enabled_) return;
   target_ = UniquePtr<char>(grpc_channel_get_target(channel_));
   channel_uuid_ = ChannelzRegistry::Register(this);
   gpr_atm_no_barrier_store(&last_call_started_millis_,
@@ -105,12 +100,10 @@ ChannelNode::ChannelNode(bool enabled, grpc_channel* channel,
 
 ChannelNode::~ChannelNode() {
   trace_.Destroy();
-  if (!enabled_) return;
   ChannelzRegistry::Unregister(channel_uuid_);
 }
 
 void ChannelNode::RecordCallStarted() {
-  if (!enabled_) return;
   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());
@@ -125,7 +118,6 @@ grpc_connectivity_state ChannelNode::GetConnectivityState() {
 }
 
 char* ChannelNode::RenderJSON() {
-  if (!enabled_) return nullptr;
   // 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 3352daccd0..2aad1e82f4 100644
--- a/src/core/lib/channel/channelz.h
+++ b/src/core/lib/channel/channelz.h
@@ -40,17 +40,14 @@ class ChannelNodePeer;
 
 class ChannelNode : public RefCounted<ChannelNode> {
  public:
-  ChannelNode(bool enabled, grpc_channel* channel,
-              size_t channel_tracer_max_nodes);
+  ChannelNode(grpc_channel* channel, size_t channel_tracer_max_nodes);
   ~ChannelNode();
 
   void RecordCallStarted();
   void RecordCallFailed() {
-    if (!enabled_) return;
     gpr_atm_no_barrier_fetch_add(&calls_failed_, (gpr_atm(1)));
   }
   void RecordCallSucceeded() {
-    if (!enabled_) return;
     gpr_atm_no_barrier_fetch_add(&calls_succeeded_, (gpr_atm(1)));
   }
 
@@ -59,7 +56,6 @@ class ChannelNode : public RefCounted<ChannelNode> {
   ChannelTrace* trace() { return trace_.get(); }
 
   void set_channel_destroyed() {
-    if (!enabled_) return;
     GPR_ASSERT(channel_ != nullptr);
     channel_ = nullptr;
   }
@@ -73,8 +69,6 @@ class ChannelNode : public RefCounted<ChannelNode> {
   // helper for getting connectivity state.
   grpc_connectivity_state GetConnectivityState();
 
-  // Not owned. Will be set to nullptr when the channel is destroyed.
-  const bool enabled_;
   grpc_channel* channel_ = nullptr;
   UniquePtr<char> target_;
   gpr_atm calls_started_ = 0;