From ccc380f11cf7167b0446e6ccc0ae2afc0b7b7dc0 Mon Sep 17 00:00:00 2001
From: Enrico Giordani <enricogior@users.noreply.github.com>
Date: Mon, 29 Mar 2021 11:20:49 +0200
Subject: [PATCH] [telemetry][ColorPicker] add event name support (#10476)

Allow to set a custom name for the event instead of just using the
class name.
---
 src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs    | 2 ++
 src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs  | 2 +-
 .../ColorPickerUI/Telemetry/ColorPickerSession.cs            | 5 +++++
 .../ColorPickerUI/Telemetry/ColorPickerSettings.cs           | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs b/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs
index ba1a43f3c8..1b657bb9c5 100644
--- a/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs
+++ b/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs
@@ -16,6 +16,8 @@ namespace Microsoft.PowerToys.Telemetry.Events
     {
         public bool UTCReplace_AppSessionGuid => true;
 
+        public string EventName { get; set; }
+
         private string _version;
 
         public string Version
diff --git a/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
index 707d514c0f..cad79cbd3d 100644
--- a/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
+++ b/src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
@@ -37,7 +37,7 @@ namespace Microsoft.PowerToys.Telemetry
             where T : EventBase, IEvent
         {
             this.Write<T>(
-                null,
+                telemetryEvent.EventName,
                 new EventSourceOptions()
                 {
                     Keywords = ProjectKeywordMeasure,
diff --git a/src/modules/colorPicker/ColorPickerUI/Telemetry/ColorPickerSession.cs b/src/modules/colorPicker/ColorPickerUI/Telemetry/ColorPickerSession.cs
index 6f1de4d3a4..07c1852fb5 100644
--- a/src/modules/colorPicker/ColorPickerUI/Telemetry/ColorPickerSession.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Telemetry/ColorPickerSession.cs
@@ -12,6 +12,11 @@ namespace ColorPicker.Telemetry
     [EventData]
     public class ColorPickerSession : EventBase, IEvent
     {
+        public ColorPickerSession()
+        {
+            EventName = "ColorPicker_Session";
+        }
+
         public string StartedAs { get; set; }
 
         public bool ZoomUsed { get; set; }
diff --git a/src/modules/colorPicker/ColorPickerUI/Telemetry/ColorPickerSettings.cs b/src/modules/colorPicker/ColorPickerUI/Telemetry/ColorPickerSettings.cs
index e9e1a66735..ea1eb6a03f 100644
--- a/src/modules/colorPicker/ColorPickerUI/Telemetry/ColorPickerSettings.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Telemetry/ColorPickerSettings.cs
@@ -15,6 +15,7 @@ namespace ColorPicker.Telemetry
         public ColorPickerSettings(IDictionary<string, bool> editorFormats)
         {
             EditorFormats = editorFormats;
+            EventName = "ColorPicker_Settings";
         }
 
         public string ActivationShortcut { get; set; }