diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-08-31 12:24:15 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-08-31 12:24:15 -0700 |
| commit | 890f542498a8af4c05f22e42d818f3b0eeafaea8 (patch) | |
| tree | 4ccf813375c1744629ed43c5c5eaa62fbdffe7ac /src/core/lib/surface/init.c | |
| parent | 5489d41c15926abbf12a5b8d27b24d1d605d7f0f (diff) | |
| parent | ccad38227f63797318d7cffcba8a2df783394ccd (diff) | |
Merge branch 'stats' into stats_histo
Diffstat (limited to 'src/core/lib/surface/init.c')
| -rw-r--r-- | src/core/lib/surface/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/lib/surface/init.c b/src/core/lib/surface/init.c index 280315036f..898476daee 100644 --- a/src/core/lib/surface/init.c +++ b/src/core/lib/surface/init.c @@ -31,7 +31,6 @@ #include "src/core/lib/debug/stats.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/http/parser.h" -#include "src/core/lib/iomgr/call_combiner.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" @@ -130,7 +129,6 @@ void grpc_init(void) { grpc_register_tracer(&grpc_trace_channel_stack_builder); grpc_register_tracer(&grpc_http1_trace); grpc_register_tracer(&grpc_cq_pluck_trace); // default on - grpc_register_tracer(&grpc_call_combiner_trace); grpc_register_tracer(&grpc_combiner_trace); grpc_register_tracer(&grpc_server_channel_trace); grpc_register_tracer(&grpc_bdp_estimator_trace); |