Resolved merge conflicts in grpc.gyp

22 files changed, 110 insertions, 100 deletions

diff --git a/build.yaml b/build.yaml
index 32dfa34df6..98fb0348ca 100644
--- a/build.yaml
+++ b/build.yaml
@@ -180,6 +180,7 @@ filegroups:
   - src/core/profiling/timers.h
   - src/core/statistics/census_interface.h
   - src/core/statistics/census_rpc_stats.h
+  - src/core/surface/api_trace.h
   - src/core/surface/byte_buffer_queue.h
   - src/core/surface/call.h
   - src/core/surface/channel.h
@@ -293,6 +294,7 @@ filegroups:
   - src/core/json/json_writer.c
   - src/core/profiling/basic_timers.c
   - src/core/profiling/stap_timers.c
+  - src/core/surface/api_trace.c
   - src/core/surface/byte_buffer.c
   - src/core/surface/byte_buffer_queue.c
   - src/core/surface/byte_buffer_reader.c
@@ -310,7 +312,6 @@ filegroups:
   - src/core/surface/server.c
   - src/core/surface/server_chttp2.c
   - src/core/surface/server_create.c
-  - src/core/surface/surface_trace.c
   - src/core/surface/version.c
   - src/core/transport/chttp2/alpn.c
   - src/core/transport/chttp2/bin_encoder.c
diff --git a/grpc.gyp b/grpc.gyp
index 222ff8d003..08185ac592 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -240,6 +240,7 @@
         'src/core/json/json_writer.c',
         'src/core/profiling/basic_timers.c',
         'src/core/profiling/stap_timers.c',
+        'src/core/surface/api_trace.c',
         'src/core/surface/byte_buffer.c',
         'src/core/surface/byte_buffer_queue.c',
         'src/core/surface/byte_buffer_reader.c',
@@ -257,7 +258,6 @@
         'src/core/surface/server.c',
         'src/core/surface/server_chttp2.c',
         'src/core/surface/server_create.c',
-        'src/core/surface/surface_trace.c',
         'src/core/surface/version.c',
         'src/core/transport/chttp2/alpn.c',
         'src/core/transport/chttp2/bin_encoder.c',
diff --git a/src/core/client_config/subchannel.h b/src/core/client_config/subchannel.h
index 03e7cd0590..86b7fa5851 100644
--- a/src/core/client_config/subchannel.h
+++ b/src/core/client_config/subchannel.h
@@ -64,13 +64,13 @@ typedef struct grpc_subchannel_args grpc_subchannel_args;
 #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS
 #endif
 
-void grpc_subchannel_ref(
-    grpc_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS);
+void grpc_subchannel_ref(grpc_subchannel *channel
+                             GRPC_SUBCHANNEL_REF_EXTRA_ARGS);
 void grpc_subchannel_unref(grpc_exec_ctx *exec_ctx,
                            grpc_subchannel *channel
                                GRPC_SUBCHANNEL_REF_EXTRA_ARGS);
-void grpc_subchannel_call_ref(
-    grpc_subchannel_call *call GRPC_SUBCHANNEL_REF_EXTRA_ARGS);
+void grpc_subchannel_call_ref(grpc_subchannel_call *call
+                                  GRPC_SUBCHANNEL_REF_EXTRA_ARGS);
 void grpc_subchannel_call_unref(grpc_exec_ctx *exec_ctx,
                                 grpc_subchannel_call *call
                                     GRPC_SUBCHANNEL_REF_EXTRA_ARGS);
diff --git a/src/core/compression/algorithm.c b/src/core/compression/algorithm.c
index ad7bb8c813..d55e499f5e 100644
--- a/src/core/compression/algorithm.c
+++ b/src/core/compression/algorithm.c
@@ -47,9 +47,9 @@ int grpc_compression_algorithm_parse(const char *name, size_t name_length,
    * data, for example) */
   GRPC_API_TRACE(
       "grpc_compression_algorithm_parse("
-        "name=%*.*s, name_length=%lu, algorithm=%p)", 5,
-        ((int)name_length, (int)name_length, name,
-         (unsigned long)name_length, algorithm));
+      "name=%*.*s, name_length=%lu, algorithm=%p)",
+      5, ((int)name_length, (int)name_length, name, (unsigned long)name_length,
+          algorithm));
   if (name_length == 0) {
     return 0;
   }
diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c
index ff67b5d30a..398db20e8c 100644
--- a/src/core/security/credentials.c
+++ b/src/core/security/credentials.c
@@ -171,8 +171,8 @@ void grpc_server_credentials_set_auth_metadata_processor(
     grpc_server_credentials *creds, grpc_auth_metadata_processor processor) {
   GRPC_API_TRACE(
       "grpc_server_credentials_set_auth_metadata_processor("
-        "creds=%p, "
-        "processor=grpc_auth_metadata_processor { process: %lx, state: %p })",
+      "creds=%p, "
+      "processor=grpc_auth_metadata_processor { process: %lx, state: %p })",
       3, (creds, (unsigned long)processor.process, processor.state));
   if (creds == NULL) return;
   if (creds->processor.destroy != NULL && creds->processor.state != NULL) {
@@ -325,10 +325,11 @@ grpc_credentials *grpc_ssl_credentials_create(
     const char *pem_root_certs, grpc_ssl_pem_key_cert_pair *pem_key_cert_pair,
     void *reserved) {
   grpc_ssl_credentials *c = gpr_malloc(sizeof(grpc_ssl_credentials));
-  GRPC_API_TRACE("grpc_ssl_credentials_create(pem_root_certs=%s, "
-                                             "pem_key_cert_pair=%p, "
-                                             "reserved=%p)",
-                 3, (pem_root_certs, pem_key_cert_pair, reserved));
+  GRPC_API_TRACE(
+      "grpc_ssl_credentials_create(pem_root_certs=%s, "
+      "pem_key_cert_pair=%p, "
+      "reserved=%p)",
+      3, (pem_root_certs, pem_key_cert_pair, reserved));
   GPR_ASSERT(reserved == NULL);
   memset(c, 0, sizeof(grpc_ssl_credentials));
   c->base.type = GRPC_CREDENTIALS_TYPE_SSL;
@@ -345,10 +346,10 @@ grpc_server_credentials *grpc_ssl_server_credentials_create(
       gpr_malloc(sizeof(grpc_ssl_server_credentials));
   GRPC_API_TRACE(
       "grpc_ssl_server_credentials_create("
-        "pem_root_certs=%s, pem_key_cert_pairs=%p, num_key_cert_pairs=%lu, "
-        "force_client_auth=%d, reserved=%p)", 5,
-      (pem_root_certs, pem_key_cert_pairs, (unsigned long)num_key_cert_pairs,
-       force_client_auth, reserved));
+      "pem_root_certs=%s, pem_key_cert_pairs=%p, num_key_cert_pairs=%lu, "
+      "force_client_auth=%d, reserved=%p)",
+      5, (pem_root_certs, pem_key_cert_pairs, (unsigned long)num_key_cert_pairs,
+          force_client_auth, reserved));
   GPR_ASSERT(reserved == NULL);
   memset(c, 0, sizeof(grpc_ssl_server_credentials));
   c->base.type = GRPC_CREDENTIALS_TYPE_SSL;
@@ -469,12 +470,12 @@ grpc_credentials *grpc_service_account_jwt_access_credentials_create(
     const char *json_key, gpr_timespec token_lifetime, void *reserved) {
   GRPC_API_TRACE(
       "grpc_service_account_jwt_access_credentials_create("
-        "json_key=%s, "
-        "token_lifetime="
-          "gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
-          "reserved=%p)",
-      5, (json_key, (long)token_lifetime.tv_sec,
-          token_lifetime.tv_nsec, (int)token_lifetime.clock_type, reserved));
+      "json_key=%s, "
+      "token_lifetime="
+      "gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
+      "reserved=%p)",
+      5, (json_key, (long)token_lifetime.tv_sec, token_lifetime.tv_nsec,
+          (int)token_lifetime.clock_type, reserved));
   GPR_ASSERT(reserved == NULL);
   return grpc_service_account_jwt_access_credentials_create_from_auth_json_key(
       grpc_auth_json_key_create_from_string(json_key), token_lifetime);
@@ -748,9 +749,10 @@ grpc_credentials *grpc_refresh_token_credentials_create_from_auth_refresh_token(
 
 grpc_credentials *grpc_google_refresh_token_credentials_create(
     const char *json_refresh_token, void *reserved) {
-  GRPC_API_TRACE("grpc_refresh_token_credentials_create(json_refresh_token=%s, "
-                 "reserved=%p)",
-                 2, (json_refresh_token, reserved));
+  GRPC_API_TRACE(
+      "grpc_refresh_token_credentials_create(json_refresh_token=%s, "
+      "reserved=%p)",
+      2, (json_refresh_token, reserved));
   GPR_ASSERT(reserved == NULL);
   return grpc_refresh_token_credentials_create_from_auth_refresh_token(
       grpc_auth_refresh_token_create_from_string(json_refresh_token));
@@ -851,9 +853,10 @@ grpc_credentials *grpc_access_token_credentials_create(const char *access_token,
   grpc_access_token_credentials *c =
       gpr_malloc(sizeof(grpc_access_token_credentials));
   char *token_md_value;
-  GRPC_API_TRACE("grpc_access_token_credentials_create(access_token=%s, "
-                                                       "reserved=%p)", 2,
-                 (access_token, reserved));
+  GRPC_API_TRACE(
+      "grpc_access_token_credentials_create(access_token=%s, "
+      "reserved=%p)",
+      2, (access_token, reserved));
   GPR_ASSERT(reserved == NULL);
   memset(c, 0, sizeof(grpc_access_token_credentials));
   c->base.type = GRPC_CREDENTIALS_TYPE_OAUTH2;
@@ -1090,9 +1093,10 @@ grpc_credentials *grpc_composite_credentials_create(grpc_credentials *creds1,
   grpc_credentials_array creds1_array;
   grpc_credentials_array creds2_array;
   grpc_composite_credentials *c;
-  GRPC_API_TRACE("grpc_composite_credentials_create(creds1=%p, creds2=%p, "
-                                                   "reserved=%p)", 3,
-                 (creds1, creds2, reserved));
+  GRPC_API_TRACE(
+      "grpc_composite_credentials_create(creds1=%p, creds2=%p, "
+      "reserved=%p)",
+      3, (creds1, creds2, reserved));
   GPR_ASSERT(reserved == NULL);
   GPR_ASSERT(creds1 != NULL);
   GPR_ASSERT(creds2 != NULL);
@@ -1195,9 +1199,10 @@ static grpc_credentials_vtable iam_vtable = {
 grpc_credentials *grpc_google_iam_credentials_create(
     const char *token, const char *authority_selector, void *reserved) {
   grpc_google_iam_credentials *c;
-  GRPC_API_TRACE("grpc_iam_credentials_create(token=%s, authority_selector=%s, "
-                                             "reserved=%p)",
-                 3, (token, authority_selector, reserved));
+  GRPC_API_TRACE(
+      "grpc_iam_credentials_create(token=%s, authority_selector=%s, "
+      "reserved=%p)",
+      3, (token, authority_selector, reserved));
   GPR_ASSERT(reserved == NULL);
   GPR_ASSERT(token != NULL);
   GPR_ASSERT(authority_selector != NULL);
diff --git a/src/core/security/security_context.c b/src/core/security/security_context.c
index b3cf5204c0..fb905e0b22 100644
--- a/src/core/security/security_context.c
+++ b/src/core/security/security_context.c
@@ -273,7 +273,7 @@ void grpc_auth_context_add_property(grpc_auth_context *ctx, const char *name,
   grpc_auth_property *prop;
   GRPC_API_TRACE(
       "grpc_auth_context_add_property(ctx=%p, name=%s, value=%*.*s, "
-                                     "value_length=%lu)",
+      "value_length=%lu)",
       6, (ctx, name, (int)value_length, (int)value_length, value,
           (unsigned long)value_length));
   ensure_auth_context_capacity(ctx);
diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c
index 3738ed6eb1..881e44a3fe 100644
--- a/src/core/security/server_secure_chttp2.c
+++ b/src/core/security/server_secure_chttp2.c
@@ -223,9 +223,10 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr,
   grpc_security_connector *sc = NULL;
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
 
-  GRPC_API_TRACE("grpc_server_add_secure_http2_port("
-                    "server=%p, addr=%s, creds=%p)",
-                 3, (server, addr, creds));
+  GRPC_API_TRACE(
+      "grpc_server_add_secure_http2_port("
+      "server=%p, addr=%s, creds=%p)",
+      3, (server, addr, creds));
 
   /* create security context */
   if (creds == NULL) goto error;
diff --git a/src/core/surface/api_trace.h b/src/core/surface/api_trace.h
index 7769b191ef..82bbf3b62b 100644
--- a/src/core/surface/api_trace.h
+++ b/src/core/surface/api_trace.h
@@ -51,15 +51,15 @@ extern int grpc_api_trace;
 #define GRPC_API_TRACE_UNWRAP7(a, b, c, d, e, f, g) , a, b, c, d, e, f, g
 #define GRPC_API_TRACE_UNWRAP8(a, b, c, d, e, f, g, h) , a, b, c, d, e, f, g, h
 #define GRPC_API_TRACE_UNWRAP9(a, b, c, d, e, f, g, h, i) \
-    , a, b, c, d, e, f, g, h, i
+  , a, b, c, d, e, f, g, h, i
 #define GRPC_API_TRACE_UNWRAP10(a, b, c, d, e, f, g, h, i, j) \
-    , a, b, c, d, e, f, g, h, i, j
+  , a, b, c, d, e, f, g, h, i, j
 
 /* Due to the limitations of C89's preprocessor, the arity of the var-arg list
    'nargs' must be specified. */
-#define GRPC_API_TRACE(fmt, nargs, args)                          \
-    if (grpc_api_trace) {                                         \
-      gpr_log(GPR_INFO, fmt GRPC_API_TRACE_UNWRAP##nargs args ); \
-    }
+#define GRPC_API_TRACE(fmt, nargs, args)                      \
+  if (grpc_api_trace) {                                       \
+    gpr_log(GPR_INFO, fmt GRPC_API_TRACE_UNWRAP##nargs args); \
+  }
 
 #endif /* GRPC_INTERNAL_CORE_SURFACE_API_TRACE_H */
diff --git a/src/core/surface/call.c b/src/core/surface/call.c
index 85c27746dc..d15a3bcbad 100644
--- a/src/core/surface/call.c
+++ b/src/core/surface/call.c
@@ -1325,7 +1325,7 @@ grpc_call_error grpc_call_cancel_with_status(grpc_call *c,
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   GRPC_API_TRACE(
       "grpc_call_cancel_with_status("
-        "c=%p, status=%d, description=%s, reserved=%p)",
+      "c=%p, status=%d, description=%s, reserved=%p)",
       4, (c, (int)status, description, reserved));
   GPR_ASSERT(reserved == NULL);
   lock(c);
diff --git a/src/core/surface/call.h b/src/core/surface/call.h
index acfedf40cd..f421a81619 100644
--- a/src/core/surface/call.h
+++ b/src/core/surface/call.h
@@ -160,7 +160,7 @@ void *grpc_call_context_get(grpc_call *call, grpc_context_index elem);
 #define GRPC_SERVER_LOG_REQUEST_CALL(sev, server, call, details,             \
                                      initial_metadata, cq_bound_to_call,     \
                                      cq_for_notifications, tag)              \
-  if (grpc_api_trace)                                                    \
+  if (grpc_api_trace)                                                        \
   grpc_server_log_request_call(sev, server, call, details, initial_metadata, \
                                cq_bound_to_call, cq_for_notifications, tag)
 
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c
index 3ff11eb034..a9a5f828f2 100644
--- a/src/core/surface/channel.c
+++ b/src/core/surface/channel.c
@@ -217,13 +217,13 @@ grpc_call *grpc_channel_create_call(grpc_channel *channel,
                                     gpr_timespec deadline, void *reserved) {
   GRPC_API_TRACE(
       "grpc_channel_create_call("
-        "channel=%p, parent_call=%p, propagation_mask=%x, cq=%p, method=%s, "
-        "host=%s, "
-        "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
-        "reserved=%p)",
-      10, (channel, parent_call, (unsigned)propagation_mask, cq, method,
-           host, (long)deadline.tv_sec, deadline.tv_nsec,
-           (int)deadline.clock_type, reserved));
+      "channel=%p, parent_call=%p, propagation_mask=%x, cq=%p, method=%s, "
+      "host=%s, "
+      "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
+      "reserved=%p)",
+      10, (channel, parent_call, (unsigned)propagation_mask, cq, method, host,
+           (long)deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type,
+           reserved));
   GPR_ASSERT(!reserved);
   return grpc_channel_create_call_internal(
       channel, parent_call, propagation_mask, cq,
@@ -268,10 +268,10 @@ grpc_call *grpc_channel_create_registered_call(
   registered_call *rc = registered_call_handle;
   GRPC_API_TRACE(
       "grpc_channel_create_registered_call("
-        "channel=%p, parent_call=%p, propagation_mask=%x, completion_queue=%p, "
-        "registered_call_handle=%p, "
-        "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
-        "reserved=%p)",
+      "channel=%p, parent_call=%p, propagation_mask=%x, completion_queue=%p, "
+      "registered_call_handle=%p, "
+      "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
+      "reserved=%p)",
       9, (channel, parent_call, (unsigned)propagation_mask, completion_queue,
           registered_call_handle, (long)deadline.tv_sec, deadline.tv_nsec,
           (int)deadline.clock_type, reserved));
diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c
index bef3d387fc..f72fb04142 100644
--- a/src/core/surface/channel_connectivity.c
+++ b/src/core/surface/channel_connectivity.c
@@ -49,8 +49,8 @@ grpc_connectivity_state grpc_channel_check_connectivity_state(
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   grpc_connectivity_state state;
   GRPC_API_TRACE(
-      "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)",
-      2, (channel, try_to_connect));
+      "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2,
+      (channel, try_to_connect));
   if (client_channel_elem->filter != &grpc_client_channel_filter) {
     gpr_log(GPR_ERROR,
             "grpc_channel_check_connectivity_state called on something that is "
@@ -181,9 +181,9 @@ void grpc_channel_watch_connectivity_state(
 
   GRPC_API_TRACE(
       "grpc_channel_watch_connectivity_state("
-        "channel=%p, last_observed_state=%d, "
-        "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
-        "cq=%p, tag=%p)",
+      "channel=%p, last_observed_state=%d, "
+      "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
+      "cq=%p, tag=%p)",
       7, (channel, (int)last_observed_state, (long)deadline.tv_sec,
           deadline.tv_nsec, (int)deadline.clock_type, cq, tag));
 
diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c
index a6b32d27aa..e818ccba48 100644
--- a/src/core/surface/completion_queue.c
+++ b/src/core/surface/completion_queue.c
@@ -186,11 +186,11 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cc,
 
   GRPC_API_TRACE(
       "grpc_completion_queue_next("
-        "cc=%p, "
-        "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
-        "reserved=%p)",
-      5, (cc, (long)deadline.tv_sec, deadline.tv_nsec,
-          (int)deadline.clock_type, reserved));
+      "cc=%p, "
+      "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
+      "reserved=%p)",
+      5, (cc, (long)deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type,
+          reserved));
   GPR_ASSERT(!reserved);
 
   deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC);
@@ -270,9 +270,9 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag,
 
   GRPC_API_TRACE(
       "grpc_completion_queue_pluck("
-        "cc=%p, tag=%p, "
-        "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
-        "reserved=%p)",
+      "cc=%p, tag=%p, "
+      "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, "
+      "reserved=%p)",
       6, (cc, tag, (long)deadline.tv_sec, deadline.tv_nsec,
           (int)deadline.clock_type, reserved));
   GPR_ASSERT(!reserved);
diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c
index d2462d8c99..e72264fbcd 100644
--- a/src/core/surface/lame_client.c
+++ b/src/core/surface/lame_client.c
@@ -154,7 +154,7 @@ grpc_channel *grpc_lame_client_channel_create(const char *target,
   elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0);
   GRPC_API_TRACE(
       "grpc_lame_client_channel_create(target=%s, error_code=%d, "
-                                      "error_message=%s)",
+      "error_message=%s)",
       3, (target, (int)error_code, error_message));
   GPR_ASSERT(elem->filter == &lame_filter);
   chand = (channel_data *)elem->channel_data;
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c
index 7fe43b0eaa..1282ee99ed 100644
--- a/src/core/surface/secure_channel_create.c
+++ b/src/core/surface/secure_channel_create.c
@@ -247,9 +247,10 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds,
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
   size_t n = 0;
 
-  GRPC_API_TRACE("grpc_secure_channel_create(creds=%p, target=%s, args=%p, "
-                                            "reserved=%p)", 4,
-                 (creds, target, args, reserved));
+  GRPC_API_TRACE(
+      "grpc_secure_channel_create(creds=%p, target=%s, args=%p, "
+      "reserved=%p)",
+      4, (creds, target, args, reserved));
   GPR_ASSERT(reserved == NULL);
 
   if (grpc_find_security_connector_in_args(args) != NULL) {
diff --git a/src/core/surface/server.c b/src/core/surface/server.c
index ebd2ef9af3..819226278d 100644
--- a/src/core/surface/server.c
+++ b/src/core/surface/server.c
@@ -1186,8 +1186,8 @@ grpc_call_error grpc_server_request_call(
   requested_call *rc = gpr_malloc(sizeof(*rc));
   GRPC_API_TRACE(
       "grpc_server_request_call("
-        "server=%p, call=%p, details=%p, initial_metadata=%p, "
-        "cq_bound_to_call=%p, cq_for_notification=%p, tag%p)",
+      "server=%p, call=%p, details=%p, initial_metadata=%p, "
+      "cq_bound_to_call=%p, cq_for_notification=%p, tag%p)",
       7, (server, call, details, initial_metadata, cq_bound_to_call,
           cq_for_notification, tag));
   GRPC_SERVER_LOG_REQUEST_CALL(GPR_INFO, server, call, details,
@@ -1225,9 +1225,9 @@ grpc_call_error grpc_server_request_registered_call(
   registered_method *rm = rmp;
   GRPC_API_TRACE(
       "grpc_server_request_registered_call("
-        "server=%p, rmp=%p, call=%p, deadline=%p, initial_metadata=%p, "
-        "optional_payload=%p, cq_bound_to_call=%p, cq_for_notification=%p, "
-        "tag=%p)",
+      "server=%p, rmp=%p, call=%p, deadline=%p, initial_metadata=%p, "
+      "optional_payload=%p, cq_bound_to_call=%p, cq_for_notification=%p, "
+      "tag=%p)",
       9, (server, rmp, call, deadline, initial_metadata, optional_payload,
           cq_bound_to_call, cq_for_notification, tag));
   if (!grpc_cq_is_server_cq(cq_for_notification)) {
diff --git a/src/core/surface/surface_trace.h b/src/core/surface/surface_trace.h
index 51329a4984..93b2859ac5 100644
--- a/src/core/surface/surface_trace.h
+++ b/src/core/surface/surface_trace.h
@@ -39,7 +39,7 @@
 #include <grpc/support/log.h>
 
 #define GRPC_SURFACE_TRACE_RETURNED_EVENT(cq, event)    \
-  if (grpc_api_trace) {                             \
+  if (grpc_api_trace) {                                 \
     char *_ev = grpc_event_string(event);               \
     gpr_log(GPR_INFO, "RETURN_EVENT[%p]: %s", cq, _ev); \
     gpr_free(_ev);                                      \
diff --git a/src/core/surface/version.c b/src/core/surface/version.c
index 8eb3ceea70..e559d51448 100644
--- a/src/core/surface/version.c
+++ b/src/core/surface/version.c
@@ -36,10 +36,4 @@
 
 #include <grpc/grpc.h>
 
-#include "src/core/surface/api_trace.h"
-
-const char *grpc_version_string(void) {
-  GRPC_API_TRACE("grpc_version_string(void)", 0, ());
-  return "0.11.0.0";
-}
-
+const char *grpc_version_string(void) { return "0.11.0.0"; }
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
index e7770af3c2..183edbc05b 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -341,6 +341,7 @@
     <ClInclude Include="..\..\..\src\core\profiling\timers.h" />
     <ClInclude Include="..\..\..\src\core\statistics\census_interface.h" />
     <ClInclude Include="..\..\..\src\core\statistics\census_rpc_stats.h" />
+    <ClInclude Include="..\..\..\src\core\surface\api_trace.h" />
     <ClInclude Include="..\..\..\src\core\surface\byte_buffer_queue.h" />
     <ClInclude Include="..\..\..\src\core\surface\call.h" />
     <ClInclude Include="..\..\..\src\core\surface\channel.h" />
@@ -578,6 +579,8 @@
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c">
     </ClCompile>
+    <ClCompile Include="..\..\..\src\core\surface\api_trace.c">
+    </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\byte_buffer.c">
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\byte_buffer_queue.c">
@@ -612,8 +615,6 @@
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\server_create.c">
     </ClCompile>
-    <ClCompile Include="..\..\..\src\core\surface\surface_trace.c">
-    </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\version.c">
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\transport\chttp2\alpn.c">
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
index a8f82370d9..66ce9ca05b 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@@ -298,6 +298,9 @@
     <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c">
       <Filter>src\core\profiling</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\core\surface\api_trace.c">
+      <Filter>src\core\surface</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\byte_buffer.c">
       <Filter>src\core\surface</Filter>
     </ClCompile>
@@ -349,9 +352,6 @@
     <ClCompile Include="..\..\..\src\core\surface\server_create.c">
       <Filter>src\core\surface</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\core\surface\surface_trace.c">
-      <Filter>src\core\surface</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\version.c">
       <Filter>src\core\surface</Filter>
     </ClCompile>
@@ -734,6 +734,9 @@
     <ClInclude Include="..\..\..\src\core\statistics\census_rpc_stats.h">
       <Filter>src\core\statistics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\core\surface\api_trace.h">
+      <Filter>src\core\surface</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\core\surface\byte_buffer_queue.h">
       <Filter>src\core\surface</Filter>
     </ClInclude>
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
index 82ec8a7548..b527179f9f 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@@ -320,6 +320,7 @@
     <ClInclude Include="..\..\..\src\core\profiling\timers.h" />
     <ClInclude Include="..\..\..\src\core\statistics\census_interface.h" />
     <ClInclude Include="..\..\..\src\core\statistics\census_rpc_stats.h" />
+    <ClInclude Include="..\..\..\src\core\surface\api_trace.h" />
     <ClInclude Include="..\..\..\src\core\surface\byte_buffer_queue.h" />
     <ClInclude Include="..\..\..\src\core\surface\call.h" />
     <ClInclude Include="..\..\..\src\core\surface\channel.h" />
@@ -517,6 +518,8 @@
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c">
     </ClCompile>
+    <ClCompile Include="..\..\..\src\core\surface\api_trace.c">
+    </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\byte_buffer.c">
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\byte_buffer_queue.c">
@@ -551,8 +554,6 @@
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\server_create.c">
     </ClCompile>
-    <ClCompile Include="..\..\..\src\core\surface\surface_trace.c">
-    </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\version.c">
     </ClCompile>
     <ClCompile Include="..\..\..\src\core\transport\chttp2\alpn.c">
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
index 21355d67f2..7be3c9ec93 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -238,6 +238,9 @@
     <ClCompile Include="..\..\..\src\core\profiling\stap_timers.c">
       <Filter>src\core\profiling</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\core\surface\api_trace.c">
+      <Filter>src\core\surface</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\byte_buffer.c">
       <Filter>src\core\surface</Filter>
     </ClCompile>
@@ -289,9 +292,6 @@
     <ClCompile Include="..\..\..\src\core\surface\server_create.c">
       <Filter>src\core\surface</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\core\surface\surface_trace.c">
-      <Filter>src\core\surface</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\core\surface\version.c">
       <Filter>src\core\surface</Filter>
     </ClCompile>
@@ -632,6 +632,9 @@
     <ClInclude Include="..\..\..\src\core\statistics\census_rpc_stats.h">
       <Filter>src\core\statistics</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\core\surface\api_trace.h">
+      <Filter>src\core\surface</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\core\surface\byte_buffer_queue.h">
       <Filter>src\core\surface</Filter>
     </ClInclude>