Remove leftover telemetry code (#16468)

This cleans up some leftover unused telemetry skeleton code. ## Validation Steps Performed * A TraceLogging viewing application shows events ✅
microsoft · Jan 9, 2024 · fb8b120 · fb8b120
1 parent d115500
commit fb8b120
Show file tree

Hide file tree

Showing 21 changed files with 5 additions and 125 deletions.
diff --git a/src/host/host-common.vcxitems b/src/host/host-common.vcxitems
@@ -43,7 +43,6 @@
     <ClCompile Include="..\settings.cpp" />
     <ClCompile Include="..\srvinit.cpp" />
     <ClCompile Include="..\stream.cpp" />
-    <ClCompile Include="..\telemetry.cpp" />
     <ClCompile Include="..\tracing.cpp" />
     <ClCompile Include="..\utils.cpp" />
     <ClCompile Include="..\VtApiRoutines.cpp" />
@@ -96,7 +95,6 @@
     <ClInclude Include="..\settings.hpp" />
     <ClInclude Include="..\srvinit.h" />
     <ClInclude Include="..\stream.h" />
-    <ClInclude Include="..\telemetry.hpp" />
     <ClInclude Include="..\tracing.hpp" />
     <ClInclude Include="..\utils.hpp" />
     <ClInclude Include="..\VtApiRoutines.h" />

diff --git a/src/host/lib/hostlib.vcxproj.filters b/src/host/lib/hostlib.vcxproj.filters
@@ -99,9 +99,6 @@
     <ClCompile Include="..\stream.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\telemetry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\tracing.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -320,5 +317,6 @@
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/host/precomp.h b/src/host/precomp.h
@@ -66,7 +66,7 @@ Module Name:
 TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider);
 #include <telemetry/ProjectTelemetry.h>
 #include <TraceLoggingActivity.h>
-#include "telemetry.hpp"
+
 #include "tracing.hpp"
 
 #ifdef BUILDING_INSIDE_WINIDE

diff --git a/src/host/sources.inc b/src/host/sources.inc
@@ -72,7 +72,6 @@ SOURCES = \
     ..\_output.cpp   \
     ..\_stream.cpp   \
     ..\utils.cpp     \
-    ..\telemetry.cpp \
     ..\tracing.cpp   \
     ..\registry.cpp  \
     ..\settings.cpp  \

diff --git a/src/host/telemetry.cpp b/src/host/telemetry.cpp
diff --git a/src/host/telemetry.hpp b/src/host/telemetry.hpp
diff --git a/src/interactivity/win32/menu.cpp b/src/interactivity/win32/menu.cpp
@@ -14,7 +14,6 @@
 #include "../../host/misc.h"
 #include "../../host/server.h"
 #include "../../host/scrolling.hpp"
-#include "../../host/telemetry.hpp"
 
 #include "../inc/ServiceLocator.hpp"
 

diff --git a/src/interactivity/win32/window.cpp b/src/interactivity/win32/window.cpp
@@ -20,7 +20,6 @@
 #include "../../host/scrolling.hpp"
 #include "../../host/srvinit.h"
 #include "../../host/stream.h"
-#include "../../host/telemetry.hpp"
 #include "../../host/tracing.hpp"
 
 #include "../../renderer/base/renderer.hpp"

diff --git a/src/server/ApiDispatchers.cpp b/src/server/ApiDispatchers.cpp
@@ -9,7 +9,6 @@
 #include "../host/getset.h"
 #include "../host/stream.h"
 #include "../host/srvinit.h"
-#include "../host/telemetry.hpp"
 #include "../host/cmdline.h"
 
 // Assumes that it will find <m> in the calling environment.

diff --git a/src/server/ApiDispatchersInternal.cpp b/src/server/ApiDispatchersInternal.cpp
@@ -8,7 +8,6 @@
 #include "../host/globals.h"
 #include "../host/handle.h"
 #include "../host/server.h"
-#include "../host/telemetry.hpp"
 
 #include "../host/ntprivapi.hpp"
 

diff --git a/src/server/IoDispatchers.cpp b/src/server/IoDispatchers.cpp
@@ -12,7 +12,6 @@
 #include "../host/directio.h"
 #include "../host/handle.h"
 #include "../host/srvinit.h"
