diff --git a/BUILD b/BUILD
index c8118089bef..ea1ea26b425 100644
--- a/BUILD
+++ b/BUILD
@@ -220,6 +220,7 @@ cc_library(
     "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",
@@ -227,7 +228,6 @@ cc_library(
     "src/core/surface/event_string.h",
     "src/core/surface/init.h",
     "src/core/surface/server.h",
-    "src/core/surface/surface_trace.h",
     "src/core/transport/chttp2/alpn.h",
     "src/core/transport/chttp2/bin_encoder.h",
     "src/core/transport/chttp2/frame.h",
@@ -356,6 +356,7 @@ cc_library(
     "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",
@@ -373,7 +374,6 @@ cc_library(
     "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",
@@ -505,6 +505,7 @@ cc_library(
     "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",
@@ -512,7 +513,6 @@ cc_library(
     "src/core/surface/event_string.h",
     "src/core/surface/init.h",
     "src/core/surface/server.h",
-    "src/core/surface/surface_trace.h",
     "src/core/transport/chttp2/alpn.h",
     "src/core/transport/chttp2/bin_encoder.h",
     "src/core/transport/chttp2/frame.h",
@@ -621,6 +621,7 @@ cc_library(
     "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",
@@ -638,7 +639,6 @@ cc_library(
     "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",
@@ -1145,6 +1145,7 @@ objc_library(
     "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",
@@ -1162,7 +1163,6 @@ objc_library(
     "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",
@@ -1291,6 +1291,7 @@ objc_library(
     "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",
@@ -1298,7 +1299,6 @@ objc_library(
     "src/core/surface/event_string.h",
     "src/core/surface/init.h",
     "src/core/surface/server.h",
-    "src/core/surface/surface_trace.h",
     "src/core/transport/chttp2/alpn.h",
     "src/core/transport/chttp2/bin_encoder.h",
     "src/core/transport/chttp2/frame.h",
diff --git a/Makefile b/Makefile
index e0a7b804721..8eb94f768a2 100644
--- a/Makefile
+++ b/Makefile
@@ -4119,6 +4119,7 @@ LIBGRPC_SRC = \
     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 \
@@ -4136,7 +4137,6 @@ LIBGRPC_SRC = \
     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 \
@@ -4401,6 +4401,7 @@ LIBGRPC_UNSECURE_SRC = \
     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 \
@@ -4418,7 +4419,6 @@ LIBGRPC_UNSECURE_SRC = \
     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/build.yaml b/build.yaml
index 32dfa34df6e..762bbf39557 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
@@ -187,7 +188,6 @@ filegroups:
   - src/core/surface/event_string.h
   - src/core/surface/init.h
   - src/core/surface/server.h
-  - src/core/surface/surface_trace.h
   - src/core/transport/chttp2/alpn.h
   - src/core/transport/chttp2/bin_encoder.h
   - src/core/transport/chttp2/frame.h
@@ -293,6 +293,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 +311,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.podspec b/gRPC.podspec
index 122c16eff85..01f4e654076 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -224,6 +224,7 @@ Pod::Spec.new do |s|
                       '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',
@@ -231,7 +232,6 @@ Pod::Spec.new do |s|
                       'src/core/surface/event_string.h',
                       'src/core/surface/init.h',
                       'src/core/surface/server.h',
-                      'src/core/surface/surface_trace.h',
                       'src/core/transport/chttp2/alpn.h',
                       'src/core/transport/chttp2/bin_encoder.h',
                       'src/core/transport/chttp2/frame.h',
@@ -367,6 +367,7 @@ Pod::Spec.new do |s|
                       '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',
@@ -384,7 +385,6 @@ Pod::Spec.new do |s|
                       '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',
@@ -514,6 +514,7 @@ Pod::Spec.new do |s|
                               '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',
@@ -521,7 +522,6 @@ Pod::Spec.new do |s|
                               'src/core/surface/event_string.h',
                               'src/core/surface/init.h',
                               'src/core/surface/server.h',
-                              'src/core/surface/surface_trace.h',
                               'src/core/transport/chttp2/alpn.h',
                               'src/core/transport/chttp2/bin_encoder.h',
                               'src/core/transport/chttp2/frame.h',
diff --git a/grpc.gyp b/grpc.gyp
index 60179f04ff7..2225ca4e045 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -248,6 +248,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',
@@ -265,7 +266,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',
@@ -434,6 +434,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',
@@ -451,7 +452,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/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index a7a3da4d200..a48fe2eca80 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -855,6 +855,7 @@ src/core/json/json_writer.h \
 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 \
@@ -862,7 +863,6 @@ src/core/surface/completion_queue.h \
 src/core/surface/event_string.h \
 src/core/surface/init.h \
 src/core/surface/server.h \
-src/core/surface/surface_trace.h \
 src/core/transport/chttp2/alpn.h \
 src/core/transport/chttp2/bin_encoder.h \
 src/core/transport/chttp2/frame.h \
@@ -991,6 +991,7 @@ src/core/json/json_string.c \
 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 \
@@ -1008,7 +1009,6 @@ src/core/surface/metadata_array.c \
 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/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 1e5dd11fcd0..d48285eb34e 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -12362,6 +12362,7 @@
       "src/core/security/security_context.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", 
@@ -12369,7 +12370,6 @@
       "src/core/surface/event_string.h", 
       "src/core/surface/init.h", 
       "src/core/surface/server.h", 
-      "src/core/surface/surface_trace.h", 
       "src/core/transport/chttp2/alpn.h", 
       "src/core/transport/chttp2/bin_encoder.h", 
       "src/core/transport/chttp2/frame.h", 
@@ -12596,6 +12596,8 @@
       "src/core/security/server_secure_chttp2.c", 
       "src/core/statistics/census_interface.h", 
       "src/core/statistics/census_rpc_stats.h", 
+      "src/core/surface/api_trace.c", 
+      "src/core/surface/api_trace.h", 
       "src/core/surface/byte_buffer.c", 
       "src/core/surface/byte_buffer_queue.c", 
       "src/core/surface/byte_buffer_queue.h", 
@@ -12622,8 +12624,6 @@
       "src/core/surface/server.h", 
       "src/core/surface/server_chttp2.c", 
       "src/core/surface/server_create.c", 
-      "src/core/surface/surface_trace.c", 
-      "src/core/surface/surface_trace.h", 
       "src/core/surface/version.c", 
       "src/core/transport/chttp2/alpn.c", 
       "src/core/transport/chttp2/alpn.h", 
@@ -12856,6 +12856,7 @@
       "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", 
@@ -12863,7 +12864,6 @@
       "src/core/surface/event_string.h", 
       "src/core/surface/init.h", 
       "src/core/surface/server.h", 
-      "src/core/surface/surface_trace.h", 
       "src/core/transport/chttp2/alpn.h", 
       "src/core/transport/chttp2/bin_encoder.h", 
       "src/core/transport/chttp2/frame.h", 
@@ -13060,6 +13060,8 @@
       "src/core/profiling/timers.h", 
       "src/core/statistics/census_interface.h", 
       "src/core/statistics/census_rpc_stats.h", 
+      "src/core/surface/api_trace.c", 
+      "src/core/surface/api_trace.h", 
       "src/core/surface/byte_buffer.c", 
       "src/core/surface/byte_buffer_queue.c", 
       "src/core/surface/byte_buffer_queue.h", 
@@ -13085,8 +13087,6 @@
       "src/core/surface/server.h", 
       "src/core/surface/server_chttp2.c", 
       "src/core/surface/server_create.c", 
-      "src/core/surface/surface_trace.c", 
-      "src/core/surface/surface_trace.h", 
       "src/core/surface/version.c", 
       "src/core/transport/chttp2/alpn.c", 
       "src/core/transport/chttp2/alpn.h", 
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
index e7770af3c24..6d87f4bc7c9 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" />
@@ -348,7 +349,6 @@
     <ClInclude Include="..\..\..\src\core\surface\event_string.h" />
     <ClInclude Include="..\..\..\src\core\surface\init.h" />
     <ClInclude Include="..\..\..\src\core\surface\server.h" />
-    <ClInclude Include="..\..\..\src\core\surface\surface_trace.h" />
     <ClInclude Include="..\..\..\src\core\transport\chttp2\alpn.h" />
     <ClInclude Include="..\..\..\src\core\transport\chttp2\bin_encoder.h" />
     <ClInclude Include="..\..\..\src\core\transport\chttp2\frame.h" />
@@ -578,6 +578,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 +614,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 a8f82370d91..4c841bc7d53 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>
@@ -755,9 +758,6 @@
     <ClInclude Include="..\..\..\src\core\surface\server.h">
       <Filter>src\core\surface</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\core\surface\surface_trace.h">
-      <Filter>src\core\surface</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\core\transport\chttp2\alpn.h">
       <Filter>src\core\transport\chttp2</Filter>
     </ClInclude>
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
index 82ec8a75480..45741371669 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" />
@@ -327,7 +328,6 @@
     <ClInclude Include="..\..\..\src\core\surface\event_string.h" />
     <ClInclude Include="..\..\..\src\core\surface\init.h" />
     <ClInclude Include="..\..\..\src\core\surface\server.h" />
-    <ClInclude Include="..\..\..\src\core\surface\surface_trace.h" />
     <ClInclude Include="..\..\..\src\core\transport\chttp2\alpn.h" />
     <ClInclude Include="..\..\..\src\core\transport\chttp2\bin_encoder.h" />
     <ClInclude Include="..\..\..\src\core\transport\chttp2\frame.h" />
@@ -517,6 +517,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 +553,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 21355d67f26..ecda41e4c95 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>
@@ -653,9 +656,6 @@
     <ClInclude Include="..\..\..\src\core\surface\server.h">
       <Filter>src\core\surface</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\core\surface\surface_trace.h">
-      <Filter>src\core\surface</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\core\transport\chttp2\alpn.h">
       <Filter>src\core\transport\chttp2</Filter>
     </ClInclude>