From 76ebed0897a3ee51fd401e66943d095480007fd9 Mon Sep 17 00:00:00 2001
From: Jaime Bernardo <jaime@janeasystems.com>
Date: Wed, 31 Aug 2022 15:41:21 +0100
Subject: [PATCH] [PowerOCR][Telemetry]Cancel and capture events (#20165)

---
 .../PowerOCR/PowerOCR/Helpers/WindowUtilities.cs |  2 +-
 src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs |  4 ++++
 ...OverlayEvent.cs => PowerOCRCancelledEvent.cs} |  2 +-
 .../PowerOCR/Telemetry/PowerOCRCaptureEvent.cs   | 16 ++++++++++++++++
 .../PowerOCR/Telemetry/PowerOCRInvokedEvent.cs   | 16 ++++++++++++++++
 5 files changed, 38 insertions(+), 2 deletions(-)
 rename src/modules/PowerOCR/PowerOCR/Telemetry/{PowerOCRLaunchOverlayEvent.cs => PowerOCRCancelledEvent.cs} (87%)
 create mode 100644 src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRCaptureEvent.cs
 create mode 100644 src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRInvokedEvent.cs

diff --git a/src/modules/PowerOCR/PowerOCR/Helpers/WindowUtilities.cs b/src/modules/PowerOCR/PowerOCR/Helpers/WindowUtilities.cs
index fc75ec241d..d8a75e76c8 100644
--- a/src/modules/PowerOCR/PowerOCR/Helpers/WindowUtilities.cs
+++ b/src/modules/PowerOCR/PowerOCR/Helpers/WindowUtilities.cs
@@ -77,7 +77,7 @@ public static class WindowUtilities
             allFullscreenGrab.Add(overlay);
         }
 
-        PowerToysTelemetry.Log.WriteEvent(new PowerOCR.Telemetry.PowerOCRLaunchOverlayEvent());
+        PowerToysTelemetry.Log.WriteEvent(new PowerOCR.Telemetry.PowerOCRInvokedEvent());
     }
 
     internal static bool IsOCROverlayCreated()
diff --git a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs
index 4148abbe2d..ccb3cce41b 100644
--- a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs
+++ b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml.cs
@@ -8,6 +8,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
+using Microsoft.PowerToys.Telemetry;
 using PowerOCR.Helpers;
 using PowerOCR.Utilities;
 
@@ -101,6 +102,7 @@ public partial class OCROverlay : Window
         {
             case Key.Escape:
                 WindowUtilities.CloseAllOCROverlays();
+                PowerToysTelemetry.Log.WriteEvent(new PowerOCR.Telemetry.PowerOCRCancelledEvent());
                 break;
             default:
                 break;
@@ -276,11 +278,13 @@ public partial class OCROverlay : Window
             }
 
             WindowUtilities.CloseAllOCROverlays();
+            PowerToysTelemetry.Log.WriteEvent(new PowerOCR.Telemetry.PowerOCRCaptureEvent());
         }
     }
 
     private void CancelMenuItem_Click(object sender, RoutedEventArgs e)
     {
         WindowUtilities.CloseAllOCROverlays();
+        PowerToysTelemetry.Log.WriteEvent(new PowerOCR.Telemetry.PowerOCRCancelledEvent());
     }
 }
diff --git a/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRLaunchOverlayEvent.cs b/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRCancelledEvent.cs
similarity index 87%
rename from src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRLaunchOverlayEvent.cs
rename to src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRCancelledEvent.cs
index 05212ee94f..dcb5e759e6 100644
--- a/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRLaunchOverlayEvent.cs
+++ b/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRCancelledEvent.cs
@@ -9,7 +9,7 @@ using Microsoft.PowerToys.Telemetry.Events;
 namespace PowerOCR.Telemetry
 {
     [EventData]
-    public class PowerOCRLaunchOverlayEvent : EventBase, IEvent
+    public class PowerOCRCancelledEvent : EventBase, IEvent
     {
         public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
     }
diff --git a/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRCaptureEvent.cs b/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRCaptureEvent.cs
new file mode 100644
index 0000000000..9b71fec0cf
--- /dev/null
+++ b/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRCaptureEvent.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace PowerOCR.Telemetry
+{
+    [EventData]
+    public class PowerOCRCaptureEvent : EventBase, IEvent
+    {
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}
diff --git a/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRInvokedEvent.cs b/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRInvokedEvent.cs
new file mode 100644
index 0000000000..37c16c13f1
--- /dev/null
+++ b/src/modules/PowerOCR/PowerOCR/Telemetry/PowerOCRInvokedEvent.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace PowerOCR.Telemetry
+{
+    [EventData]
+    public class PowerOCRInvokedEvent : EventBase, IEvent
+    {
+        public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+    }
+}