[c++] Drop DROP_PII flag

2026-04-03 17:56:44 +02:00 · 2024-10-11 09:44:38 +02:00
parent bea3607ea0
commit 96503cfd10
31 changed files with 55 additions and 166 deletions
--- a/src/common/Telemetry/TraceLoggingDefines.h
+++ b/src/common/Telemetry/TraceLoggingDefines.h
@@ -4,4 +4,3 @@
 #define ProjectTelemetryPrivacyDataTag(tag) TraceLoggingUInt64((tag), "Ignore")
 #define ProjectTelemetryTag_ProductAndServicePerformance 0x0u
 #define PROJECT_KEYWORD_MEASURE 0x0
-#define MICROSOFT_EVENTTAG_DROP_PII 0x02000000
--- a/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/trace.cpp
+++ b/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/trace.cpp
@@ -16,7 +16,6 @@ void Trace::AdvancedPaste_Enable(const bool enabled) noexcept
        "AdvancedPaste_EnableAdvancedPaste",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -28,7 +27,6 @@ void Trace::AdvancedPaste_Invoked(std::wstring mode) noexcept
        "AdvancedPaste_InvokeAdvancedPaste",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(mode.c_str(), "Mode"));
 }

@@ -40,7 +38,6 @@ void Trace::AdvancedPaste_Error(const DWORD errorCode, std::wstring errorMessage
        "AdvancedPaste_Error",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(methodName.c_str(), "MethodName"),
        TraceLoggingValue(errorCode, "ErrorCode"),
        TraceLoggingValue(errorMessage.c_str(), "ErrorMessage"));
@@ -86,7 +83,6 @@ void Trace::AdvancedPaste_SettingsTelemetry(const PowertoyModuleIface::Hotkey& p
        "AdvancedPaste_Settings",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingWideString(pastePlainHotkeyStr.c_str(), "PastePlainHotkey"),
        TraceLoggingWideString(advancedPasteUIHotkeyStr.c_str(), "AdvancedPasteUIHotkey"),
        TraceLoggingWideString(pasteMarkdownHotkeyStr.c_str(), "PasteMarkdownHotkey"),
--- a/src/modules/CropAndLock/CropAndLock/trace.cpp
+++ b/src/modules/CropAndLock/CropAndLock/trace.cpp
@@ -20,7 +20,6 @@ void Trace::CropAndLock::Enable(bool enabled) noexcept
        "CropAndLock_EnableCropAndLock",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -30,8 +29,7 @@ void Trace::CropAndLock::ActivateReparent() noexcept
        g_hProvider,
        "CropAndLock_ActivateReparent",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::CropAndLock::ActivateThumbnail() noexcept
@@ -40,8 +38,7 @@ void Trace::CropAndLock::ActivateThumbnail() noexcept
        g_hProvider,
        "CropAndLock_ActivateThumbnail",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::CropAndLock::CreateReparentWindow() noexcept
@@ -50,8 +47,7 @@ void Trace::CropAndLock::CreateReparentWindow() noexcept
        g_hProvider,
        "CropAndLock_CreateReparentWindow",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::CropAndLock::CreateThumbnailWindow() noexcept
@@ -60,8 +56,7 @@ void Trace::CropAndLock::CreateThumbnailWindow() noexcept
        g_hProvider,
        "CropAndLock_CreateThumbnailWindow",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Event to send settings telemetry.
@@ -86,7 +81,6 @@ void Trace::CropAndLock::SettingsTelemetry(PowertoyModuleIface::Hotkey& reparent
        "CropAndLock_Settings",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingWideString(hotKeyStrReparent.c_str(), "ReparentHotKey"),
        TraceLoggingWideString(hotKeyStrThumbnail.c_str(), "ThumbnailHotkey"));
 }
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/trace.cpp
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/trace.cpp
@@ -18,7 +18,6 @@ void Trace::EnableEnvironmentVariables(const bool enabled) noexcept
        "EnvironmentVariables_EnableEnvironmentVariables",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -29,6 +28,5 @@ void Trace::ActivateEnvironmentVariables() noexcept
        g_hProvider,
        "EnvironmentVariables_Activate",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/FileLocksmith/FileLocksmithLib/Trace.cpp
