From 17d19f74e09d88ef25af3824cc694ab6fe2b5234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Wed, 28 Aug 2024 19:44:34 +0000
Subject: [PATCH] Bug 1915228 - Remove expired telemetry scalars
 dom.event.confluence_load_count and dom.event.office_online_load_count,
 r=TravisLong.

Depends on D220328

Differential Revision: https://phabricator.services.mozilla.com/D220329
---
 .../KeyPressEventModelCheckerChild.sys.mjs    | 10 -----
 toolkit/components/telemetry/Scalars.yaml     | 41 -------------------
 2 files changed, 51 deletions(-)

diff --git a/toolkit/actors/KeyPressEventModelCheckerChild.sys.mjs b/toolkit/actors/KeyPressEventModelCheckerChild.sys.mjs
index 8b4fe82f1782..dc96a1b7ec17 100644
--- a/toolkit/actors/KeyPressEventModelCheckerChild.sys.mjs
+++ b/toolkit/actors/KeyPressEventModelCheckerChild.sys.mjs
@@ -45,11 +45,6 @@ export class KeyPressEventModelCheckerChild extends JSWindowActorChild {
     let isOldVersion = !editingElement.classList.contains(
       "WACViewPanel_DisableLegacyKeyCodeAndCharCode"
     );
-    Services.telemetry.keyedScalarAdd(
-      "dom.event.office_online_load_count",
-      isOldVersion ? "old" : "new",
-      1
-    );
     return isOldVersion;
   }
 
@@ -94,11 +89,6 @@ export class KeyPressEventModelCheckerChild extends JSWindowActorChild {
         return false;
       }
       let isOldVersion = version === "1.0";
-      Services.telemetry.keyedScalarAdd(
-        "dom.event.confluence_load_count",
-        isOldVersion ? "old" : "new",
-        1
-      );
       return isOldVersion;
     } catch (e) {
       return false;
diff --git a/toolkit/components/telemetry/Scalars.yaml b/toolkit/components/telemetry/Scalars.yaml
index 8ca7cf1c5c89..162f6e5bc3ea 100644
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -3758,47 +3758,6 @@ devtools.markup.scrollable.badge:
     record_in_processes:
       - 'main'
 
-dom.event:
-  confluence_load_count:
-    bug_numbers:
-      - 1514940
-    description: >
-      Number of times Confluence instances are loaded, and whether they are
-      compatible with conflated keypress event model or not, using "new"/"old".
-      I.e., collecting percentage of too old Confluence instance use count in
-      all Confluence instance use count.
-    expires: "71"
-    keyed: true
-    kind: uint
-    notification_emails:
-      - mnakano.birchill@mozilla.com
-    release_channel_collection: opt-out
-    products:
-      - 'firefox'
-      - 'fennec'
-    record_in_processes:
-      - 'content'
-
-  office_online_load_count:
-    bug_numbers:
-      - 1545410
-    description: >
-      Number of times Office Online Server instances are loaded, and whether
-      they are compatible with conflated keypress event model or not, using
-      "new"/"old".  I.e., collecting percentage of too old Confluence instance
-      use count in all Office Online Server instance use count.
-    expires: "71"
-    keyed: true
-    kind: uint
-    notification_emails:
-      - mnakano.birchill@mozilla.com
-    release_channel_collection: opt-out
-    products:
-      - 'firefox'
-      - 'fennec'
-    record_in_processes:
-      - 'content'
-
 mozstorage:
   sqlitejsm_transaction_timeout:
     bug_numbers: