reviewer feedback, rename

23 files changed, 104 insertions, 101 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93d3b12962..651fb6bde9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -517,7 +517,7 @@ add_dependencies(buildtests_cxx bm_pollset)
 endif()
 add_dependencies(buildtests_cxx channel_arguments_test)
 add_dependencies(buildtests_cxx channel_filter_test)
-add_dependencies(buildtests_cxx channel_tracer_test)
+add_dependencies(buildtests_cxx channel_trace_test)
 add_dependencies(buildtests_cxx chttp2_settings_timeout_test)
 add_dependencies(buildtests_cxx cli_call_test)
 add_dependencies(buildtests_cxx client_channel_stress_test)
@@ -800,7 +800,7 @@ add_library(grpc
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_stack.cc
   src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_tracer.cc
+  src/core/lib/channel/channel_trace.cc
   src/core/lib/channel/connected_channel.cc
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
@@ -1144,7 +1144,7 @@ add_library(grpc_cronet
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_stack.cc
   src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_tracer.cc
+  src/core/lib/channel/channel_trace.cc
   src/core/lib/channel/connected_channel.cc
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
@@ -1475,7 +1475,7 @@ add_library(grpc_test_util
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_stack.cc
   src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_tracer.cc
+  src/core/lib/channel/channel_trace.cc
   src/core/lib/channel/connected_channel.cc
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
@@ -1767,7 +1767,7 @@ add_library(grpc_test_util_unsecure
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_stack.cc
   src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_tracer.cc
+  src/core/lib/channel/channel_trace.cc
   src/core/lib/channel/connected_channel.cc
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
@@ -2038,7 +2038,7 @@ add_library(grpc_unsecure
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_stack.cc
   src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_tracer.cc
+  src/core/lib/channel/channel_trace.cc
   src/core/lib/channel/connected_channel.cc
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
@@ -2843,7 +2843,7 @@ add_library(grpc++_cronet
   src/core/lib/channel/channel_args.cc
   src/core/lib/channel/channel_stack.cc
   src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_tracer.cc
+  src/core/lib/channel/channel_trace.cc
   src/core/lib/channel/connected_channel.cc
   src/core/lib/channel/handshaker.cc
   src/core/lib/channel/handshaker_factory.cc
@@ -9485,14 +9485,14 @@ target_link_libraries(channel_filter_test
 endif (gRPC_BUILD_TESTS)
 if (gRPC_BUILD_TESTS)
 
-add_executable(channel_tracer_test
-  test/core/channel/channel_tracer_test.cc
+add_executable(channel_trace_test
+  test/core/channel/channel_trace_test.cc
   third_party/googletest/googletest/src/gtest-all.cc
   third_party/googletest/googlemock/src/gmock-all.cc
 )
 
 
-target_include_directories(channel_tracer_test
+target_include_directories(channel_trace_test
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
   PRIVATE ${_gRPC_SSL_INCLUDE_DIR}
@@ -9508,7 +9508,7 @@ target_include_directories(channel_tracer_test
   PRIVATE ${_gRPC_PROTO_GENS_DIR}
 )
 
-target_link_libraries(channel_tracer_test
+target_link_libraries(channel_trace_test
   ${_gRPC_PROTOBUF_LIBRARIES}
   ${_gRPC_ALLTARGETS_LIBRARIES}
   grpc_test_util
diff --git a/Makefile b/Makefile
index d5777d0e10..01bad6692d 100644
--- a/Makefile
+++ b/Makefile
@@ -1114,7 +1114,7 @@ bm_metadata: $(BINDIR)/$(CONFIG)/bm_metadata
 bm_pollset: $(BINDIR)/$(CONFIG)/bm_pollset
 channel_arguments_test: $(BINDIR)/$(CONFIG)/channel_arguments_test
 channel_filter_test: $(BINDIR)/$(CONFIG)/channel_filter_test
-channel_tracer_test: $(BINDIR)/$(CONFIG)/channel_tracer_test
+channel_trace_test: $(BINDIR)/$(CONFIG)/channel_trace_test
 chttp2_settings_timeout_test: $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test
 cli_call_test: $(BINDIR)/$(CONFIG)/cli_call_test
 client_channel_stress_test: $(BINDIR)/$(CONFIG)/client_channel_stress_test
@@ -1583,7 +1583,7 @@ buildtests_cxx: privatelibs_cxx \
   $(BINDIR)/$(CONFIG)/bm_pollset \
   $(BINDIR)/$(CONFIG)/channel_arguments_test \
   $(BINDIR)/$(CONFIG)/channel_filter_test \
-  $(BINDIR)/$(CONFIG)/channel_tracer_test \
+  $(BINDIR)/$(CONFIG)/channel_trace_test \
   $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test \
   $(BINDIR)/$(CONFIG)/cli_call_test \
   $(BINDIR)/$(CONFIG)/client_channel_stress_test \
@@ -1732,7 +1732,7 @@ buildtests_cxx: privatelibs_cxx \
   $(BINDIR)/$(CONFIG)/bm_pollset \
   $(BINDIR)/$(CONFIG)/channel_arguments_test \
   $(BINDIR)/$(CONFIG)/channel_filter_test \
-  $(BINDIR)/$(CONFIG)/channel_tracer_test \
+  $(BINDIR)/$(CONFIG)/channel_trace_test \
   $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test \
   $(BINDIR)/$(CONFIG)/cli_call_test \
   $(BINDIR)/$(CONFIG)/client_channel_stress_test \
@@ -2129,8 +2129,8 @@ test_cxx: buildtests_cxx
 	$(Q) $(BINDIR)/$(CONFIG)/channel_arguments_test || ( echo test channel_arguments_test failed ; exit 1 )
 	$(E) "[RUN]     Testing channel_filter_test"
 	$(Q) $(BINDIR)/$(CONFIG)/channel_filter_test || ( echo test channel_filter_test failed ; exit 1 )
-	$(E) "[RUN]     Testing channel_tracer_test"
-	$(Q) $(BINDIR)/$(CONFIG)/channel_tracer_test || ( echo test channel_tracer_test failed ; exit 1 )
+	$(E) "[RUN]     Testing channel_trace_test"
+	$(Q) $(BINDIR)/$(CONFIG)/channel_trace_test || ( echo test channel_trace_test failed ; exit 1 )
 	$(E) "[RUN]     Testing chttp2_settings_timeout_test"
 	$(Q) $(BINDIR)/$(CONFIG)/chttp2_settings_timeout_test || ( echo test chttp2_settings_timeout_test failed ; exit 1 )
 	$(E) "[RUN]     Testing cli_call_test"
@@ -3040,7 +3040,7 @@ LIBGRPC_SRC = \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_stack.cc \
     src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_tracer.cc \
+    src/core/lib/channel/channel_trace.cc \
     src/core/lib/channel/connected_channel.cc \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
@@ -3386,7 +3386,7 @@ LIBGRPC_CRONET_SRC = \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_stack.cc \
     src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_tracer.cc \
+    src/core/lib/channel/channel_trace.cc \
     src/core/lib/channel/connected_channel.cc \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
@@ -3718,7 +3718,7 @@ LIBGRPC_TEST_UTIL_SRC = \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_stack.cc \
     src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_tracer.cc \
+    src/core/lib/channel/channel_trace.cc \
     src/core/lib/channel/connected_channel.cc \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
@@ -4003,7 +4003,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_stack.cc \
     src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_tracer.cc \
+    src/core/lib/channel/channel_trace.cc \
     src/core/lib/channel/connected_channel.cc \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
@@ -4254,7 +4254,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_stack.cc \
     src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_tracer.cc \
+    src/core/lib/channel/channel_trace.cc \
     src/core/lib/channel/connected_channel.cc \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
@@ -5058,7 +5058,7 @@ LIBGRPC++_CRONET_SRC = \
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_stack.cc \
     src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_tracer.cc \
+    src/core/lib/channel/channel_trace.cc \
     src/core/lib/channel/connected_channel.cc \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
@@ -15134,15 +15134,15 @@ endif
 endif
 
 
-CHANNEL_TRACER_TEST_SRC = \
-    test/core/channel/channel_tracer_test.cc \
+CHANNEL_TRACE_TEST_SRC = \
+    test/core/channel/channel_trace_test.cc \
 
-CHANNEL_TRACER_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHANNEL_TRACER_TEST_SRC))))
+CHANNEL_TRACE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(CHANNEL_TRACE_TEST_SRC))))
 ifeq ($(NO_SECURE),true)
 
 # You can't build secure targets if you don't have OpenSSL.
 
-$(BINDIR)/$(CONFIG)/channel_tracer_test: openssl_dep_error
+$(BINDIR)/$(CONFIG)/channel_trace_test: openssl_dep_error
 
 else
 
@@ -15153,26 +15153,26 @@ ifeq ($(NO_PROTOBUF),true)
 
 # You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
 
-$(BINDIR)/$(CONFIG)/channel_tracer_test: protobuf_dep_error
+$(BINDIR)/$(CONFIG)/channel_trace_test: protobuf_dep_error
 
 else
 
-$(BINDIR)/$(CONFIG)/channel_tracer_test: $(PROTOBUF_DEP) $(CHANNEL_TRACER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+$(BINDIR)/$(CONFIG)/channel_trace_test: $(PROTOBUF_DEP) $(CHANNEL_TRACE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
 	$(E) "[LD]      Linking $@"
 	$(Q) mkdir -p `dirname $@`
-	$(Q) $(LDXX) $(LDFLAGS) $(CHANNEL_TRACER_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/channel_tracer_test
+	$(Q) $(LDXX) $(LDFLAGS) $(CHANNEL_TRACE_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/channel_trace_test
 
 endif
 
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/channel/channel_tracer_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
+$(OBJDIR)/$(CONFIG)/test/core/channel/channel_trace_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
 
-deps_channel_tracer_test: $(CHANNEL_TRACER_TEST_OBJS:.o=.dep)
+deps_channel_trace_test: $(CHANNEL_TRACE_TEST_OBJS:.o=.dep)
 
 ifneq ($(NO_SECURE),true)
 ifneq ($(NO_DEPS),true)
--include $(CHANNEL_TRACER_TEST_OBJS:.o=.dep)
+-include $(CHANNEL_TRACE_TEST_OBJS:.o=.dep)
 endif
 endif
 
diff --git a/build.yaml b/build.yaml
index bdc6db8d8d..9ef6092e03 100644
--- a/build.yaml
+++ b/build.yaml
@@ -154,7 +154,7 @@ filegroups:
   - src/core/lib/channel/channel_args.cc
   - src/core/lib/channel/channel_stack.cc
   - src/core/lib/channel/channel_stack_builder.cc
-  - src/core/lib/channel/channel_tracer.cc
+  - src/core/lib/channel/channel_trace.cc
   - src/core/lib/channel/connected_channel.cc
   - src/core/lib/channel/handshaker.cc
   - src/core/lib/channel/handshaker_factory.cc
@@ -312,7 +312,7 @@ filegroups:
   - src/core/lib/channel/channel_args.h
   - src/core/lib/channel/channel_stack.h
   - src/core/lib/channel/channel_stack_builder.h
-  - src/core/lib/channel/channel_tracer.h
+  - src/core/lib/channel/channel_trace.h
   - src/core/lib/channel/connected_channel.h
   - src/core/lib/channel/context.h
   - src/core/lib/channel/handshaker.h
@@ -3885,12 +3885,12 @@ targets:
   - grpc
   - gpr
   uses_polling: false
-- name: channel_tracer_test
+- name: channel_trace_test
   gtest: true
   build: test
   language: c++
   src:
-  - test/core/channel/channel_tracer_test.cc
+  - test/core/channel/channel_trace_test.cc
   deps:
   - grpc_test_util
   - grpc++
diff --git a/config.m4 b/config.m4
index 5f79cbcb6a..d53c2f4589 100644
--- a/config.m4
+++ b/config.m4
@@ -84,7 +84,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/channel/channel_args.cc \
     src/core/lib/channel/channel_stack.cc \
     src/core/lib/channel/channel_stack_builder.cc \
-    src/core/lib/channel/channel_tracer.cc \
+    src/core/lib/channel/channel_trace.cc \
     src/core/lib/channel/connected_channel.cc \
     src/core/lib/channel/handshaker.cc \
     src/core/lib/channel/handshaker_factory.cc \
diff --git a/config.w32 b/config.w32
index 5471d5cc56..548ae73e31 100644
--- a/config.w32
+++ b/config.w32
@@ -61,7 +61,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\channel\\channel_args.cc " +
     "src\\core\\lib\\channel\\channel_stack.cc " +
     "src\\core\\lib\\channel\\channel_stack_builder.cc " +
-    "src\\core\\lib\\channel\\channel_tracer.cc " +
+    "src\\core\\lib\\channel\\channel_trace.cc " +
     "src\\core\\lib\\channel\\connected_channel.cc " +
     "src\\core\\lib\\channel\\handshaker.cc " +
     "src\\core\\lib\\channel\\handshaker_factory.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index d9237752c5..4403af53c5 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -316,7 +316,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/channel/channel_args.h',
                       'src/core/lib/channel/channel_stack.h',
                       'src/core/lib/channel/channel_stack_builder.h',
-                      'src/core/lib/channel/channel_tracer.h',
+                      'src/core/lib/channel/channel_trace.h',
                       'src/core/lib/channel/connected_channel.h',
                       'src/core/lib/channel/context.h',
                       'src/core/lib/channel/handshaker.h',
@@ -497,7 +497,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/channel/channel_args.h',
                               'src/core/lib/channel/channel_stack.h',
                               'src/core/lib/channel/channel_stack_builder.h',
-                              'src/core/lib/channel/channel_tracer.h',
+                              'src/core/lib/channel/channel_trace.h',
                               'src/core/lib/channel/connected_channel.h',
                               'src/core/lib/channel/context.h',
                               'src/core/lib/channel/handshaker.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 6546fe8af2..852992e606 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -327,7 +327,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/channel/channel_args.h',
                       'src/core/lib/channel/channel_stack.h',
                       'src/core/lib/channel/channel_stack_builder.h',
-                      'src/core/lib/channel/channel_tracer.h',
+                      'src/core/lib/channel/channel_trace.h',
                       'src/core/lib/channel/connected_channel.h',
                       'src/core/lib/channel/context.h',
                       'src/core/lib/channel/handshaker.h',
@@ -473,7 +473,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/channel/channel_args.cc',
                       'src/core/lib/channel/channel_stack.cc',
                       'src/core/lib/channel/channel_stack_builder.cc',
-                      'src/core/lib/channel/channel_tracer.cc',
+                      'src/core/lib/channel/channel_trace.cc',
                       'src/core/lib/channel/connected_channel.cc',
                       'src/core/lib/channel/handshaker.cc',
                       'src/core/lib/channel/handshaker_factory.cc',
@@ -825,7 +825,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/channel/channel_args.h',
                               'src/core/lib/channel/channel_stack.h',
                               'src/core/lib/channel/channel_stack_builder.h',
-                              'src/core/lib/channel/channel_tracer.h',
+                              'src/core/lib/channel/channel_trace.h',
                               'src/core/lib/channel/connected_channel.h',
                               'src/core/lib/channel/context.h',
                               'src/core/lib/channel/handshaker.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index d33333ace9..a53cdfdfe9 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -253,7 +253,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/channel/channel_args.h )
   s.files += %w( src/core/lib/channel/channel_stack.h )
   s.files += %w( src/core/lib/channel/channel_stack_builder.h )
-  s.files += %w( src/core/lib/channel/channel_tracer.h )
+  s.files += %w( src/core/lib/channel/channel_trace.h )
   s.files += %w( src/core/lib/channel/connected_channel.h )
   s.files += %w( src/core/lib/channel/context.h )
   s.files += %w( src/core/lib/channel/handshaker.h )
@@ -403,7 +403,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/channel/channel_args.cc )
   s.files += %w( src/core/lib/channel/channel_stack.cc )
   s.files += %w( src/core/lib/channel/channel_stack_builder.cc )
-  s.files += %w( src/core/lib/channel/channel_tracer.cc )
+  s.files += %w( src/core/lib/channel/channel_trace.cc )
   s.files += %w( src/core/lib/channel/connected_channel.cc )
   s.files += %w( src/core/lib/channel/handshaker.cc )
   s.files += %w( src/core/lib/channel/handshaker_factory.cc )
diff --git a/grpc.gyp b/grpc.gyp
index 9b5ae58ee4..ca76c68077 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -225,7 +225,7 @@
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_stack.cc',
         'src/core/lib/channel/channel_stack_builder.cc',
-        'src/core/lib/channel/channel_tracer.cc',
+        'src/core/lib/channel/channel_trace.cc',
         'src/core/lib/channel/connected_channel.cc',
         'src/core/lib/channel/handshaker.cc',
         'src/core/lib/channel/handshaker_factory.cc',
@@ -527,7 +527,7 @@
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_stack.cc',
         'src/core/lib/channel/channel_stack_builder.cc',
-        'src/core/lib/channel/channel_tracer.cc',
+        'src/core/lib/channel/channel_trace.cc',
         'src/core/lib/channel/connected_channel.cc',
         'src/core/lib/channel/handshaker.cc',
         'src/core/lib/channel/handshaker_factory.cc',
@@ -747,7 +747,7 @@
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_stack.cc',
         'src/core/lib/channel/channel_stack_builder.cc',
-        'src/core/lib/channel/channel_tracer.cc',
+        'src/core/lib/channel/channel_trace.cc',
         'src/core/lib/channel/connected_channel.cc',
         'src/core/lib/channel/handshaker.cc',
         'src/core/lib/channel/handshaker_factory.cc',
@@ -945,7 +945,7 @@
         'src/core/lib/channel/channel_args.cc',
         'src/core/lib/channel/channel_stack.cc',
         'src/core/lib/channel/channel_stack_builder.cc',
-        'src/core/lib/channel/channel_tracer.cc',
+        'src/core/lib/channel/channel_trace.cc',
         'src/core/lib/channel/connected_channel.cc',
         'src/core/lib/channel/handshaker.cc',
         'src/core/lib/channel/handshaker_factory.cc',
diff --git a/package.xml b/package.xml
index 1cf10540ee..a0841886a9 100644
--- a/package.xml
+++ b/package.xml
@@ -260,7 +260,7 @@
     <file baseinstalldir="/" name="src/core/lib/channel/channel_args.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/channel_stack.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/channel_stack_builder.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/channel_tracer.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/channel/channel_trace.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/connected_channel.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/context.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker.h" role="src" />
@@ -410,7 +410,7 @@
     <file baseinstalldir="/" name="src/core/lib/channel/channel_args.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/channel_stack.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/channel_stack_builder.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/channel_tracer.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/channel/channel_trace.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/connected_channel.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/channel/handshaker_factory.cc" role="src" />
diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc
index 77c0fe2c43..e8ff352be8 100644
--- a/src/core/ext/filters/client_channel/subchannel.cc
+++ b/src/core/ext/filters/client_channel/subchannel.cc
@@ -36,7 +36,7 @@
 #include "src/core/ext/filters/client_channel/uri_parser.h"
 #include "src/core/lib/backoff/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/channel_tracer.h"
+#include "src/core/lib/channel/channel_trace.h"
 #include "src/core/lib/channel/connected_channel.h"
 #include "src/core/lib/channel/object_registry.h"
 #include "src/core/lib/debug/stats.h"
diff --git a/src/core/lib/channel/channel_tracer.cc b/src/core/lib/channel/channel_trace.cc
index 38a5b1ee20..3217a83fba 100644
--- a/src/core/lib/channel/channel_tracer.cc
+++ b/src/core/lib/channel/channel_trace.cc
@@ -18,7 +18,7 @@
 
 #include <grpc/impl/codegen/port_platform.h>
 
-#include "src/core/lib/channel/channel_tracer.h"
+#include "src/core/lib/channel/channel_trace.h"
 
 #include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
@@ -129,6 +129,7 @@ void ChannelTrace::AddTraceEvent(
 
 void ChannelTrace::AddTraceEvent(grpc_slice data, grpc_error* error,
                                  grpc_connectivity_state connectivity_state) {
+  if (max_list_size_ == 0) return;  // tracing is disabled if max_events == 0
   AddTraceEventHelper(New<TraceEvent>(data, error, connectivity_state));
 }
 
diff --git a/src/core/lib/channel/channel_tracer.h b/src/core/lib/channel/channel_trace.h
index 3339be85e3..536f51a1f6 100644
--- a/src/core/lib/channel/channel_tracer.h
+++ b/src/core/lib/channel/channel_trace.h
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACER_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACER_H
+#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
+#define GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H
 
 #include <grpc/impl/codegen/port_platform.h>
 
@@ -112,4 +112,4 @@ class ChannelTrace : public RefCounted<ChannelTrace> {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACER_H */
+#endif /* GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_H */
diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
index fb435b9881..c470f6d0d8 100644
--- a/src/core/lib/surface/channel.cc
+++ b/src/core/lib/surface/channel.cc
@@ -31,7 +31,7 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/channel_tracer.h"
+#include "src/core/lib/channel/channel_trace.h"
 #include "src/core/lib/channel/object_registry.h"
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/gpr/string.h"
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index bf8fb90c5f..3c3c1d6943 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -60,7 +60,7 @@ CORE_SOURCE_FILES = [
     'src/core/lib/channel/channel_args.cc',
     'src/core/lib/channel/channel_stack.cc',
     'src/core/lib/channel/channel_stack_builder.cc',
-    'src/core/lib/channel/channel_tracer.cc',
+    'src/core/lib/channel/channel_trace.cc',
     'src/core/lib/channel/connected_channel.cc',
     'src/core/lib/channel/handshaker.cc',
     'src/core/lib/channel/handshaker_factory.cc',
diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD
index b215aa205c..633c424eae 100644
--- a/test/core/channel/BUILD
+++ b/test/core/channel/BUILD
@@ -67,12 +67,16 @@ grpc_cc_test(
 )
 
 grpc_cc_test(
-    name = "channel_tracer_test",
-    srcs = ["channel_tracer_test.cc"],
+    name = "channel_trace_test",
+    srcs = ["channel_trace_test.cc"],
+    external_deps = [
+        "gtest",
+    ],
     language = "C++",
     deps = [
         "//:gpr",
         "//:grpc",
+        "//:grpc++",
         "//test/core/util:gpr_test_util",
         "//test/core/util:grpc_test_util",
     ],
diff --git a/test/core/channel/channel_tracer_test.cc b/test/core/channel/channel_trace_test.cc
index d76daccbdb..c0cccb77ac 100644
--- a/test/core/channel/channel_tracer_test.cc
+++ b/test/core/channel/channel_trace_test.cc
@@ -24,7 +24,7 @@
 
 #include <gtest/gtest.h>
 
-#include "src/core/lib/channel/channel_tracer.h"
+#include "src/core/lib/channel/channel_trace.h"
 #include "src/core/lib/channel/object_registry.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
@@ -42,7 +42,7 @@ static void add_simple_trace_event(RefCountedPtr<ChannelTrace> tracer) {
 }
 
 // checks for the existence of all the required members of the tracer.
-static void validate_tracer(RefCountedPtr<ChannelTrace> tracer,
+static void validate_trace(RefCountedPtr<ChannelTrace> tracer,
                             size_t expected_num_event_logged,
                             size_t max_nodes) {
   if (!max_nodes) return;
@@ -54,7 +54,7 @@ static void validate_tracer(RefCountedPtr<ChannelTrace> tracer,
   gpr_free(json_str);
 }
 
-static void validate_tracer_data_matches_uuid_lookup(
+static void validate_trace_data_matches_uuid_lookup(
     RefCountedPtr<ChannelTrace> tracer) {
   intptr_t uuid = tracer->GetUuid();
   if (uuid == -1) return;  // Doesn't make sense to lookup if tracing disabled
@@ -72,12 +72,12 @@ static void validate_tracer_data_matches_uuid_lookup(
 
 // Tests basic ChannelTrace functionality like construction, adding trace, and
 // lookups by uuid.
-static void test_basic_channel_tracing(size_t max_nodes) {
+static void test_basic_channel_trace(size_t max_nodes) {
   grpc_core::ExecCtx exec_ctx;
   RefCountedPtr<ChannelTrace> tracer = MakeRefCounted<ChannelTrace>(max_nodes);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
-  validate_tracer_data_matches_uuid_lookup(tracer);
+  validate_trace_data_matches_uuid_lookup(tracer);
   tracer->AddTraceEvent(
       grpc_slice_from_static_string("trace three"),
       grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Error"),
@@ -85,34 +85,34 @@ static void test_basic_channel_tracing(size_t max_nodes) {
       GRPC_CHANNEL_IDLE);
   tracer->AddTraceEvent(grpc_slice_from_static_string("trace four"),
                         GRPC_ERROR_NONE, GRPC_CHANNEL_SHUTDOWN);
-  validate_tracer(tracer, 4, max_nodes);
+  validate_trace(tracer, 4, max_nodes);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
-  validate_tracer(tracer, 6, max_nodes);
+  validate_trace(tracer, 6, max_nodes);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
-  validate_tracer(tracer, 10, max_nodes);
-  validate_tracer_data_matches_uuid_lookup(tracer);
+  validate_trace(tracer, 10, max_nodes);
+  validate_trace_data_matches_uuid_lookup(tracer);
   tracer.reset(nullptr);
 }
 
 // Calls basic test with various values for max_nodes (including 0, which turns
 // the tracer off).
 TEST(ChannelTracerTest, BasicTest) {
-  test_basic_channel_tracing(0);
-  test_basic_channel_tracing(1);
-  test_basic_channel_tracing(2);
-  test_basic_channel_tracing(6);
-  test_basic_channel_tracing(10);
-  test_basic_channel_tracing(15);
+  test_basic_channel_trace(0);
+  test_basic_channel_trace(1);
+  test_basic_channel_trace(2);
+  test_basic_channel_trace(6);
+  test_basic_channel_trace(10);
+  test_basic_channel_trace(15);
 }
 
 // Tests more complex functionality, like a parent channel tracking
 // subchannles. This exercises the ref/unref patterns since the parent tracer
 // and this function will both hold refs to the subchannel.
-static void test_complex_channel_tracing(size_t max_nodes) {
+static void test_complex_channel_trace(size_t max_nodes) {
   grpc_core::ExecCtx exec_ctx;
   RefCountedPtr<ChannelTrace> tracer = MakeRefCounted<ChannelTrace>(max_nodes);
   add_simple_trace_event(tracer);
@@ -120,33 +120,33 @@ static void test_complex_channel_tracing(size_t max_nodes) {
   RefCountedPtr<ChannelTrace> sc1 = MakeRefCounted<ChannelTrace>(max_nodes);
   tracer->AddTraceEvent(grpc_slice_from_static_string("subchannel one created"),
                         GRPC_ERROR_NONE, GRPC_CHANNEL_IDLE, sc1);
-  validate_tracer(tracer, 3, max_nodes);
+  validate_trace(tracer, 3, max_nodes);
   add_simple_trace_event(sc1);
   add_simple_trace_event(sc1);
   add_simple_trace_event(sc1);
-  validate_tracer(sc1, 3, max_nodes);
+  validate_trace(sc1, 3, max_nodes);
   add_simple_trace_event(sc1);
   add_simple_trace_event(sc1);
   add_simple_trace_event(sc1);
-  validate_tracer(sc1, 6, max_nodes);
+  validate_trace(sc1, 6, max_nodes);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
-  validate_tracer(tracer, 5, max_nodes);
-  validate_tracer_data_matches_uuid_lookup(tracer);
+  validate_trace(tracer, 5, max_nodes);
+  validate_trace_data_matches_uuid_lookup(tracer);
   RefCountedPtr<ChannelTrace> sc2 = MakeRefCounted<ChannelTrace>(max_nodes);
   tracer->AddTraceEvent(grpc_slice_from_static_string("subchannel two created"),
                         GRPC_ERROR_NONE, GRPC_CHANNEL_IDLE, sc2);
   tracer->AddTraceEvent(
       grpc_slice_from_static_string("subchannel one inactive"), GRPC_ERROR_NONE,
       GRPC_CHANNEL_IDLE, sc1);
-  validate_tracer(tracer, 7, max_nodes);
+  validate_trace(tracer, 7, max_nodes);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
   add_simple_trace_event(tracer);
-  validate_tracer_data_matches_uuid_lookup(tracer);
+  validate_trace_data_matches_uuid_lookup(tracer);
   tracer.reset(nullptr);
   sc1.reset(nullptr);
   sc2.reset(nullptr);
@@ -154,12 +154,12 @@ static void test_complex_channel_tracing(size_t max_nodes) {
 
 // Calls the complex test with a sweep of sizes for max_nodes.
 TEST(ChannelTracerTest, ComplexTest) {
-  test_complex_channel_tracing(0);
-  test_complex_channel_tracing(1);
-  test_complex_channel_tracing(2);
-  test_complex_channel_tracing(6);
-  test_complex_channel_tracing(10);
-  test_complex_channel_tracing(15);
+  test_complex_channel_trace(0);
+  test_complex_channel_trace(1);
+  test_complex_channel_trace(2);
+  test_complex_channel_trace(6);
+  test_complex_channel_trace(10);
+  test_complex_channel_trace(15);
 }
 
 // Test a case in which the parent channel has subchannels and the subchannels
diff --git a/test/core/util/channel_tracing_utils.cc b/test/core/util/channel_tracing_utils.cc
index a2449cc4bd..be37703ecc 100644
--- a/test/core/util/channel_tracing_utils.cc
+++ b/test/core/util/channel_tracing_utils.cc
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include <grpc/support/log.h>
-#include "src/core/lib/channel/channel_tracer.h"
+#include "src/core/lib/channel/channel_trace.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/json/json.h"
 
diff --git a/test/core/util/channel_tracing_utils.h b/test/core/util/channel_tracing_utils.h
index fc04d8bae6..2038cd83aa 100644
--- a/test/core/util/channel_tracing_utils.h
+++ b/test/core/util/channel_tracing_utils.h
@@ -19,8 +19,6 @@
 #ifndef GRPC_TEST_CORE_UTIL_CHANNEL_TRACING_UTILS_H
 #define GRPC_TEST_CORE_UTIL_CHANNEL_TRACING_UTILS_H
 
-#include "src/core/lib/channel/channel_tracer.h"
-
 void validate_json_array_size(grpc_json* json, const char* key,
                               size_t expected_size);
 
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 4a7428e2d8..72fb62d1f2 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1007,7 +1007,7 @@ src/core/lib/backoff/backoff.h \
 src/core/lib/channel/channel_args.h \
 src/core/lib/channel/channel_stack.h \
 src/core/lib/channel/channel_stack_builder.h \
-src/core/lib/channel/channel_tracer.h \
+src/core/lib/channel/channel_trace.h \
 src/core/lib/channel/connected_channel.h \
 src/core/lib/channel/context.h \
 src/core/lib/channel/handshaker.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index e1856bf9aa..a64ff1eaf1 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1034,8 +1034,8 @@ src/core/lib/channel/channel_stack.cc \
 src/core/lib/channel/channel_stack.h \
 src/core/lib/channel/channel_stack_builder.cc \
 src/core/lib/channel/channel_stack_builder.h \
-src/core/lib/channel/channel_tracer.cc \
-src/core/lib/channel/channel_tracer.h \
+src/core/lib/channel/channel_trace.cc \
+src/core/lib/channel/channel_trace.h \
 src/core/lib/channel/connected_channel.cc \
 src/core/lib/channel/connected_channel.h \
 src/core/lib/channel/context.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index e4741fc0d2..1854b33ce1 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -2837,9 +2837,9 @@
     "headers": [], 
     "is_filegroup": false, 
     "language": "c++", 
-    "name": "channel_tracer_test", 
+    "name": "channel_trace_test", 
     "src": [
-      "test/core/channel/channel_tracer_test.cc"
+      "test/core/channel/channel_trace_test.cc"
     ], 
     "third_party": false, 
     "type": "target"
@@ -8575,7 +8575,7 @@
       "src/core/lib/channel/channel_args.cc", 
       "src/core/lib/channel/channel_stack.cc", 
       "src/core/lib/channel/channel_stack_builder.cc", 
-      "src/core/lib/channel/channel_tracer.cc", 
+      "src/core/lib/channel/channel_trace.cc", 
       "src/core/lib/channel/connected_channel.cc", 
       "src/core/lib/channel/handshaker.cc", 
       "src/core/lib/channel/handshaker_factory.cc", 
@@ -8734,7 +8734,7 @@
       "src/core/lib/channel/channel_args.h", 
       "src/core/lib/channel/channel_stack.h", 
       "src/core/lib/channel/channel_stack_builder.h", 
-      "src/core/lib/channel/channel_tracer.h", 
+      "src/core/lib/channel/channel_trace.h", 
       "src/core/lib/channel/connected_channel.h", 
       "src/core/lib/channel/context.h", 
       "src/core/lib/channel/handshaker.h", 
@@ -8880,7 +8880,7 @@
       "src/core/lib/channel/channel_args.h", 
       "src/core/lib/channel/channel_stack.h", 
       "src/core/lib/channel/channel_stack_builder.h", 
-      "src/core/lib/channel/channel_tracer.h", 
+      "src/core/lib/channel/channel_trace.h", 
       "src/core/lib/channel/connected_channel.h", 
       "src/core/lib/channel/context.h", 
       "src/core/lib/channel/handshaker.h", 
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 4d86843f13..cae60dd29a 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -3352,7 +3352,7 @@
     "flaky": false, 
     "gtest": true, 
     "language": "c++", 
-    "name": "channel_tracer_test", 
+    "name": "channel_trace_test", 
     "platforms": [
       "linux", 
       "mac",