+++ b/src/modules/FileLocksmith/FileLocksmithLib/Trace.cpp
@@ -18,7 +18,6 @@ void Trace::EnableFileLocksmith(_In_ bool enabled) noexcept
        "FileLocksmith_EnableFileLocksmith",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -28,8 +27,7 @@ void Trace::Invoked() noexcept
        g_hProvider,
        "FileLocksmith_Invoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::InvokedRet(_In_ HRESULT hr) noexcept
@@ -39,8 +37,7 @@ void Trace::InvokedRet(_In_ HRESULT hr) noexcept
        "FileLocksmith_InvokedRet",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingHResult(hr),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::QueryContextMenuError(_In_ HRESULT hr) noexcept
@@ -50,6 +47,5 @@ void Trace::QueryContextMenuError(_In_ HRESULT hr) noexcept
        "FileLocksmith_QueryContextMenuError",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingHResult(hr),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/Hosts/HostsModuleInterface/trace.cpp
+++ b/src/modules/Hosts/HostsModuleInterface/trace.cpp
@@ -18,7 +18,6 @@ void Trace::EnableHostsFileEditor(const bool enabled) noexcept
        "HostsFileEditor_EnableHostsFileEditor",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -29,6 +28,5 @@ void Trace::ActivateEditor() noexcept
        g_hProvider,
        "HostsFileEditor_Activate",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/MeasureTool/MeasureToolModuleInterface/trace.cpp
+++ b/src/modules/MeasureTool/MeasureToolModuleInterface/trace.cpp
@@ -17,7 +17,6 @@ void Trace::EnableMeasureTool(const bool enabled) noexcept
        "MeasureTool_EnableMeasureTool",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -27,8 +26,7 @@ void Trace::BoundsToolActivated() noexcept
        g_hProvider,
        "MeasureTool_BoundsToolActivated",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::MeasureToolActivated() noexcept
@@ -37,6 +35,5 @@ void Trace::MeasureToolActivated() noexcept
        g_hProvider,
        "MeasureTool_MeasureToolActivated",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/MouseUtils/FindMyMouse/trace.cpp
+++ b/src/modules/MouseUtils/FindMyMouse/trace.cpp
@@ -18,7 +18,6 @@ void Trace::EnableFindMyMouse(const bool enabled) noexcept
        "FindMyMouse_EnableFindMyMouse",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -29,6 +28,5 @@ void Trace::MousePointerFocused() noexcept
        g_hProvider,
        "FindMyMouse_MousePointerFocused",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/MouseUtils/MouseHighlighter/trace.cpp
+++ b/src/modules/MouseUtils/MouseHighlighter/trace.cpp
@@ -18,7 +18,6 @@ void Trace::EnableMouseHighlighter(const bool enabled) noexcept
        "MouseHighlighter_EnableMouseHighlighter",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -29,6 +28,5 @@ void Trace::StartHighlightingSession() noexcept
        g_hProvider,
        "MouseHighlighter_StartHighlightingSession",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/MouseUtils/MouseJump/trace.cpp
+++ b/src/modules/MouseUtils/MouseJump/trace.cpp
@@ -17,7 +17,6 @@ void Trace::EnableJumpTool(const bool enabled) noexcept
        "MouseJump_EnableJumpTool",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -27,6 +26,5 @@ void Trace::InvokeJumpTool() noexcept
        g_hProvider,
        "MouseJump_InvokeJumpTool",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/MouseUtils/MousePointerCrosshairs/trace.cpp
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/trace.cpp
@@ -18,7 +18,6 @@ void Trace::EnableMousePointerCrosshairs(const bool enabled) noexcept
        "MousePointerCrosshairs_EnableMousePointerCrosshairs",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -29,6 +28,5 @@ void Trace::StartDrawingCrosshairs() noexcept
        g_hProvider,
        "MousePointerCrosshairs_StartDrawingCrosshairs",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/MouseWithoutBorders/ModuleInterface/trace.cpp
+++ b/src/modules/MouseWithoutBorders/ModuleInterface/trace.cpp
@@ -23,7 +23,6 @@ void Trace::MouseWithoutBorders::Enable(bool enabled) noexcept
        EventEnableMouseWithoutBordersKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, EventEnabledKey));
 }

@@ -34,7 +33,6 @@ void Trace::MouseWithoutBorders::ToggleServiceRegistration(bool enabled) noexcep
        "MouseWithoutBorders_ToggleServiceRegistration",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, EventEnabledKey));
 }

