Bug 1629966 - Remove Touch Bar telemetry. r=mikedeboer,chutten

Differential Revision: https://phabricator.services.mozilla.com/D70904

--HG--
extra : moz-landing-system : lando

browser/components/touchbar/MacTouchBar.js

@@ -35,11 +35,8 @@ XPCOMUtils.defineLazyServiceGetter(
  * TouchBarInput.
  * @param {string} commandName
  *        A XUL command.
- * @param {string} [telemetryKey]
- *        A string describing the command, sent for telemetry purposes.
- *        Intended to be shorter and more readable than the XUL command.
  */
-function execCommand(commandName, telemetryKey) {
+function execCommand(commandName) {
   if (!TouchBarHelper.window) {
     return;
   }
@@ -47,15 +44,6 @@ function execCommand(commandName, telemetryKey) {
   if (command) {
     command.doCommand();
   }
-
-  if (!telemetryKey) {
-    return;
-  }
-
-  let telemetry = Services.telemetry.getHistogramById(
-    "TOUCHBAR_BUTTON_PRESSES"
-  );
-  telemetry.add(telemetryKey);
 }
 
 /**
@@ -92,19 +80,19 @@ var gBuiltInInputs = {
     title: "back",
     image: "chrome://browser/skin/back.svg",
     type: kInputTypes.BUTTON,
-    callback: () => execCommand("Browser:Back", "Back"),
+    callback: () => execCommand("Browser:Back"),
   },
   Forward: {
     title: "forward",
     image: "chrome://browser/skin/forward.svg",
     type: kInputTypes.BUTTON,
-    callback: () => execCommand("Browser:Forward", "Forward"),
+    callback: () => execCommand("Browser:Forward"),
   },
   Reload: {
     title: "reload",
     image: "chrome://browser/skin/reload.svg",
     type: kInputTypes.BUTTON,
-    callback: () => execCommand("Browser:Reload", "Reload"),
+    callback: () => execCommand("Browser:Reload"),
   },
   Home: {
     title: "home",
@@ -113,29 +101,25 @@ var gBuiltInInputs = {
     callback: () => {
       let win = BrowserWindowTracker.getTopWindow();
       win.BrowserHome();
-      let telemetry = Services.telemetry.getHistogramById(
-        "TOUCHBAR_BUTTON_PRESSES"
-      );
-      telemetry.add("Home");
     },
   },
   Fullscreen: {
     title: "fullscreen",
     image: "chrome://browser/skin/fullscreen.svg",
     type: kInputTypes.BUTTON,
-    callback: () => execCommand("View:FullScreen", "Fullscreen"),
+    callback: () => execCommand("View:FullScreen"),
   },
   Find: {
     title: "find",
     image: "chrome://browser/skin/search-glass.svg",
     type: kInputTypes.BUTTON,
-    callback: () => execCommand("cmd_find", "Find"),
+    callback: () => execCommand("cmd_find"),
   },
   NewTab: {
     title: "new-tab",
     image: "chrome://browser/skin/add.svg",
     type: kInputTypes.BUTTON,
-    callback: () => execCommand("cmd_newNavigatorTabNoEvent", "NewTab"),
+    callback: () => execCommand("cmd_newNavigatorTabNoEvent"),
   },
   Sidebar: {
     title: "open-sidebar",
@@ -144,23 +128,19 @@ var gBuiltInInputs = {
     callback: () => {
       let win = BrowserWindowTracker.getTopWindow();
       win.SidebarUI.toggle();
-      let telemetry = Services.telemetry.getHistogramById(
-        "TOUCHBAR_BUTTON_PRESSES"
-      );
-      telemetry.add("Sidebar");
     },
   },
   AddBookmark: {
     title: "add-bookmark",
     image: "chrome://browser/skin/bookmark-hollow.svg",
     type: kInputTypes.BUTTON,
-    callback: () => execCommand("Browser:AddBookmarkAs", "AddBookmark"),
+    callback: () => execCommand("Browser:AddBookmarkAs"),
   },
   ReaderView: {
     title: "reader-view",
     image: "chrome://browser/skin/readerMode.svg",
     type: kInputTypes.BUTTON,
-    callback: () => execCommand("View:ReaderView", "ReaderView"),
+    callback: () => execCommand("View:ReaderView"),
     disabled: true, // Updated when the page is found to be Reader View-able.
   },
   OpenLocation: {
@@ -168,7 +148,7 @@ var gBuiltInInputs = {
     title: "open-location",
     image: "chrome://browser/skin/search-glass.svg",
     type: kInputTypes.MAIN_BUTTON,
-    callback: () => execCommand("Browser:OpenLocation", "OpenLocation"),
+    callback: () => execCommand("Browser:OpenLocation"),
   },
   // This is a special-case `type: kInputTypes.SCRUBBER` element.
   // Scrubbers are not yet generally implemented.
@@ -177,7 +157,7 @@ var gBuiltInInputs = {
     title: "share",
     image: "chrome://browser/skin/share.svg",
     type: kInputTypes.SCRUBBER,
-    callback: () => execCommand("cmd_share", "Share"),
+    callback: () => execCommand("cmd_share"),
   },
   SearchPopover: {
     title: "search-popover",
@@ -455,10 +435,6 @@ class TouchBarHelper {
             "chrome://browser/skin/fullscreen-exit.svg";
           gBuiltInInputs.OpenLocation.callback = () => {
             TouchBarHelper.window.windowUtils.exitFullscreen();
-            let telemetry = Services.telemetry.getHistogramById(
-              "TOUCHBAR_BUTTON_PRESSES"
-            );
-            telemetry.add("OpenLocation");
           };
         } else {
           gBuiltInInputs.OpenLocation.title = "open-location";

browser/components/touchbar/docs/index.rst

@@ -91,9 +91,7 @@ Clarification on some of these properties is warranted.
 * ``callback`` points to a JavaScript function. Any chrome-level JavaScript can
   be executed. ``execCommand`` is a convenience method in ``MacTouchBar.js``
   that takes a XUL command as a string and executes that command. For instance,
-  one input sets ``callback`` to ``execCommand("Browser:Back", "Back")``. The
-  second string, "Back", records an interaction with the back button in
-  Telemetry.
+  one input sets ``callback`` to ``execCommand("Browser:Back")``.
 * ``children`` is an array of objects with the same properties as members of
   ``gBuiltInInputs``. When used with an input of type
   ``kInputTypes.SCROLLVIEW``, ``children`` can only contain inputs of type

toolkit/components/telemetry/Histograms.json

@@ -14448,17 +14448,6 @@
     "n_buckets": 50,
     "description": "WebRender render time in milliseconds"
   },
-  "TOUCHBAR_BUTTON_PRESSES": {
-    "record_in_processes": ["main"],
-    "products": ["firefox"],
-    "alert_emails": ["htwyford@mozilla.com"],
-    "bug_numbers": [1313429, 1593726],
-    "expires_in_version": "77",
-    "kind": "categorical",
-    "labels": ["Back", "Forward", "Reload", "Home",  "Fullscreen", "Find", "NewTab", "ReaderView", "AddBookmark", "OpenLocation", "Focus", "Share", "Sidebar"],
-    "releaseChannelCollection": "opt-out",
-    "description": "What buttons are pressed most often on the Mac Touch Bar?"
-  },
   "AUDIO_TRACK_SILENCE_PROPORTION": {
     "record_in_processes": ["content"],
     "products": ["firefox", "geckoview"],

widget/cocoa/nsTouchBar.mm

@@ -5,7 +5,6 @@
 #include "nsTouchBar.h"
 
 #include "mozilla/MacStringHelpers.h"
-#include "mozilla/Telemetry.h"
 #include "nsArrayUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIArray.h"
@@ -592,10 +591,6 @@ static const uint32_t kInputIconSize = 16;
     }
   }
 
-  // If the user has gotten this far, they have clicked the share button so it
-  // is logged.
-  Telemetry::AccumulateCategorical(Telemetry::LABELS_TOUCHBAR_BUTTON_PRESSES::Share);
-
   return @[ urlToShare, titleToShare ];
 }