1 files changed, 12 insertions, 13 deletions
diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc
index 9bc9dde8d6..3f5aa85c8c 100644
--- a/test/core/channel/channel_trace_test.cc
+++ b/test/core/channel/channel_trace_test.cc
@@ -89,7 +89,6 @@ void ValidateChannelTrace(ChannelTrace* tracer,
   grpc_json* json = tracer->RenderJson();
   EXPECT_NE(json, nullptr);
   char* json_str = grpc_json_dump_to_string(json, 0);
-  gpr_log(GPR_ERROR, "%s", json_str);
   grpc_json_destroy(json);
   grpc::testing::ValidateChannelTraceProtoJsonTranslation(json_str);
   grpc_json* parsed_json = grpc_json_parse_string(json_str);
@@ -161,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->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(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(&tracer);
   AddSimpleTrace(&tracer);
   ValidateChannelTrace(&tracer, 5, GetParam());
@@ -208,20 +207,20 @@ TEST_P(ChannelTracerTest, TestNesting) {
       ChannelTrace::Severity::Info,
       grpc_slice_from_static_string("subchannel one created"), sc1);
   ValidateChannelTrace(&tracer, 3, GetParam());
-  AddSimpleTrace(sc1->counter_and_tracer()->trace());
+  AddSimpleTrace(sc1->trace());
   ChannelFixture channel2(GetParam());
   RefCountedPtr<ChannelNode> conn1 =
       MakeRefCounted<ChannelNode>(channel2.channel(), GetParam(), true);
   // nesting one level deeper.
-  sc1->counter_and_tracer()->trace()->AddTraceEventWithReference(
+  sc1->trace()->AddTraceEventWithReference(
       ChannelTrace::Severity::Info,
       grpc_slice_from_static_string("connection one created"), conn1);
   ValidateChannelTrace(&tracer, 3, GetParam());
-  AddSimpleTrace(conn1->counter_and_tracer()->trace());
+  AddSimpleTrace(conn1->trace());
   AddSimpleTrace(&tracer);
   AddSimpleTrace(&tracer);
   ValidateChannelTrace(&tracer, 5, GetParam());
-  ValidateChannelTrace(conn1->counter_and_tracer()->trace(), 1, GetParam());
+  ValidateChannelTrace(conn1->trace(), 1, GetParam());
   ChannelFixture channel3(GetParam());
   RefCountedPtr<ChannelNode> sc2 =
       MakeRefCounted<ChannelNode>(channel3.channel(), GetParam(), true);