@@ -44,8 +42,7 @@ void Trace::MouseWithoutBorders::Activate() noexcept
        g_hProvider,
        "MouseWithoutBorders_Activate",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Log that the user tried to activate the editor
@@ -55,6 +52,5 @@ void Trace::MouseWithoutBorders::AddFirewallRule() noexcept
        g_hProvider,
        "MouseWithoutBorders_AddFirewallRule",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/PowerOCR/PowerOCRModuleInterface/trace.cpp
+++ b/src/modules/PowerOCR/PowerOCRModuleInterface/trace.cpp
@@ -18,6 +18,5 @@ void Trace::EnablePowerOCR(const bool enabled) noexcept
        "PowerOCR_EnablePowerOCR",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }
--- a/src/modules/ShortcutGuide/ShortcutGuide/trace.cpp
+++ b/src/modules/ShortcutGuide/ShortcutGuide/trace.cpp
@@ -19,8 +19,7 @@ void Trace::SendGuideSession(const __int64 duration_ms, const wchar_t* close_typ
        TraceLoggingWideString(close_type, "CloseType"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::SendSettings(ShortcutGuideSettings settings) noexcept
@@ -37,6 +36,5 @@ void Trace::SendSettings(ShortcutGuideSettings settings) noexcept
        TraceLoggingInt32(settings.windowsKeyPressTimeForTaskbarIconShortcuts, "WindowsKeyPressTimeForTaskbarIconShortcuts"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/alwaysontop/AlwaysOnTop/trace.cpp
+++ b/src/modules/alwaysontop/AlwaysOnTop/trace.cpp
@@ -25,7 +25,6 @@ void Trace::AlwaysOnTop::Enable(bool enabled) noexcept
        EventEnableAlwaysOnTopKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, EventEnabledKey));
 }

@@ -35,8 +34,7 @@ void Trace::AlwaysOnTop::PinWindow() noexcept
        g_hProvider,
        EventPinWindowKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::AlwaysOnTop::UnpinWindow() noexcept
@@ -45,6 +43,5 @@ void Trace::AlwaysOnTop::UnpinWindow() noexcept
        g_hProvider,
        EventUnpinWindowKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/awake/AwakeModuleInterface/trace.cpp
+++ b/src/modules/awake/AwakeModuleInterface/trace.cpp
@@ -18,6 +18,5 @@ void Trace::EnableAwake(const bool enabled) noexcept
        "Awake_EnableAwake",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }
--- a/src/modules/cmdNotFound/CmdNotFoundModuleInterface/trace.cpp
+++ b/src/modules/cmdNotFound/CmdNotFoundModuleInterface/trace.cpp
@@ -18,6 +18,5 @@ void Trace::EnableCmdNotFoundGpo(const bool enabled) noexcept
        "CmdNotFound_EnableCmdNotFound",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }
--- a/src/modules/colorPicker/ColorPicker/trace.cpp
+++ b/src/modules/colorPicker/ColorPicker/trace.cpp
@@ -18,6 +18,5 @@ void Trace::EnableColorPicker(const bool enabled) noexcept
        "ColorPicker_EnableColorPicker",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }
--- a/src/modules/fancyzones/FancyZonesLib/trace.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/trace.cpp
@@ -117,7 +117,6 @@ void Trace::FancyZones::EnableFancyZones(bool enabled) noexcept
        EventEnableFancyZonesKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, EventEnabledKey));
 }

@@ -128,7 +127,6 @@ void Trace::FancyZones::OnKeyDown(DWORD vkCode, bool win, bool control, bool inM
        EventKeyDownKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(vkCode, PressedKeyCodeKey),
        TraceLoggingBoolean(win, PressedWindowKey),
        TraceLoggingBoolean(control, PressedControlKey),
@@ -210,7 +208,6 @@ void Trace::FancyZones::DataChanged() noexcept
        EventZoneSettingsChangedKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingInt32(appsHistorySize, AppsInHistoryCountKey),
        TraceLoggingInt32(static_cast<int>(customZones.size()), CustomZoneSetCountKey),
        TraceLoggingInt32Array(customZonesArray.get(), static_cast<uint16_t>(customZones.size()), NumberOfZonesForEachCustomZoneSetKey),
@@ -226,7 +223,6 @@ void Trace::FancyZones::EditorLaunched(int value) noexcept
        EventEditorLaunchKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingInt32(value, EditorLaunchValueKey));
 }

