Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove leftover telemetry code #16468

Merged
merged 3 commits into from
Jan 9, 2024
Merged

Remove leftover telemetry code #16468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69da0cb
Add missing TraceLoggingRegister calls
lhecker Dec 13, 2023
e578988
Remove leftover telemetry code
lhecker Dec 13, 2023
be4de6b
Merge remote-tracking branch 'origin/main' into dev/lhecker/more-tele…
lhecker Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/host/host-common.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
6 changes: 2 additions & 4 deletions src/host/lib/hostlib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -320,5 +317,6 @@
</ItemGroup>
<ItemGroup>
<Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
<Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/host/precomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/host/sources.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ SOURCES = \
..\_output.cpp \
..\_stream.cpp \
..\utils.cpp \
..\telemetry.cpp \
..\tracing.cpp \
..\registry.cpp \
..\settings.cpp \
Expand Down
21 changes: 0 additions & 21 deletions src/host/telemetry.cpp
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/host/telemetry.hpp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/interactivity/win32/menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "../../host/misc.h"
#include "../../host/server.h"
#include "../../host/scrolling.hpp"
#include "../../host/telemetry.hpp"

#include "../inc/ServiceLocator.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/interactivity/win32/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/server/ApiDispatchers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion src/server/ApiDispatchersInternal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "../host/globals.h"
#include "../host/handle.h"
#include "../host/server.h"
#include "../host/telemetry.hpp"

#include "../host/ntprivapi.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/server/IoDispatchers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion src/server/ProcessHandle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "ProcessHandle.h"

#include "../host/globals.h"
#include "../host/telemetry.hpp"

// Routine Description:
// - Constructs an instance of the ConsoleProcessHandle Class
Expand Down
6 changes: 1 addition & 5 deletions src/terminal/adapter/lib/adapter.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand All @@ -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>
13 changes: 1 addition & 12 deletions src/terminal/adapter/lib/adapter.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -89,5 +77,6 @@
</ItemGroup>
<ItemGroup>
<Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
<Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions src/terminal/adapter/precomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,4 @@ Module Name:

#include <sal.h>

#include "telemetry.hpp"
#include "tracing.hpp"

#include "../../inc/conattrs.hpp"
2 changes: 0 additions & 2 deletions src/terminal/adapter/sources.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ SOURCES= \
..\MacroBuffer.cpp \
..\adaptDispatchGraphics.cpp \
..\terminalOutput.cpp \
..\telemetry.cpp \
..\tracing.cpp \

INCLUDES = \
$(INCLUDES); \
Expand Down
6 changes: 0 additions & 6 deletions src/terminal/adapter/telemetry.cpp
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/terminal/adapter/telemetry.hpp
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/terminal/adapter/tracing.cpp
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/terminal/adapter/tracing.hpp
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/terminal/parser/tracing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ Module Name:
#include <winmeta.h>
#include <TraceLoggingProvider.h>

TRACELOGGING_DECLARE_PROVIDER(g_hConsoleVirtTermParserEventTraceProvider);

namespace Microsoft::Console::VirtualTerminal
{
class ParserTracing sealed
Expand Down
Loading