Restore include sanity
diff --git a/BUILD b/BUILD
index ea1ea26..3e2a45b 100644
--- a/BUILD
+++ b/BUILD
@@ -228,6 +228,7 @@
"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",
@@ -513,6 +514,7 @@
"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",
@@ -1299,6 +1301,7 @@
"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/build.yaml b/build.yaml
index 762bbf3..98fb034 100644
--- a/build.yaml
+++ b/build.yaml
@@ -188,6 +188,7 @@
- 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.podspec b/gRPC.podspec
index 01f4e65..717e700 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -232,6 +232,7 @@
'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',
@@ -522,6 +523,7 @@
'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/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index a48fe2e..5658a10 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -863,6 +863,7 @@
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/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index d48285e..1ceff15 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -12370,6 +12370,7 @@
"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",
@@ -12624,6 +12625,7 @@
"src/core/surface/server.h",
"src/core/surface/server_chttp2.c",
"src/core/surface/server_create.c",
+ "src/core/surface/surface_trace.h",
"src/core/surface/version.c",
"src/core/transport/chttp2/alpn.c",
"src/core/transport/chttp2/alpn.h",
@@ -12864,6 +12866,7 @@
"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",
@@ -13087,6 +13090,7 @@
"src/core/surface/server.h",
"src/core/surface/server_chttp2.c",
"src/core/surface/server_create.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 6d87f4b..183edbc 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -349,6 +349,7 @@
<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" />
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
index 4c841bc..66ce9ca 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@@ -758,6 +758,9 @@
<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 4574137..b527179 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@@ -328,6 +328,7 @@
<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" />
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
index ecda41e..7be3c9e 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -656,6 +656,9 @@
<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>