@@ -238,7 +234,6 @@ void Trace::FancyZones::Error(const DWORD errorCode, std::wstring errorMessage,
        "FancyZones_Error",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(methodName.c_str(), "MethodName"),
        TraceLoggingValue(errorCode, "ErrorCode"),
        TraceLoggingValue(errorMessage.c_str(), "ErrorMessage"));
@@ -251,7 +246,6 @@ void Trace::FancyZones::QuickLayoutSwitched(bool shortcutUsed) noexcept
        EventQuickLayoutSwitchKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(shortcutUsed, QuickLayoutSwitchedWithShortcutUsed));
 }

@@ -263,7 +257,6 @@ void Trace::FancyZones::SnapNewWindowIntoZone(Layout* activeLayout, const Layout
        EventSnapNewWindowIntoZone,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(reinterpret_cast<void*>(activeLayout), ActiveSetKey),
        TraceLoggingValue(zoneInfo.NumberOfZones, NumberOfZonesKey),
        TraceLoggingValue(zoneInfo.NumberOfWindows, NumberOfWindowsKey));
@@ -277,7 +270,6 @@ void Trace::FancyZones::KeyboardSnapWindowToZone(Layout* activeLayout, const Lay
        EventKeyboardSnapWindowToZone,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(reinterpret_cast<void*>(activeLayout), ActiveSetKey),
        TraceLoggingValue(zoneInfo.NumberOfZones, NumberOfZonesKey),
        TraceLoggingValue(zoneInfo.NumberOfWindows, NumberOfWindowsKey));
@@ -304,7 +296,6 @@ void Trace::SettingsTelemetry(const Settings& settings) noexcept
        EventSettingsKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(settings.shiftDrag, ShiftDragKey),
        TraceLoggingBoolean(settings.mouseSwitch, MouseSwitchKey),
        TraceLoggingBoolean(settings.displayOrWorkAreaChange_moveWindows, MoveWindowsOnDisplayChangeKey),
@@ -342,8 +333,7 @@ void Trace::VirtualDesktopChanged() noexcept
        g_hProvider,
        EventDesktopChangedKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::WorkArea::KeyUp(WPARAM wParam) noexcept
@@ -353,7 +343,6 @@ void Trace::WorkArea::KeyUp(WPARAM wParam) noexcept
        EventWorkAreaKeyUpKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(wParam, KeyboardValueKey));
 }

@@ -365,7 +354,6 @@ void Trace::WorkArea::MoveOrResizeStarted(_In_opt_ Layout* activeLayout, const L
        EventMoveOrResizeStartedKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(reinterpret_cast<void*>(activeLayout), ActiveSetKey),
        TraceLoggingValue(zoneInfo.NumberOfZones, NumberOfZonesKey),
        TraceLoggingValue(zoneInfo.NumberOfWindows, NumberOfWindowsKey));
@@ -379,7 +367,6 @@ void Trace::WorkArea::MoveOrResizeEnd(_In_opt_ Layout* activeLayout, const Layou
        EventMoveOrResizeEndedKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(reinterpret_cast<void*>(activeLayout), ActiveSetKey),
        TraceLoggingValue(zoneInfo.NumberOfZones, NumberOfZonesKey),
        TraceLoggingValue(zoneInfo.NumberOfWindows, NumberOfWindowsKey));
