Restructure heirarchy

3 files changed, 76 insertions, 75 deletions

diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc
index 4dc2ee3f55..6f0bfa06d2 100644
--- a/test/core/channel/channel_stack_test.cc
+++ b/test/core/channel/channel_stack_test.cc
@@ -125,7 +125,6 @@ static void test_create_channel_stack(void) {
       GRPC_MILLIS_INF_FUTURE,       /* deadline */
       nullptr,                      /* arena */
       nullptr,                      /* call_combiner */
-      nullptr                       /* call */
   };
   grpc_error* error =
       grpc_call_stack_init(channel_stack, 1, free_call, call_stack, &args);
diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc
index 703a9e457f..3d6aff03eb 100644
--- a/test/core/channel/channel_trace_test.cc
+++ b/test/core/channel/channel_trace_test.cc
@@ -160,14 +160,14 @@ TEST_P(ChannelTracerTest, ComplexTest) {
       ChannelTrace::Severity::Info,
       grpc_slice_from_static_string("subchannel one created"), sc1);
   ValidateChannelTrace(&tracer, 3, GetParam());
-  AddSimpleTrace(sc1->trace());
-  AddSimpleTrace(sc1->trace());
-  AddSimpleTrace(sc1->trace());
-  ValidateChannelTrace(sc1->trace(), 3, GetParam());
-  AddSimpleTrace(sc1->trace());
-  AddSimpleTrace(sc1->trace());
-  AddSimpleTrace(sc1->trace());
-  ValidateChannelTrace(sc1->trace(), 6, GetParam());
+  AddSimpleTrace(sc1->counter_and_tracer()->trace());
+  AddSimpleTrace(sc1->counter_and_tracer()->trace());
+  AddSimpleTrace(sc1->counter_and_tracer()->trace());
+  ValidateChannelTrace(sc1->counter_and_tracer()->trace(), 3, GetParam());
+  AddSimpleTrace(sc1->counter_and_tracer()->trace());
+  AddSimpleTrace(sc1->counter_and_tracer()->trace());
+  AddSimpleTrace(sc1->counter_and_tracer()->trace());
+  ValidateChannelTrace(sc1->counter_and_tracer()->trace(), 6, GetParam());
   AddSimpleTrace(&tracer);
   AddSimpleTrace(&tracer);
   ValidateChannelTrace(&tracer, 5, GetParam());
@@ -191,55 +191,53 @@ TEST_P(ChannelTracerTest, ComplexTest) {
   sc2.reset(nullptr);
 }
 
