Restructure heirarchy

4 files changed, 16 insertions, 17 deletions

diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc
index 13a0b95511..683cb0e01d 100644
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@@ -3094,7 +3094,6 @@ static grpc_error* cc_init_call_elem(grpc_call_element* elem,
   calld->arena = args->arena;
   calld->owning_call = args->call_stack;
   calld->call_combiner = args->call_combiner;
-  calld->call = args->call;
   if (GPR_LIKELY(chand->deadline_checking_enabled)) {
     grpc_deadline_state_init(elem, args->call_stack, args->call_combiner,
                              calld->deadline);
diff --git a/src/core/ext/filters/client_channel/client_channel_channelz.cc b/src/core/ext/filters/client_channel/client_channel_channelz.cc
index 996a871f38..b209acc2ea 100644
--- a/src/core/ext/filters/client_channel/client_channel_channelz.cc
+++ b/src/core/ext/filters/client_channel/client_channel_channelz.cc
@@ -124,8 +124,8 @@ grpc_json* ClientChannelNode::RenderJson() {
   grpc_json_create_child(nullptr, json, "target", target_view(),
                          GRPC_JSON_STRING, false);
   // as CallCountingAndTracingNode to populate trace and call count data.
-  PopulateTrace(json);
-  PopulateCallData(json);
+  counter_and_tracer()->PopulateTrace(json);
+  counter_and_tracer()->PopulateCallData(json);
   // reset to the top level
   json = top_level_json;
   PopulateChildRefs(json);
@@ -148,11 +148,11 @@ RefCountedPtr<ChannelNode> ClientChannelNode::MakeClientChannelNode(
 
 SubchannelNode::SubchannelNode(grpc_subchannel* subchannel,
                                size_t channel_tracer_max_nodes)
-    : CallCountingAndTracingNode(EntityType::kSubchannel,
-                                 channel_tracer_max_nodes),
+    : BaseNode(EntityType::kSubchannel),
       subchannel_(subchannel),
-      target_(UniquePtr<char>(
-          gpr_strdup(grpc_subchannel_get_target(subchannel_)))) {}
+      target_(
+          UniquePtr<char>(gpr_strdup(grpc_subchannel_get_target(subchannel_)))),
+      counter_and_tracer_(channel_tracer_max_nodes) {}
 
 SubchannelNode::~SubchannelNode() {}
 
@@ -192,8 +192,8 @@ grpc_json* SubchannelNode::RenderJson() {
   GPR_ASSERT(target_.get() != nullptr);
   grpc_json_create_child(nullptr, json, "target", target_.get(),
                          GRPC_JSON_STRING, false);
-  PopulateTrace(json);
-  PopulateCallData(json);
+  counter_and_tracer_.PopulateTrace(json);
+  counter_and_tracer_.PopulateCallData(json);
   return top_level_json;
 }
 
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 1bc555448c..f5344c049e 100644
--- a/src/core/ext/filters/client_channel/client_channel_channelz.h
+++ b/src/core/ext/filters/client_channel/client_channel_channelz.h
@@ -64,7 +64,7 @@ class ClientChannelNode : public ChannelNode {
 };
 
 // Handles channelz bookkeeping for sockets
-class SubchannelNode : public CallCountingAndTracingNode {
+class SubchannelNode : public BaseNode {
  public:
   SubchannelNode(grpc_subchannel* subchannel, size_t channel_tracer_max_nodes);
   ~SubchannelNode() override;
@@ -76,9 +76,14 @@ class SubchannelNode : public CallCountingAndTracingNode {
 
   grpc_json* RenderJson() override;
 
+  CallCountingAndTracingNode* counter_and_tracer() {
+    return &counter_and_tracer_;
+  }
+
  private:
   grpc_subchannel* subchannel_;
   UniquePtr<char> target_;
+  CallCountingAndTracingNode counter_and_tracer_;
 
   void PopulateConnectivityState(grpc_json* json);
 };
diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc
index a15cfd43c3..5894d52e6b 100644
--- a/src/core/ext/filters/client_channel/subchannel.cc
+++ b/src/core/ext/filters/client_channel/subchannel.cc
@@ -183,7 +183,7 @@ static void connection_destroy(void* arg, grpc_error* error) {
 static void subchannel_destroy(void* arg, grpc_error* error) {
   grpc_subchannel* c = static_cast<grpc_subchannel*>(arg);
   if (c->channelz_subchannel != nullptr) {
-    c->channelz_subchannel->trace()->AddTraceEvent(
+    c->channelz_subchannel->counter_and_tracer()->trace()->AddTraceEvent(
         grpc_core::channelz::ChannelTrace::Severity::Info,
         grpc_slice_from_static_string("Subchannel destroyed"));
     c->channelz_subchannel->MarkSubchannelDestroyed();
@@ -397,7 +397,7 @@ grpc_subchannel* grpc_subchannel_create(grpc_connector* connector,
     c->channelz_subchannel =
         grpc_core::MakeRefCounted<grpc_core::channelz::SubchannelNode>(
             c, channel_tracer_max_nodes);
-    c->channelz_subchannel->trace()->AddTraceEvent(
+    c->channelz_subchannel->counter_and_tracer()->trace()->AddTraceEvent(
         grpc_core::channelz::ChannelTrace::Severity::Info,
         grpc_slice_from_static_string("Subchannel created"));
   }
@@ -857,7 +857,6 @@ grpc_error* ConnectedSubchannel::CreateCall(const CallArgs& args,
       args.deadline,      /* deadline */
       args.arena,         /* arena */
       args.call_combiner, /* call_combiner */
-      args.call           /* call */
   };
   grpc_error* error = grpc_call_stack_init(
       channel_stack_, 1, subchannel_call_destroy, *call, &call_args);
@@ -866,10 +865,6 @@ grpc_error* ConnectedSubchannel::CreateCall(const CallArgs& args,
     gpr_log(GPR_ERROR, "error: %s", error_string);
     return error;
   }
-  if (channelz_subchannel_ != nullptr) {
-    channelz_subchannel_->RecordCallStarted();
-    grpc_call_set_channelz_subchannel(args.call, channelz_subchannel_);
-  }
   grpc_call_stack_set_pollset_or_pollset_set(callstk, args.pollent);
   return GRPC_ERROR_NONE;
 }