@@ -393,7 +380,6 @@ void Trace::WorkArea::CycleActiveZoneSet(_In_opt_ Layout* activeLayout, const La
        EventCycleActiveZoneSetKey,
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(reinterpret_cast<void*>(activeLayout), ActiveSetKey),
        TraceLoggingValue(zoneInfo.NumberOfZones, NumberOfZonesKey),
        TraceLoggingValue(zoneInfo.NumberOfWindows, NumberOfWindowsKey),
--- a/src/modules/imageresizer/ImageResizerLib/trace.cpp
+++ b/src/modules/imageresizer/ImageResizerLib/trace.cpp
@@ -17,7 +17,6 @@ void Trace::EnableImageResizer(_In_ bool enabled) noexcept
        "ImageResizer_EnableImageResizer",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -27,8 +26,7 @@ void Trace::Invoked() noexcept
        g_hProvider,
        "ImageResizer_Invoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::InvokedRet(_In_ HRESULT hr) noexcept
@@ -38,8 +36,7 @@ void Trace::InvokedRet(_In_ HRESULT hr) noexcept
        "ImageResizer_InvokedRet",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingHResult(hr),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::QueryContextMenuError(_In_ HRESULT hr) noexcept
@@ -49,6 +46,5 @@ void Trace::QueryContextMenuError(_In_ HRESULT hr) noexcept
        "ImageResizer_QueryContextMenuError",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingHResult(hr),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/trace.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorLibrary/trace.cpp
@@ -18,7 +18,6 @@ void Trace::KeyRemapCount(const DWORD keyToKeyCount, const DWORD keyToShortcutCo
        "KeyboardManager_KeyRemapCount",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(keyToKeyCount + keyToShortcutCount, "KeyRemapCount"),
        TraceLoggingValue(keyToKeyCount, "KeyToKeyRemapCount"),
        TraceLoggingValue(keyToShortcutCount, "KeyToShortcutRemapCount"),
@@ -33,7 +32,6 @@ void Trace::OSLevelShortcutRemapCount(const DWORD shortcutToShortcutCount, const
        "KeyboardManager_OSLevelShortcutRemapCount",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(shortcutToShortcutCount + shortcutToKeyCount, "OSLevelShortcutRemapCount"),
        TraceLoggingValue(shortcutToShortcutCount, "OSLevelShortcutToShortcutRemapCount"),
        TraceLoggingValue(shortcutToKeyCount, "OSLevelShortcutToKeyRemapCount"));
@@ -47,7 +45,6 @@ void Trace::AppSpecificShortcutRemapCount(const DWORD shortcutToShortcutCount, c
        "KeyboardManager_AppSpecificShortcutRemapCount",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(shortcutToShortcutCount + shortcutToKeyCount, "AppSpecificShortcutRemapCount"),
        TraceLoggingValue(shortcutToShortcutCount, "AppSpecificShortcutToShortcutRemapCount"),
        TraceLoggingValue(shortcutToKeyCount, "AppSpecificShortcutToKeyRemapCount"));
@@ -61,7 +58,6 @@ void Trace::Error(const DWORD errorCode, std::wstring errorMessage, std::wstring
        "KeyboardManager_Error",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(methodName.c_str(), "MethodName"),
        TraceLoggingValue(errorCode, "ErrorCode"),
        TraceLoggingValue(errorMessage.c_str(), "ErrorMessage"));
--- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/trace.cpp
+++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/trace.cpp
@@ -18,8 +18,7 @@ void Trace::DailyKeyToKeyRemapInvoked() noexcept
        g_hProvider,
        "KeyboardManager_DailyKeyToKeyRemapInvoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Log if a key to shortcut remap has been invoked today.
@@ -29,8 +28,7 @@ void Trace::DailyKeyToShortcutRemapInvoked() noexcept
        g_hProvider,
        "KeyboardManager_DailyKeyToShortcutRemapInvoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Log if a shortcut to key remap has been invoked today.
@@ -40,8 +38,7 @@ void Trace::DailyShortcutToKeyRemapInvoked() noexcept
        g_hProvider,
        "KeyboardManager_DailyShortcutToKeyRemapInvoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Log if a shortcut to shortcut remap has been invoked today.
@@ -51,8 +48,7 @@ void Trace::DailyShortcutToShortcutRemapInvoked() noexcept
        g_hProvider,
        "KeyboardManager_DailyShortcutToShortcutRemapInvoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Log if an app specific shortcut to key remap has been invoked today.
@@ -62,8 +58,7 @@ void Trace::DailyAppSpecificShortcutToKeyRemapInvoked() noexcept
        g_hProvider,
        "KeyboardManager_DailyAppSpecificShortcutToKeyRemapInvoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Log if an app specific shortcut to shortcut remap has been invoked today.
@@ -73,8 +68,7 @@ void Trace::DailyAppSpecificShortcutToShortcutRemapInvoked() noexcept
        g_hProvider,
        "KeyboardManager_DailyAppSpecificShortcutToShortcutRemapInvoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Log if a key remap has been invoked (not being used currently, due to being garrulous)
@@ -86,8 +80,7 @@ void Trace::KeyRemapInvoked(bool isKeyToKey) noexcept
            g_hProvider,
            "KeyboardManager_KeyToKeyRemapInvoked",
            ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-            TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-            TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+            TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
    }
    else
    {
@@ -95,8 +88,7 @@ void Trace::KeyRemapInvoked(bool isKeyToKey) noexcept
            g_hProvider,
            "KeyboardManager_KeyToShortcutRemapInvoked",
            ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-            TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-            TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+            TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
    }
 }