-#include "../host/telemetry.hpp"
 
 #include "../interactivity/base/HostSignalInputThread.hpp"
 #include "../interactivity/inc/ServiceLocator.hpp"

diff --git a/src/server/ProcessHandle.cpp b/src/server/ProcessHandle.cpp
@@ -6,7 +6,6 @@
 #include "ProcessHandle.h"
 
 #include "../host/globals.h"
-#include "../host/telemetry.hpp"
 
 // Routine Description:
 // - Constructs an instance of the ConsoleProcessHandle Class

diff --git a/src/terminal/adapter/lib/adapter.vcxproj b/src/terminal/adapter/lib/adapter.vcxproj
@@ -16,9 +16,7 @@
     <ClCompile Include="..\InteractDispatch.cpp" />
     <ClCompile Include="..\MacroBuffer.cpp" />
     <ClCompile Include="..\adaptDispatchGraphics.cpp" />
-    <ClCompile Include="..\telemetry.cpp" />
     <ClCompile Include="..\terminalOutput.cpp" />
-    <ClCompile Include="..\tracing.cpp" />
     <ClCompile Include="..\precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
@@ -32,12 +30,10 @@
     <ClInclude Include="..\ITerminalApi.hpp" />
     <ClInclude Include="..\MacroBuffer.hpp" />
     <ClInclude Include="..\precomp.h" />
-    <ClInclude Include="..\telemetry.hpp" />
     <ClInclude Include="..\terminalOutput.hpp" />
     <ClInclude Include="..\ITermDispatch.hpp" />
     <ClInclude Include="..\termDispatch.hpp" />
     <ClInclude Include="..\IInteractDispatch.hpp" />
-    <ClInclude Include="..\tracing.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\types\lib\types.vcxproj">
@@ -50,4 +46,4 @@
   <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
   <Import Project="$(SolutionDir)src\common.build.post.props" />
   <Import Project="$(SolutionDir)src\common.nugetversions.targets" />
-</Project>
+</Project>
diff --git a/src/terminal/adapter/lib/adapter.vcxproj.filters b/src/terminal/adapter/lib/adapter.vcxproj.filters
@@ -18,15 +18,9 @@
     <ClCompile Include="..\adaptDispatch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\telemetry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\terminalOutput.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\tracing.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\adaptDispatchGraphics.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -53,15 +47,9 @@
     <ClInclude Include="..\precomp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\telemetry.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\terminalOutput.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\tracing.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\IInteractDispatch.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -89,5 +77,6 @@
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
   </ItemGroup>
 </Project>
diff --git a/src/terminal/adapter/precomp.h b/src/terminal/adapter/precomp.h
@@ -19,7 +19,4 @@ Module Name:
 
 #include <sal.h>
 
-#include "telemetry.hpp"
-#include "tracing.hpp"
-
 #include "../../inc/conattrs.hpp"
diff --git a/src/terminal/adapter/sources.inc b/src/terminal/adapter/sources.inc
@@ -36,8 +36,6 @@ SOURCES= \
     ..\MacroBuffer.cpp \
     ..\adaptDispatchGraphics.cpp \
     ..\terminalOutput.cpp \
-    ..\telemetry.cpp \
-    ..\tracing.cpp \
 
 INCLUDES = \
     $(INCLUDES); \

diff --git a/src/terminal/adapter/telemetry.cpp b/src/terminal/adapter/telemetry.cpp
diff --git a/src/terminal/adapter/telemetry.hpp b/src/terminal/adapter/telemetry.hpp
diff --git a/src/terminal/adapter/tracing.cpp b/src/terminal/adapter/tracing.cpp
diff --git a/src/terminal/adapter/tracing.hpp b/src/terminal/adapter/tracing.hpp
diff --git a/src/terminal/parser/tracing.hpp b/src/terminal/parser/tracing.hpp
@@ -18,8 +18,6 @@ Module Name:
 #include <winmeta.h>
 #include <TraceLoggingProvider.h>
 
-TRACELOGGING_DECLARE_PROVIDER(g_hConsoleVirtTermParserEventTraceProvider);
-
 namespace Microsoft::Console::VirtualTerminal
 {
     class ParserTracing sealed