3 files changed, 6 insertions, 5 deletions
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"