@@ -111,8 +103,7 @@ void Trace::ShortcutRemapInvoked(bool isShortcutToShortcut, bool isAppSpecific)
                g_hProvider,
                "KeyboardManager_AppSpecificShortcutToShortcutRemapInvoked",
                ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
        }
        else
        {
@@ -120,8 +111,7 @@ void Trace::ShortcutRemapInvoked(bool isShortcutToShortcut, bool isAppSpecific)
                g_hProvider,
                "KeyboardManager_AppSpecificShortcutToKeyRemapInvoked",
                ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
        }
    }
    else
@@ -132,8 +122,7 @@ void Trace::ShortcutRemapInvoked(bool isShortcutToShortcut, bool isAppSpecific)
                g_hProvider,
                "KeyboardManager_OSLevelShortcutToShortcutRemapInvoked",
                ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
        }
        else
        {
@@ -141,8 +130,7 @@ void Trace::ShortcutRemapInvoked(bool isShortcutToShortcut, bool isAppSpecific)
                g_hProvider,
                "KeyboardManager_OSLevelShortcutToKeyRemapInvoked",
                ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
        }
    }
 }
@@ -193,7 +181,6 @@ void Trace::SendKeyAndShortcutRemapLoadedConfiguration(State& remappings) noexce
                "KeyboardManager_KeyRemapConfigurationLoaded",
                ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
                TraceLoggingInt64(keyRemap.first, "KeyRemapFrom"),
                TraceLoggingInt64(keyRemappedTo, "KeyRemapTo"),
                TraceLoggingWideString(keyboardMap.GetKeyName(keyRemap.first).c_str(), "HumanRemapFrom"),
@@ -207,7 +194,6 @@ void Trace::SendKeyAndShortcutRemapLoadedConfiguration(State& remappings) noexce
                "KeyboardManager_KeyRemapConfigurationLoaded",
                ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
                TraceLoggingInt64(keyRemap.first, "KeyRemapFrom"),
                TraceLoggingInt64(shortcutRemappedTo.actionKey, "KeyRemapTo"),
                TraceLoggingInt8(static_cast<INT8>(shortcutRemappedTo.winKey), "ModifierRemapToWin"),
@@ -230,7 +216,6 @@ void Trace::SendKeyAndShortcutRemapLoadedConfiguration(State& remappings) noexce
                "KeyboardManager_ShortcutRemapConfigurationLoaded",
                ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
                TraceLoggingInt64(shortcutRemappedFrom.actionKey, "KeyRemapFrom"),
                TraceLoggingInt8(static_cast<INT8>(shortcutRemappedFrom.winKey), "ModifierRemapFromWin"),
                TraceLoggingInt8(static_cast<INT8>(shortcutRemappedFrom.ctrlKey), "ModifierRemapFromCtrl"),
@@ -255,7 +240,6 @@ void Trace::SendKeyAndShortcutRemapLoadedConfiguration(State& remappings) noexce
                "KeyboardManager_ShortcutRemapConfigurationLoaded",
                ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
                TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
                TraceLoggingInt64(shortcutRemappedFrom.actionKey, "KeyRemapFrom"),
                TraceLoggingInt8(static_cast<INT8>(shortcutRemappedFrom.winKey), "ModifierRemapFromWin"),
                TraceLoggingInt8(static_cast<INT8>(shortcutRemappedFrom.ctrlKey), "ModifierRemapFromCtrl"),
@@ -287,7 +271,6 @@ void Trace::SendKeyAndShortcutRemapLoadedConfiguration(State& remappings) noexce
                    "KeyboardManager_AppSpecificShortcutRemapConfigurationLoaded",
                    ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
                    TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                    TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
                    TraceLoggingInt64(shortcutRemappedFrom.actionKey, "KeyRemapFrom"),
                    TraceLoggingInt8(static_cast<INT8>(shortcutRemappedFrom.winKey), "ModifierRemapFromWin"),
                    TraceLoggingInt8(static_cast<INT8>(shortcutRemappedFrom.ctrlKey), "ModifierRemapFromCtrl"),
