From 45df778ecc8460f7333c126de808c1c9281457e9 Mon Sep 17 00:00:00 2001
From: bytesized <bytesized@users.noreply.github.com>
Date: Wed, 13 May 2020 18:09:11 -0700
Subject: [PATCH] Bug 1621703 - Add default browser notification telemetry

---
 .../default-browser.1.schema.json               | 17 +++++++++++++++++
 .../default-browser.1.schema.json               | 17 +++++++++++++++++
 ...efault-browser.1.sample_all_fields.pass.json | 12 ++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 validation/default-browser-agent/default-browser.1.sample_all_fields.pass.json

diff --git a/schemas/default-browser-agent/default-browser/default-browser.1.schema.json b/schemas/default-browser-agent/default-browser/default-browser.1.schema.json
index 2abdc7a..982e11a 100644
--- a/schemas/default-browser-agent/default-browser/default-browser.1.schema.json
+++ b/schemas/default-browser-agent/default-browser/default-browser.1.schema.json
@@ -7,10 +7,27 @@
     "build_version": {
       "type": "string"
     },
+    "client_id": {
+      "description": "A UUID, specific to the Windows user",
+      "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+      "type": "string"
+    },
     "default_browser": {
       "description": "The current default browser",
       "type": "string"
     },
+    "notification_action": {
+      "description": "What action was taken by the user then the toast notification was displayed",
+      "type": "string"
+    },
+    "notification_shown": {
+      "description": "Whether the notification was shown, not shown, or resulted in an error",
+      "type": "string"
+    },
+    "notification_type": {
+      "description": "Whether the notification shown was the initial notification, or the followup",
+      "type": "string"
+    },
     "os_locale": {
       "description": "The current user's OS locale setting",
       "type": "string"
diff --git a/templates/default-browser-agent/default-browser/default-browser.1.schema.json b/templates/default-browser-agent/default-browser/default-browser.1.schema.json
index bb011b8..556805f 100644
--- a/templates/default-browser-agent/default-browser/default-browser.1.schema.json
+++ b/templates/default-browser-agent/default-browser/default-browser.1.schema.json
@@ -7,6 +7,23 @@
     "build_version": {
       "type": "string"
     },
+    "client_id": {
+      "description": "A UUID, specific to the Windows user",
+      @COMMON_PATTERN_UUID_1_JSON@,
+      "type": "string"
+    },
+    "notification_action": {
+      "description": "What action was taken by the user then the toast notification was displayed",
+      "type": "string"
+    },
+    "notification_shown": {
+      "description": "Whether the notification was shown, not shown, or resulted in an error",
+      "type": "string"
+    },
+    "notification_type": {
+      "description": "Whether the notification shown was the initial notification, or the followup",
+      "type": "string"
+    },
     "os_version": {
       "description": "Windows version numnber in major.minor.build.UBR format (UBR is optional, only available on Win10)",
       "type": "string"
diff --git a/validation/default-browser-agent/default-browser.1.sample_all_fields.pass.json b/validation/default-browser-agent/default-browser.1.sample_all_fields.pass.json
new file mode 100644
index 0000000..96a9a3c
--- /dev/null
+++ b/validation/default-browser-agent/default-browser.1.sample_all_fields.pass.json
@@ -0,0 +1,12 @@
+{
+  "build_channel": "nightly",
+  "build_version": "74.0a1",
+  "os_version": "10.0.18363.592",
+  "os_locale": "en-US",
+  "default_browser": "firefox",
+  "previous_default_browser": "edge",
+  "client_id": "98D8A499-DBA0-4340-A058-64CF35986FFB",
+  "notification_type": "initial",
+  "notification_shown": "shown",
+  "notification_action": "dismissed-by-timeout"
+}