Change filename to channelz

7 years ago · bba8840a4b
parent 10470bb4a0
commit bba8840a4b
20 changed files with 60 additions and 61 deletions
--- a/4
+++ b/4
@ -678,7 +678,7 @@ grpc_cc_library(
        "src/core/lib/channel/channel_stack.cc",
        "src/core/lib/channel/channel_stack_builder.cc",
        "src/core/lib/channel/channel_trace.cc",
-        "src/core/lib/channel/channel_trace_registry.cc",
+        "src/core/lib/channel/channelz_registry.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 @@ grpc_cc_library(
        "src/core/lib/channel/channel_stack.h",
        "src/core/lib/channel/channel_stack_builder.h",
        "src/core/lib/channel/channel_trace.h",
-        "src/core/lib/channel/channel_trace_registry.h",
+        "src/core/lib/channel/channelz_registry.h",
        "src/core/lib/channel/connected_channel.h",
        "src/core/lib/channel/context.h",
        "src/core/lib/channel/handshaker.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -922,7 +922,7 @@ add_library(grpc
  src/core/lib/channel/channel_stack.cc
  src/core/lib/channel/channel_stack_builder.cc
  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channel_trace_registry.cc
+  src/core/lib/channel/channelz_registry.cc
  src/core/lib/channel/connected_channel.cc
  src/core/lib/channel/handshaker.cc
  src/core/lib/channel/handshaker_factory.cc
@ -1315,7 +1315,7 @@ add_library(grpc_cronet
  src/core/lib/channel/channel_stack.cc
  src/core/lib/channel/channel_stack_builder.cc
  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channel_trace_registry.cc
+  src/core/lib/channel/channelz_registry.cc
  src/core/lib/channel/connected_channel.cc
  src/core/lib/channel/handshaker.cc
  src/core/lib/channel/handshaker_factory.cc
@ -1700,7 +1700,7 @@ add_library(grpc_test_util
  src/core/lib/channel/channel_stack.cc
  src/core/lib/channel/channel_stack_builder.cc
  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channel_trace_registry.cc
+  src/core/lib/channel/channelz_registry.cc
  src/core/lib/channel/connected_channel.cc
  src/core/lib/channel/handshaker.cc
  src/core/lib/channel/handshaker_factory.cc
@ -2004,7 +2004,7 @@ add_library(grpc_test_util_unsecure
  src/core/lib/channel/channel_stack.cc
  src/core/lib/channel/channel_stack_builder.cc
  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channel_trace_registry.cc
+  src/core/lib/channel/channelz_registry.cc
  src/core/lib/channel/connected_channel.cc
  src/core/lib/channel/handshaker.cc
  src/core/lib/channel/handshaker_factory.cc
@ -2287,7 +2287,7 @@ add_library(grpc_unsecure
  src/core/lib/channel/channel_stack.cc
  src/core/lib/channel/channel_stack_builder.cc
  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channel_trace_registry.cc
+  src/core/lib/channel/channelz_registry.cc
  src/core/lib/channel/connected_channel.cc
  src/core/lib/channel/handshaker.cc
  src/core/lib/channel/handshaker_factory.cc
@ -3113,7 +3113,7 @@ add_library(grpc++_cronet
  src/core/lib/channel/channel_stack.cc
  src/core/lib/channel/channel_stack_builder.cc
  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channel_trace_registry.cc
+  src/core/lib/channel/channelz_registry.cc
  src/core/lib/channel/connected_channel.cc
  src/core/lib/channel/handshaker.cc
  src/core/lib/channel/handshaker_factory.cc
--- a/12
+++ b/12
@ -3312,7 +3312,7 @@ LIBGRPC_SRC = \
    src/core/lib/channel/channel_stack.cc \
    src/core/lib/channel/channel_stack_builder.cc \
    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channel_trace_registry.cc \
+    src/core/lib/channel/channelz_registry.cc \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/handshaker.cc \
    src/core/lib/channel/handshaker_factory.cc \
@ -3705,7 +3705,7 @@ LIBGRPC_CRONET_SRC = \
    src/core/lib/channel/channel_stack.cc \
    src/core/lib/channel/channel_stack_builder.cc \
    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channel_trace_registry.cc \
+    src/core/lib/channel/channelz_registry.cc \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/handshaker.cc \
    src/core/lib/channel/handshaker_factory.cc \
@ -4089,7 +4089,7 @@ LIBGRPC_TEST_UTIL_SRC = \
    src/core/lib/channel/channel_stack.cc \
    src/core/lib/channel/channel_stack_builder.cc \
    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channel_trace_registry.cc \
+    src/core/lib/channel/channelz_registry.cc \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/handshaker.cc \
    src/core/lib/channel/handshaker_factory.cc \
@ -4385,7 +4385,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
    src/core/lib/channel/channel_stack.cc \
    src/core/lib/channel/channel_stack_builder.cc \
    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channel_trace_registry.cc \
+    src/core/lib/channel/channelz_registry.cc \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/handshaker.cc \
    src/core/lib/channel/handshaker_factory.cc \
@ -4647,7 +4647,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/lib/channel/channel_stack.cc \
    src/core/lib/channel/channel_stack_builder.cc \
    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channel_trace_registry.cc \
+    src/core/lib/channel/channelz_registry.cc \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/handshaker.cc \
    src/core/lib/channel/handshaker_factory.cc \
@ -5466,7 +5466,7 @@ LIBGRPC++_CRONET_SRC = \
    src/core/lib/channel/channel_stack.cc \
    src/core/lib/channel/channel_stack_builder.cc \
    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channel_trace_registry.cc \
+    src/core/lib/channel/channelz_registry.cc \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/handshaker.cc \
    src/core/lib/channel/handshaker_factory.cc \
--- a/build.yaml
+++ b/build.yaml
@ -235,7 +235,7 @@ filegroups:
  - src/core/lib/channel/channel_stack.cc
  - src/core/lib/channel/channel_stack_builder.cc
  - src/core/lib/channel/channel_trace.cc
-  - src/core/lib/channel/channel_trace_registry.cc
+  - src/core/lib/channel/channelz_registry.cc
  - src/core/lib/channel/connected_channel.cc
  - src/core/lib/channel/handshaker.cc
  - src/core/lib/channel/handshaker_factory.cc
@ -405,7 +405,7 @@ filegroups:
  - src/core/lib/channel/channel_stack.h
  - src/core/lib/channel/channel_stack_builder.h
  - src/core/lib/channel/channel_trace.h
-  - src/core/lib/channel/channel_trace_registry.h
+  - src/core/lib/channel/channelz_registry.h
  - src/core/lib/channel/connected_channel.h
  - src/core/lib/channel/context.h
  - src/core/lib/channel/handshaker.h
--- a/config.m4
+++ b/config.m4
@ -89,7 +89,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/channel/channel_stack.cc \
    src/core/lib/channel/channel_stack_builder.cc \
    src/core/lib/channel/channel_trace.cc \
-    src/core/lib/channel/channel_trace_registry.cc \
+    src/core/lib/channel/channelz_registry.cc \
    src/core/lib/channel/connected_channel.cc \
    src/core/lib/channel/handshaker.cc \
    src/core/lib/channel/handshaker_factory.cc \
--- a/config.w32
+++ b/config.w32
@ -65,7 +65,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\lib\\channel\\channel_stack.cc " +
    "src\\core\\lib\\channel\\channel_stack_builder.cc " +
    "src\\core\\lib\\channel\\channel_trace.cc " +
-    "src\\core\\lib\\channel\\channel_trace_registry.cc " +
+    "src\\core\\lib\\channel\\channelz_registry.cc " +
    "src\\core\\lib\\channel\\connected_channel.cc " +
    "src\\core\\lib\\channel\\handshaker.cc " +
    "src\\core\\lib\\channel\\handshaker_factory.cc " +
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -347,7 +347,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/channel/channel_stack.h',
                      'src/core/lib/channel/channel_stack_builder.h',
                      'src/core/lib/channel/channel_trace.h',
-                      'src/core/lib/channel/channel_trace_registry.h',
+                      'src/core/lib/channel/channelz_registry.h',
                      'src/core/lib/channel/connected_channel.h',
                      'src/core/lib/channel/context.h',
                      'src/core/lib/channel/handshaker.h',
@ -532,7 +532,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/channel/channel_stack.h',
                              'src/core/lib/channel/channel_stack_builder.h',
                              'src/core/lib/channel/channel_trace.h',
-                              'src/core/lib/channel/channel_trace_registry.h',
+                              'src/core/lib/channel/channelz_registry.h',
                              'src/core/lib/channel/connected_channel.h',
                              'src/core/lib/channel/context.h',
                              'src/core/lib/channel/handshaker.h',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -357,7 +357,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/channel/channel_stack.h',
                      'src/core/lib/channel/channel_stack_builder.h',
                      'src/core/lib/channel/channel_trace.h',
-                      'src/core/lib/channel/channel_trace_registry.h',
+                      'src/core/lib/channel/channelz_registry.h',
                      'src/core/lib/channel/connected_channel.h',
                      'src/core/lib/channel/context.h',
                      'src/core/lib/channel/handshaker.h',
@ -507,7 +507,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/channel/channel_stack.cc',
                      'src/core/lib/channel/channel_stack_builder.cc',
                      'src/core/lib/channel/channel_trace.cc',
-                      'src/core/lib/channel/channel_trace_registry.cc',
+                      'src/core/lib/channel/channelz_registry.cc',
                      'src/core/lib/channel/connected_channel.cc',
                      'src/core/lib/channel/handshaker.cc',
                      'src/core/lib/channel/handshaker_factory.cc',
@ -935,7 +935,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/channel/channel_stack.h',
                              'src/core/lib/channel/channel_stack_builder.h',
                              'src/core/lib/channel/channel_trace.h',
-                              'src/core/lib/channel/channel_trace_registry.h',
+                              'src/core/lib/channel/channelz_registry.h',
                              'src/core/lib/channel/connected_channel.h',
                              'src/core/lib/channel/context.h',
                              'src/core/lib/channel/handshaker.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -292,7 +292,7 @@ Gem::Specification.new do |s|
  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_trace.h )
-  s.files += %w( src/core/lib/channel/channel_trace_registry.h )
+  s.files += %w( src/core/lib/channel/channelz_registry.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 )
@ -442,7 +442,7 @@ Gem::Specification.new do |s|
  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_trace.cc )
-  s.files += %w( src/core/lib/channel/channel_trace_registry.cc )
+  s.files += %w( src/core/lib/channel/channelz_registry.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 )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -249,7 +249,7 @@
        'src/core/lib/channel/channel_stack.cc',
        'src/core/lib/channel/channel_stack_builder.cc',
        'src/core/lib/channel/channel_trace.cc',
-        'src/core/lib/channel/channel_trace_registry.cc',
+        'src/core/lib/channel/channelz_registry.cc',
        'src/core/lib/channel/connected_channel.cc',
        'src/core/lib/channel/handshaker.cc',
        'src/core/lib/channel/handshaker_factory.cc',
@ -598,7 +598,7 @@
        'src/core/lib/channel/channel_stack.cc',
        'src/core/lib/channel/channel_stack_builder.cc',
        'src/core/lib/channel/channel_trace.cc',
-        'src/core/lib/channel/channel_trace_registry.cc',
+        'src/core/lib/channel/channelz_registry.cc',
        'src/core/lib/channel/connected_channel.cc',
        'src/core/lib/channel/handshaker.cc',
        'src/core/lib/channel/handshaker_factory.cc',
@ -829,7 +829,7 @@
        'src/core/lib/channel/channel_stack.cc',
        'src/core/lib/channel/channel_stack_builder.cc',
        'src/core/lib/channel/channel_trace.cc',
-        'src/core/lib/channel/channel_trace_registry.cc',
+        'src/core/lib/channel/channelz_registry.cc',
        'src/core/lib/channel/connected_channel.cc',
        'src/core/lib/channel/handshaker.cc',
        'src/core/lib/channel/handshaker_factory.cc',
@ -1038,7 +1038,7 @@
        'src/core/lib/channel/channel_stack.cc',
        'src/core/lib/channel/channel_stack_builder.cc',
        'src/core/lib/channel/channel_trace.cc',
-        'src/core/lib/channel/channel_trace_registry.cc',
+        'src/core/lib/channel/channelz_registry.cc',
        'src/core/lib/channel/connected_channel.cc',
        'src/core/lib/channel/handshaker.cc',
        'src/core/lib/channel/handshaker_factory.cc',
--- a/package.xml
+++ b/package.xml
@ -299,7 +299,7 @@
    <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_trace.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/channel_trace_registry.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/channel/channelz_registry.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" />
@ -449,7 +449,7 @@
    <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_trace.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/channel_trace_registry.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/channel/channelz_registry.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" />
--- a/src/core/lib/channel/channel_trace.cc
+++ b/src/core/lib/channel/channel_trace.cc
@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include "src/core/lib/channel/channel_trace_registry.h"
+#include "src/core/lib/channel/channelz_registry.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
@ -70,7 +70,7 @@ ChannelTrace::ChannelTrace(size_t max_events)
      tail_trace_(nullptr) {
  if (max_list_size_ == 0) return;  // tracing is disabled if max_events == 0
  gpr_mu_init(&tracer_mu_);
-  channel_uuid_ = grpc_channel_trace_registry_register_channel_trace(this);
+  channel_uuid_ = grpc_channelz_registry_register_channel_trace(this);
  time_created_ = grpc_millis_to_timespec(grpc_core::ExecCtx::Get()->Now(),
                                          GPR_CLOCK_REALTIME);
 }
@ -83,7 +83,7 @@ ChannelTrace::~ChannelTrace() {
    it = it->next();
    Delete<TraceEvent>(to_free);
  }
-  grpc_channel_trace_registry_unregister_channel_trace(channel_uuid_);
+  grpc_channelz_registry_unregister_channel_trace(channel_uuid_);
  gpr_mu_destroy(&tracer_mu_);
 }

--- a/src/core/lib/channel/channel_trace_registry.cc
+++ b/src/core/lib/channel/channel_trace_registry.cc
@ -20,7 +20,7 @@

 #include "src/core/lib/avl/avl.h"
 #include "src/core/lib/channel/channel_trace.h"
-#include "src/core/lib/channel/channel_trace_registry.h"
+#include "src/core/lib/channel/channelz_registry.h"
 #include "src/core/lib/gpr/useful.h"

 #include <grpc/support/alloc.h>
@ -45,17 +45,17 @@ static const grpc_avl_vtable avl_vtable = {
    destroy_intptr, copy_intptr, compare_intptr, destroy_channel_trace,
    copy_channel_trace};

-void grpc_channel_trace_registry_init() {
+void grpc_channelz_registry_init() {
  gpr_mu_init(&g_mu);
  g_avl = grpc_avl_create(&avl_vtable);
 }

-void grpc_channel_trace_registry_shutdown() {
+void grpc_channelz_registry_shutdown() {
  grpc_avl_unref(g_avl, nullptr);
  gpr_mu_destroy(&g_mu);
 }

-intptr_t grpc_channel_trace_registry_register_channel_trace(
+intptr_t grpc_channelz_registry_register_channel_trace(
    grpc_core::ChannelTrace* channel_trace) {
  intptr_t prior = gpr_atm_no_barrier_fetch_add(&g_uuid, 1);
  gpr_mu_lock(&g_mu);
@ -64,13 +64,13 @@ intptr_t grpc_channel_trace_registry_register_channel_trace(
  return prior;
 }

-void grpc_channel_trace_registry_unregister_channel_trace(intptr_t uuid) {
+void grpc_channelz_registry_unregister_channel_trace(intptr_t uuid) {
  gpr_mu_lock(&g_mu);
  g_avl = grpc_avl_remove(g_avl, (void*)uuid, nullptr);
  gpr_mu_unlock(&g_mu);
 }

-grpc_core::ChannelTrace* grpc_channel_trace_registry_get_channel_trace(
+grpc_core::ChannelTrace* grpc_channelz_registry_get_channel_trace(
    intptr_t uuid) {
  gpr_mu_lock(&g_mu);
  grpc_core::ChannelTrace* ret = static_cast<grpc_core::ChannelTrace*>(
--- a/src/core/lib/channel/channel_trace_registry.h
+++ b/src/core/lib/channel/channel_trace_registry.h
@ -16,8 +16,8 @@
 *
 */

-#ifndef GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_REGISTRY_H
-#define GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_REGISTRY_H
+#ifndef GRPC_CORE_LIB_CHANNEL_CHANNELz_REGISTRY_H
+#define GRPC_CORE_LIB_CHANNEL_CHANNELz_REGISTRY_H

 #include <grpc/impl/codegen/port_platform.h>

@ -27,17 +27,17 @@

 // TODO(ncteisen): convert this file to C++

-void grpc_channel_trace_registry_init();
-void grpc_channel_trace_registry_shutdown();
+void grpc_channelz_registry_init();
+void grpc_channelz_registry_shutdown();

 // globally registers a ChannelTrace. Returns its unique uuid
-intptr_t grpc_channel_trace_registry_register_channel_trace(
+intptr_t grpc_channelz_registry_register_channel_trace(
    grpc_core::ChannelTrace* channel_trace);
 // globally unregisters the ChannelTrace that is associated to uuid.
-void grpc_channel_trace_registry_unregister_channel_trace(intptr_t uuid);
+void grpc_channelz_registry_unregister_channel_trace(intptr_t uuid);
 // if object with uuid has previously been registered, returns the ChannelTrace
 // associated with that uuid. Else returns nullptr.
-grpc_core::ChannelTrace* grpc_channel_trace_registry_get_channel_trace(
+grpc_core::ChannelTrace* grpc_channelz_registry_get_channel_trace(
    intptr_t uuid);

-#endif /* GRPC_CORE_LIB_CHANNEL_CHANNEL_TRACE_REGISTRY_H */
+#endif /* GRPC_CORE_LIB_CHANNEL_CHANNELz_REGISTRY_H */
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@ -27,7 +27,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/channel/channel_trace_registry.h"
+#include "src/core/lib/channel/channelz_registry.h"
 #include "src/core/lib/channel/connected_channel.h"
 #include "src/core/lib/channel/handshaker_registry.h"
 #include "src/core/lib/debug/stats.h"
@ -127,7 +127,7 @@ void grpc_init(void) {
    grpc_slice_intern_init();
    grpc_mdctx_global_init();
    grpc_channel_init_init();
-    grpc_channel_trace_registry_init();
+    grpc_channelz_registry_init();
    grpc_security_pre_init();
    grpc_core::ExecCtx::GlobalInit();
    grpc_iomgr_init();
@ -176,7 +176,7 @@ void grpc_shutdown(void) {
      grpc_mdctx_global_shutdown();
      grpc_handshaker_factory_registry_shutdown();
      grpc_slice_intern_shutdown();
-      grpc_channel_trace_registry_shutdown();
+      grpc_channelz_registry_shutdown();
      grpc_stats_shutdown();
      grpc_core::Fork::GlobalShutdown();
    }
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -64,7 +64,7 @@ CORE_SOURCE_FILES = [
    'src/core/lib/channel/channel_stack.cc',
    'src/core/lib/channel/channel_stack_builder.cc',
    'src/core/lib/channel/channel_trace.cc',
-    'src/core/lib/channel/channel_trace_registry.cc',
+    'src/core/lib/channel/channelz_registry.cc',
    'src/core/lib/channel/connected_channel.cc',
    'src/core/lib/channel/handshaker.cc',
    'src/core/lib/channel/handshaker_factory.cc',
--- a/test/core/channel/channel_trace_test.cc
+++ b/test/core/channel/channel_trace_test.cc
@ -25,7 +25,7 @@
 #include <grpc/support/log.h>

 #include "src/core/lib/channel/channel_trace.h"
-#include "src/core/lib/channel/channel_trace_registry.h"
+#include "src/core/lib/channel/channelz_registry.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/json/json.h"
@ -99,8 +99,7 @@ void ValidateTraceDataMatchedUuidLookup(RefCountedPtr<ChannelTrace> tracer) {
  intptr_t uuid = tracer->GetUuid();
  if (uuid == -1) return;  // Doesn't make sense to lookup if tracing disabled
  char* tracer_json_str = tracer->RenderTrace();
-  ChannelTrace* uuid_lookup =
-      grpc_channel_trace_registry_get_channel_trace(uuid);
+  ChannelTrace* uuid_lookup = grpc_channelz_registry_get_channel_trace(uuid);
  char* uuid_lookup_json_str = uuid_lookup->RenderTrace();
  EXPECT_EQ(strcmp(tracer_json_str, uuid_lookup_json_str), 0);
  gpr_free(tracer_json_str);
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1013,7 +1013,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_trace.h \
-src/core/lib/channel/channel_trace_registry.h \
+src/core/lib/channel/channelz_registry.h \
 src/core/lib/channel/connected_channel.h \
 src/core/lib/channel/context.h \
 src/core/lib/channel/handshaker.h \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -1039,8 +1039,8 @@ src/core/lib/channel/channel_stack_builder.cc \
 src/core/lib/channel/channel_stack_builder.h \
 src/core/lib/channel/channel_trace.cc \
 src/core/lib/channel/channel_trace.h \
-src/core/lib/channel/channel_trace_registry.cc \
-src/core/lib/channel/channel_trace_registry.h \
+src/core/lib/channel/channelz_registry.cc \
+src/core/lib/channel/channelz_registry.h \
 src/core/lib/channel/connected_channel.cc \
 src/core/lib/channel/connected_channel.h \
 src/core/lib/channel/context.h \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -9242,7 +9242,7 @@
      "src/core/lib/channel/channel_stack.cc", 
      "src/core/lib/channel/channel_stack_builder.cc", 
      "src/core/lib/channel/channel_trace.cc", 
-      "src/core/lib/channel/channel_trace_registry.cc", 
+      "src/core/lib/channel/channelz_registry.cc", 
      "src/core/lib/channel/connected_channel.cc", 
      "src/core/lib/channel/handshaker.cc", 
      "src/core/lib/channel/handshaker_factory.cc", 
@ -9413,7 +9413,7 @@
      "src/core/lib/channel/channel_stack.h", 
      "src/core/lib/channel/channel_stack_builder.h", 
      "src/core/lib/channel/channel_trace.h", 
-      "src/core/lib/channel/channel_trace_registry.h", 
+      "src/core/lib/channel/channelz_registry.h", 
      "src/core/lib/channel/connected_channel.h", 
      "src/core/lib/channel/context.h", 
      "src/core/lib/channel/handshaker.h", 
@ -9562,7 +9562,7 @@
      "src/core/lib/channel/channel_stack.h", 
      "src/core/lib/channel/channel_stack_builder.h", 
      "src/core/lib/channel/channel_trace.h", 
-      "src/core/lib/channel/channel_trace_registry.h", 
+      "src/core/lib/channel/channelz_registry.h", 
      "src/core/lib/channel/connected_channel.h", 
      "src/core/lib/channel/context.h", 
      "src/core/lib/channel/handshaker.h",