diff --git a/BUILD b/BUILD
index dba6592f172..99cd76520f4 100644
--- a/BUILD
+++ b/BUILD
@@ -459,6 +459,7 @@ grpc_cc_library(
         "src/core/lib/support/log_windows.cc",
         "src/core/lib/support/mpscq.cc",
         "src/core/lib/support/murmur_hash.cc",
+        "src/core/lib/support/object_registry.cc",
         "src/core/lib/support/string.cc",
         "src/core/lib/support/string_posix.cc",
         "src/core/lib/support/string_util_windows.cc",
@@ -494,6 +495,7 @@ grpc_cc_library(
         "src/core/lib/support/memory.h",
         "src/core/lib/support/mpscq.h",
         "src/core/lib/support/murmur_hash.h",
+        "src/core/lib/support/object_registry.h",
         "src/core/lib/support/spinlock.h",
         "src/core/lib/support/string.h",
         "src/core/lib/support/string_windows.h",
@@ -571,6 +573,7 @@ grpc_cc_library(
         "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/connected_channel.cc",
         "src/core/lib/channel/handshaker.cc",
         "src/core/lib/channel/handshaker_factory.cc",
@@ -705,6 +708,7 @@ grpc_cc_library(
         "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/connected_channel.h",
         "src/core/lib/channel/context.h",
         "src/core/lib/channel/handshaker.h",
diff --git a/test/core/channel/BUILD b/test/core/channel/BUILD
index 92f5907aac1..2950c3609ce 100644
--- a/test/core/channel/BUILD
+++ b/test/core/channel/BUILD
@@ -53,3 +53,15 @@ grpc_cc_test(
         "//test/core/util:grpc_test_util",
     ],
 )
+
+cc_test(
+    name = "channel_tracer_test",
+    srcs = ["channel_tracer_test.cc"],
+    copts = ["-std=c99"],
+    deps = [
+        "//:gpr",
+        "//:grpc",
+        "//test/core/util:gpr_test_util",
+        "//test/core/util:grpc_test_util",
+    ],
+)
diff --git a/test/core/util/BUILD b/test/core/util/BUILD
index 2237cfc1730..974940b3985 100644
--- a/test/core/util/BUILD
+++ b/test/core/util/BUILD
@@ -51,6 +51,7 @@ grpc_cc_library(
 grpc_cc_library(
     name = "grpc_test_util_base",
     srcs = [
+        "channel_tracing_utils.cc",
         "grpc_profiler.cc",
         "histogram.cc",
         "mock_endpoint.cc",
@@ -66,6 +67,7 @@ grpc_cc_library(
         "trickle_endpoint.cc",
     ],
     hdrs = [
+        "channel_tracing_utils.h",
         "grpc_profiler.h",
         "histogram.h",
         "mock_endpoint.h",
@@ -98,6 +100,8 @@ grpc_cc_library(
     ],
 )
 
+
+
 grpc_cc_library(
     name = "grpc_test_util_unsecure",
     srcs = [],