[General]Add an option for telemetry opt-in and visualization(#34078)

* Data diagnostics opt-in

* [c++] Drop DROP_PII flag

* Bump telemtry package to 2.0.2

* Drop DropPii from custom actions

* Cleanup

* Do not start manually C# EtwTrace. FZ engine exit event.

* ImageResizer, PowerRename, FileLocksmith prev handlers

* Revert C# handlers exe logging

* Revert "Revert C# handlers exe logging"

This reverts commit 4c75a3953b.

* Do not recreate EtwTrace

* consume package

* xaml formatting

* Fix deps.json audit

* Update telem package paths

* Address PR comments

* Fix AdvancedPaste close on PT close

* Override etl file name for explorer loaded dlls
Start/stop tracer when needed for explorer loaded dlls to prevent explorer overload

* Fix setting desc

* Fix missing events

* Add infobar to restart when enable data viewing

* Flush on timer every 30s

* [Settings] Update View Data diagnostic description text
[New+] Add tracer

* Show Restart info bar for both enable/disable data viewer

* Fix newplus

* Fix stuck on restart and terminate AdvPaste exe on destroy()

* [Installer] Add tracer

* Address PR comment

* Add missing tracers

* Exclude etw dir from BugReport

* Fix bad merge

* [Hosts] Proper exit on initial dialog

* [OOBE] Make Data diagnostic setting visible without scroll

* [OOBE] Add hiperlynk to open general settings

* Disable data view on disabling data diagnostics

* Don't disable View data button

* Fix disabling data viewing

* Add missing dot

* Revert formatting

src/modules/PowerOCR/PowerOCR/App.xaml.cs

@@ -6,10 +6,12 @@ using System;
 using System.Globalization;
 using System.Threading;
 using System.Windows;
-
+using Common.UI;
 using ManagedCommon;
+using Microsoft.PowerToys.Telemetry;
 using PowerOCR.Keyboard;
 using PowerOCR.Settings;
+using PowerToys.Interop;
 
 namespace PowerOCR;
 
@@ -22,6 +24,7 @@ public partial class App : Application, IDisposable
     private EventMonitor? eventMonitor;
     private Mutex? _instanceMutex;
     private int _powerToysRunnerPid;
+    private ETWTrace etwTrace = new ETWTrace();
 
     private CancellationTokenSource NativeThreadCTS { get; set; }
 
@@ -43,12 +46,19 @@ public partial class App : Application, IDisposable
         }
 
         NativeThreadCTS = new CancellationTokenSource();
+
+        NativeEventWaiter.WaitForEventLoop(
+            Constants.TerminatePowerOCRSharedEvent(),
+            this.Shutdown,
+            this.Dispatcher,
+            NativeThreadCTS.Token);
     }
 
     public void Dispose()
     {
         GC.SuppressFinalize(this);
         keyboardMonitor?.Dispose();
+        etwTrace?.Dispose();
     }
 
     private void Application_Startup(object sender, StartupEventArgs e)

src/modules/PowerOCR/PowerOCRModuleInterface/dllmain.cpp

@@ -69,6 +69,8 @@ private:
 
     // Handle to event used to invoke PowerOCR
     HANDLE m_hInvokeEvent;
+    // Handle to event used to terminate PowerOCR
+    HANDLE m_hTerminateEvent;
 
     void parse_hotkey(PowerToysSettings::PowerToyValues& settings)
     {
@@ -160,6 +162,7 @@ public:
         app_key = PowerOcrConstants::ModuleKey;
         LoggerHelpers::init_logger(app_key, L"ModuleInterface", "TextExtractor");
         m_hInvokeEvent = CreateDefaultEvent(CommonSharedConstants::SHOW_POWEROCR_SHARED_EVENT);
+        m_hTerminateEvent = CreateDefaultEvent(CommonSharedConstants::TERMINATE_POWEROCR_SHARED_EVENT);
         init_settings();
     }
 
@@ -249,6 +252,8 @@ public:
         if (m_enabled)
         {
             ResetEvent(m_hInvokeEvent);
+            SetEvent(m_hTerminateEvent);
+            WaitForSingleObject(m_hProcess, 1500);
             TerminateProcess(m_hProcess, 1);
         }
 

src/modules/PowerOCR/PowerOCRModuleInterface/pch.h

@@ -2,6 +2,5 @@
 #include <windows.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
-#include <ProjectTelemetry.h>
 #include <shellapi.h>
 #include <Shlwapi.h>

src/modules/PowerOCR/PowerOCRModuleInterface/trace.cpp

@@ -1,6 +1,8 @@
 #include "pch.h"
 #include "trace.h"
 
+#include <common/Telemetry/TraceBase.h>
+
 TRACELOGGING_DEFINE_PROVIDER(
     g_hProvider,
     "Microsoft.PowerToys",
@@ -8,20 +10,10 @@ TRACELOGGING_DEFINE_PROVIDER(
     (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
     TraceLoggingOptionProjectTelemetry());
 
-void Trace::RegisterProvider()
-{
-    TraceLoggingRegister(g_hProvider);
-}
-
-void Trace::UnregisterProvider()
-{
-    TraceLoggingUnregister(g_hProvider);
-}
-
 // Log if the user has PowerOCR enabled or disabled
 void Trace::EnablePowerOCR(const bool enabled) noexcept
 {
-    TraceLoggingWrite(
+    TraceLoggingWriteWrapper(
         g_hProvider,
         "PowerOCR_EnablePowerOCR",
         ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),

src/modules/PowerOCR/PowerOCRModuleInterface/trace.h

@@ -1,10 +1,10 @@
 #pragma once
-class Trace
+
+#include <common/Telemetry/TraceBase.h>
+
+class Trace : public telemetry::TraceBase
 {
 public:
-    static void RegisterProvider();
-    static void UnregisterProvider();
-
     // Log if the user has PowerOCR enabled or disabled
     static void EnablePowerOCR(const bool enabled) noexcept;
 };