-// // Test a case in which the parent channel has subchannels and the
-// subchannels
-// // have connections. Ensures that everything lives as long as it should then
-// // gets deleted.
-// TEST_P(ChannelTracerTest, TestNesting) {
-//   grpc_core::ExecCtx exec_ctx;
-//   ChannelTrace tracer(GetParam());
-//   AddSimpleTrace(&tracer);
-//   AddSimpleTrace(&tracer);
-//   ValidateChannelTrace(&tracer, 2, GetParam());
-//   ChannelFixture channel1(GetParam());
-//   RefCountedPtr<ChannelNode> sc1 =
-//       MakeRefCounted<ChannelNode>(channel1.channel(), GetParam(), true);
-//   tracer.AddTraceEventReferencingChannel(
-//       ChannelTrace::Severity::Info,
-//       grpc_slice_from_static_string("subchannel one created"), sc1);
-//   ValidateChannelTrace(&tracer, 3, GetParam());
-//   AddSimpleTrace(sc1->trace());
-//   ChannelFixture channel2(GetParam());
-//   RefCountedPtr<ChannelNode> conn1 =
-//       MakeRefCounted<ChannelNode>(channel2.channel(), GetParam(), true);
-//   // nesting one level deeper.
-//   sc1->trace()->AddTraceEventReferencingChannel(
-//       ChannelTrace::Severity::Info,
-//       grpc_slice_from_static_string("connection one created"), conn1);
-//   ValidateChannelTrace(&tracer, 3, GetParam());
-//   AddSimpleTrace(conn1->trace());
-//   AddSimpleTrace(&tracer);
-//   AddSimpleTrace(&tracer);
-//   ValidateChannelTrace(&tracer, 5, GetParam());
-//   ValidateChannelTrace(conn1->trace(), 1, GetParam());
-//   ChannelFixture channel3(GetParam());
-//   RefCountedPtr<ChannelNode> sc2 =
-//       MakeRefCounted<ChannelNode>(channel3.channel(), GetParam(), true);
-//   tracer.AddTraceEventReferencingChannel(
-//       ChannelTrace::Severity::Info,
-//       grpc_slice_from_static_string("subchannel two created"), sc2);
-//   // this trace should not get added to the parents children since it is
-//   already
-//   // present in the tracer.
-//   tracer.AddTraceEventReferencingChannel(
-//       ChannelTrace::Severity::Warning,
-//       grpc_slice_from_static_string("subchannel one inactive"), sc1);
-//   AddSimpleTrace(&tracer);
-//   ValidateChannelTrace(&tracer, 8, GetParam());
-//   sc1.reset(nullptr);
-//   sc2.reset(nullptr);
-//   conn1.reset(nullptr);
-// }
+// Test a case in which the parent channel has subchannels and the subchannels
+// have connections. Ensures that everything lives as long as it should then
+// gets deleted.
+TEST_P(ChannelTracerTest, TestNesting) {
+  grpc_core::ExecCtx exec_ctx;
+  ChannelTrace tracer(GetParam());
+  AddSimpleTrace(&tracer);
+  AddSimpleTrace(&tracer);
+  ValidateChannelTrace(&tracer, 2, GetParam());
+  ChannelFixture channel1(GetParam());
+  RefCountedPtr<ChannelNode> sc1 =
+      MakeRefCounted<ChannelNode>(channel1.channel(), GetParam(), true);
+  tracer.AddTraceEventReferencingChannel(
+      ChannelTrace::Severity::Info,
+      grpc_slice_from_static_string("subchannel one created"), sc1);
+  ValidateChannelTrace(&tracer, 3, GetParam());
+  AddSimpleTrace(sc1->counter_and_tracer()->trace());
+  ChannelFixture channel2(GetParam());
+  RefCountedPtr<ChannelNode> conn1 =
+      MakeRefCounted<ChannelNode>(channel2.channel(), GetParam(), true);
+  // nesting one level deeper.
+  sc1->counter_and_tracer()->trace()->AddTraceEventReferencingChannel(
+      ChannelTrace::Severity::Info,
+      grpc_slice_from_static_string("connection one created"), conn1);
+  ValidateChannelTrace(&tracer, 3, GetParam());
+  AddSimpleTrace(conn1->counter_and_tracer()->trace());
+  AddSimpleTrace(&tracer);
+  AddSimpleTrace(&tracer);
+  ValidateChannelTrace(&tracer, 5, GetParam());
+  ValidateChannelTrace(conn1->counter_and_tracer()->trace(), 1, GetParam());
+  ChannelFixture channel3(GetParam());
+  RefCountedPtr<ChannelNode> sc2 =
+      MakeRefCounted<ChannelNode>(channel3.channel(), GetParam(), true);
+  tracer.AddTraceEventReferencingChannel(
+      ChannelTrace::Severity::Info,
+      grpc_slice_from_static_string("subchannel two created"), sc2);
+  // this trace should not get added to the parents children since it is already
+  // present in the tracer.
+  tracer.AddTraceEventReferencingChannel(
+      ChannelTrace::Severity::Warning,
+      grpc_slice_from_static_string("subchannel one inactive"), sc1);
+  AddSimpleTrace(&tracer);
+  ValidateChannelTrace(&tracer, 8, GetParam());
+  sc1.reset(nullptr);
+  sc2.reset(nullptr);
+  conn1.reset(nullptr);
+}
 
 INSTANTIATE_TEST_CASE_P(ChannelTracerTestSweep, ChannelTracerTest,
                         ::testing::Values(0, 1, 2, 6, 10, 15));
diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc
index 9f3756c182..5e9a3f89a2 100644
--- a/test/core/channel/channelz_test.cc
+++ b/test/core/channel/channelz_test.cc
@@ -201,16 +201,16 @@ TEST_P(ChannelzChannelTest, BasicChannelAPIFunctionality) {
   ChannelFixture channel(GetParam());
   ChannelNode* channelz_channel =
       grpc_channel_get_channelz_node(channel.channel());
-  channelz_channel->RecordCallStarted();
-  channelz_channel->RecordCallFailed();
-  channelz_channel->RecordCallSucceeded();
+  channelz_channel->counter_and_tracer()->RecordCallStarted();
+  channelz_channel->counter_and_tracer()->RecordCallFailed();
+  channelz_channel->counter_and_tracer()->RecordCallSucceeded();
   ValidateChannel(channelz_channel, {1, 1, 1});
-  channelz_channel->RecordCallStarted();
-  channelz_channel->RecordCallFailed();
-  channelz_channel->RecordCallSucceeded();
-  channelz_channel->RecordCallStarted();
-  channelz_channel->RecordCallFailed();
-  channelz_channel->RecordCallSucceeded();
+  channelz_channel->counter_and_tracer()->RecordCallStarted();
+  channelz_channel->counter_and_tracer()->RecordCallFailed();
+  channelz_channel->counter_and_tracer()->RecordCallSucceeded();
+  channelz_channel->counter_and_tracer()->RecordCallStarted();
+  channelz_channel->counter_and_tracer()->RecordCallFailed();
+  channelz_channel->counter_and_tracer()->RecordCallSucceeded();
   ValidateChannel(channelz_channel, {3, 3, 3});
 }
 
@@ -220,23 +220,27 @@ TEST_P(ChannelzChannelTest, LastCallStartedMillis) {
   ChannelNode* channelz_channel =
       grpc_channel_get_channelz_node(channel.channel());
   // start a call to set the last call started timestamp
-  channelz_channel->RecordCallStarted();
-  grpc_millis millis1 = GetLastCallStartedMillis(channelz_channel);
+  channelz_channel->counter_and_tracer()->RecordCallStarted();
+  grpc_millis millis1 =
+      GetLastCallStartedMillis(channelz_channel->counter_and_tracer());
   // time gone by should not affect the timestamp
   ChannelzSleep(100);
-  grpc_millis millis2 = GetLastCallStartedMillis(channelz_channel);
+  grpc_millis millis2 =
+      GetLastCallStartedMillis(channelz_channel->counter_and_tracer());
   EXPECT_EQ(millis1, millis2);
   // calls succeeded or failed should not affect the timestamp
   ChannelzSleep(100);
-  channelz_channel->RecordCallFailed();
-  channelz_channel->RecordCallSucceeded();
-  grpc_millis millis3 = GetLastCallStartedMillis(channelz_channel);
+  channelz_channel->counter_and_tracer()->RecordCallFailed();
+  channelz_channel->counter_and_tracer()->RecordCallSucceeded();
+  grpc_millis millis3 =
+      GetLastCallStartedMillis(channelz_channel->counter_and_tracer());
   EXPECT_EQ(millis1, millis3);
   // another call started should affect the timestamp
   // sleep for extra long to avoid flakes (since we cache Now())
   ChannelzSleep(5000);
-  channelz_channel->RecordCallStarted();
-  grpc_millis millis4 = GetLastCallStartedMillis(channelz_channel);
+  channelz_channel->counter_and_tracer()->RecordCallStarted();
+  grpc_millis millis4 =
+      GetLastCallStartedMillis(channelz_channel->counter_and_tracer());
   EXPECT_NE(millis1, millis4);
 }