@@ -313,7 +296,6 @@ void Trace::SendKeyAndShortcutRemapLoadedConfiguration(State& remappings) noexce
                    "KeyboardManager_AppSpecificShortcutRemapConfigurationLoaded",
                    ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
                    TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-                    TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
                    TraceLoggingInt64(shortcutRemappedFrom.actionKey, "KeyRemapFrom"),
                    TraceLoggingInt8(static_cast<INT8>(shortcutRemappedFrom.winKey), "ModifierRemapFromWin"),
                    TraceLoggingInt8(static_cast<INT8>(shortcutRemappedFrom.ctrlKey), "ModifierRemapFromCtrl"),
@@ -341,8 +323,7 @@ void Trace::ErrorSendingKeyAndShortcutRemapLoadedConfiguration() noexcept
        g_hProvider,
        "KeyboardManager_ErrorSendingKeyAndShortcutRemapLoadedConfiguration",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Log if an error occurs in KBM
@@ -353,7 +334,6 @@ void Trace::Error(const DWORD errorCode, std::wstring errorMessage, std::wstring
        "KeyboardManager_Error",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingValue(methodName.c_str(), "MethodName"),
        TraceLoggingValue(errorCode, "ErrorCode"),
        TraceLoggingValue(errorMessage.c_str(), "ErrorMessage"));
--- a/src/modules/keyboardmanager/dll/trace.cpp
+++ b/src/modules/keyboardmanager/dll/trace.cpp
@@ -18,6 +18,5 @@ void Trace::EnableKeyboardManager(const bool enabled) noexcept
        "KeyboardManager_EnableKeyboardManager",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }
--- a/src/modules/peek/peek/trace.cpp
+++ b/src/modules/peek/peek/trace.cpp
@@ -18,7 +18,6 @@ void Trace::EnablePeek(const bool enabled) noexcept
        "Peek_EnablePeek",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -29,8 +28,7 @@ void Trace::PeekInvoked() noexcept
        g_hProvider,
        "Peek_InvokePeek",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 // Event to send settings telemetry.
@@ -48,6 +46,5 @@ void Trace::SettingsTelemetry(PowertoyModuleIface::Hotkey& hotkey) noexcept
        "Peek_Settings",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingWideString(hotKeyStr.c_str(), "HotKey"));
 }
--- a/src/modules/poweraccent/PowerAccentModuleInterface/trace.cpp
+++ b/src/modules/poweraccent/PowerAccentModuleInterface/trace.cpp
@@ -17,6 +17,5 @@ void Trace::EnablePowerAccent(const bool enabled) noexcept
        "PowerAccent_EnablePowerAccent",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }
--- a/src/modules/powerrename/lib/trace.cpp
+++ b/src/modules/powerrename/lib/trace.cpp
@@ -17,8 +17,7 @@ void Trace::Invoked() noexcept
        g_hProvider,
        "PowerRename_Invoked",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::InvokedRet(_In_ HRESULT hr) noexcept
@@ -28,8 +27,7 @@ void Trace::InvokedRet(_In_ HRESULT hr) noexcept
        "PowerRename_InvokedRet",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingHResult(hr),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::EnablePowerRename(_In_ bool enabled) noexcept
@@ -39,7 +37,6 @@ void Trace::EnablePowerRename(_In_ bool enabled) noexcept
        "PowerRename_EnablePowerRename",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -50,8 +47,7 @@ void Trace::UIShownRet(_In_ HRESULT hr) noexcept
        "PowerRename_UIShownRet",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingHResult(hr),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::RenameOperation(_In_ UINT totalItemCount, _In_ UINT selectedItemCount, _In_ UINT renameItemCount, _In_ DWORD flags, _In_ PCWSTR extensionList) noexcept
@@ -61,7 +57,6 @@ void Trace::RenameOperation(_In_ UINT totalItemCount, _In_ UINT selectedItemCoun
        "PowerRename_RenameOperation",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingUInt32(totalItemCount, "TotalItemCount"),
        TraceLoggingUInt32(selectedItemCount, "SelectedItemCount"),
        TraceLoggingUInt32(renameItemCount, "RenameItemCount"),
@@ -76,7 +71,6 @@ void Trace::SettingsChanged() noexcept
        "PowerRename_SettingsChanged",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(CSettingsInstance().GetEnabled(), "IsEnabled"),
        TraceLoggingBoolean(CSettingsInstance().GetShowIconOnMenu(), "ShowIconOnMenu"),
        TraceLoggingBoolean(CSettingsInstance().GetExtendedContextMenuOnly(), "ExtendedContextMenuOnly"),
--- a/src/modules/previewpane/powerpreview/trace.cpp
+++ b/src/modules/previewpane/powerpreview/trace.cpp
@@ -29,8 +29,7 @@ void Trace::EnabledPowerPreview(bool enabled)
        TraceLoggingBoolean(enabled, "Enabled"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::PowerPreviewSettingsUpdated(LPCWSTR SettingsName, bool oldState, bool newState, bool globalState)
@@ -44,8 +43,7 @@ void Trace::PowerPreviewSettingsUpdated(LPCWSTR SettingsName, bool oldState, boo
        TraceLoggingBoolean(globalState, "Global_File_Explorer_Settings_State"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::PowerPreviewSettingsUpdateFailed(LPCWSTR SettingsName, bool oldState, bool newState, bool globalState)
@@ -59,8 +57,7 @@ void Trace::PowerPreviewSettingsUpdateFailed(LPCWSTR SettingsName, bool oldState
        TraceLoggingBoolean(globalState, "Global_File_Explorer_Settings_State"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::SetConfigInvalidJSON(const char* exceptionMessage)
@@ -71,8 +68,7 @@ void Trace::SetConfigInvalidJSON(const char* exceptionMessage)
        TraceLoggingString(exceptionMessage, "ExceptionMessage"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::Destroyed()
@@ -82,8 +78,7 @@ void Trace::Destroyed()
        "PowerPreview_TweakUISettings_Destroyed",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::InitSetErrorLoadingFile(const char* exceptionMessage)
@@ -94,6 +89,5 @@ void Trace::InitSetErrorLoadingFile(const char* exceptionMessage)
        TraceLoggingString(exceptionMessage, "ExceptionMessage"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/registrypreview/RegistryPreviewExt/Trace.cpp
+++ b/src/modules/registrypreview/RegistryPreviewExt/Trace.cpp
@@ -18,7 +18,6 @@ void Trace::EnableRegistryPreview(_In_ bool enabled) noexcept
        "RegistryPreview_EnableRegistryPreview",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -29,6 +28,5 @@ void Trace::ActivateEditor() noexcept
        g_hProvider,
        "RegistryPreview_Activate",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/modules/videoconference/VideoConferenceModule/trace.cpp
+++ b/src/modules/videoconference/VideoConferenceModule/trace.cpp
@@ -19,7 +19,6 @@ void Trace::EnableVideoConference(const bool enabled) noexcept
        "VideoConference_EnableVideoConference",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII),
        TraceLoggingBoolean(enabled, "Enabled"));
 }

@@ -35,8 +34,7 @@ void Trace::SettingsChanged(const struct VideoConferenceSettings& settings) noex
        TraceLoggingBool(CustomOverlayImage, "CustomImageOverlayUsed"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::MicrophoneMuted() noexcept
@@ -47,8 +45,7 @@ void Trace::MicrophoneMuted() noexcept
        TraceLoggingBoolean(true, "MicrophoneMuted"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::CameraMuted() noexcept
@@ -59,6 +56,5 @@ void Trace::CameraMuted() noexcept
        TraceLoggingBoolean(true, "CameraMuted"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/src/runner/trace.cpp
+++ b/src/runner/trace.cpp
@@ -21,8 +21,7 @@ void Trace::EventLaunch(const std::wstring& versionNumber, bool isProcessElevate
        TraceLoggingBoolean(isProcessElevated, "Elevated"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }

 void Trace::SettingsChanged(const GeneralSettings& settings)
@@ -54,6 +53,5 @@ void Trace::SettingsChanged(const GeneralSettings& settings)
        TraceLoggingWideString(settings.theme.c_str(), "Theme"),
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }
--- a/tools/project_template/ModuleTemplate/trace.cpp
+++ b/tools/project_template/ModuleTemplate/trace.cpp
@@ -17,6 +17,5 @@ void Trace::MyEvent()
        "PowerToyName_MyEvent",
        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
-        TraceLoggingEventTag(MICROSOFT_EVENTTAG_DROP_PII));
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
 }