Backed out 2 changesets (bug 1476393) for toolkit/components/passwordmgr/ failures CLOSED TREE

Backed out changeset b22dd03454ff (bug 1476393)
Backed out changeset cb876d3e8a69 (bug 1476393)

services/sync/modules/service.js

@@ -1394,10 +1394,6 @@ Sync11Service.prototype = {
   recordTelemetryEvent(object, method, value, extra = undefined) {
     Svc.Obs.notify("weave:telemetry:event", { object, method, value, extra });
   },
-
-  recordTelemetryHistogram(histId) {
-    Svc.Obs.notify("weave:telemetry:histogram", { histId });
-  },
 };
 
 var Service = new Sync11Service();

services/sync/modules/telemetry.js

@@ -52,7 +52,6 @@ const TOPICS = [
   "weave:engine:validate:error",
 
   "weave:telemetry:event",
-  "weave:telemetry:histogram",
 ];
 
 const PING_FORMAT_VERSION = 1;
@@ -465,7 +464,6 @@ class SyncTelemetryImpl {
     this.payloads = [];
     this.discarded = 0;
     this.events = [];
-    this.histograms = {};
     this.maxEventsCount = Svc.Prefs.get("telemetry.maxEventsCount", 1000);
     this.maxPayloadCount = Svc.Prefs.get("telemetry.maxPayloadCount");
     this.submissionInterval = Svc.Prefs.get("telemetry.submissionInterval") * 1000;
@@ -488,7 +486,6 @@ class SyncTelemetryImpl {
       deviceID: this.lastDeviceID,
       sessionStartDate: this.sessionStartDate,
       events: this.events.length == 0 ? undefined : this.events,
-      histograms: Object.keys(this.histograms).length == 0 ? undefined : this.histograms,
     };
   }
 
@@ -499,7 +496,6 @@ class SyncTelemetryImpl {
     this.payloads = [];
     this.discarded = 0;
     this.events = [];
-    this.histograms = {};
     this.submit(result);
   }
 
@@ -599,12 +595,6 @@ class SyncTelemetryImpl {
     }
   }
 
-  _addHistogram(hist) {
-      let id = hist.histId;
-      let histogram = Telemetry.getHistogramById(id);
-      this.histograms[id] = histogram.snapshot();
-  }
-
   _recordEvent(eventDetails) {
     if (this.events.length >= this.maxEventsCount) {
       log.warn("discarding event - already queued our maximum", eventDetails);
@@ -716,10 +706,6 @@ class SyncTelemetryImpl {
         this._recordEvent(subject);
         break;
 
-      case "weave:telemetry:histogram":
-        this._addHistogram(subject);
-        break;
-
       default:
         log.warn(`unexpected observer topic ${topic}`);
         break;

services/sync/tests/unit/sync_ping_schema.json

@@ -27,20 +27,6 @@
       "type": "array",
       "minItems": 1,
       "items": { "$ref": "#/definitions/event" }
-    },
-    "histograms": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "object",
-        "properties": {
-          "min": { "type": "integer" },
-          "max": { "type": "integer" },
-          "histogram_type": { "type": "integer" },
-          "sum": { "type": "integer" },
-          "ranges": { "type": "array" },
-          "counts": { "type": "array" }
-        }
-      }
     }
   },
   "definitions": {

toolkit/components/passwordmgr/content/passwordManager.js

@@ -6,7 +6,6 @@
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://services-sync/main.js");
 
 ChromeUtils.defineModuleGetter(this, "DeferredTask",
                                "resource://gre/modules/DeferredTask.jsm");
@@ -102,10 +101,8 @@ function Startup() {
       window.arguments[0].filterString) {
     setFilter(window.arguments[0].filterString);
     Services.telemetry.getHistogramById("PWMGR_MANAGE_OPENED").add(1);
-    Weave.Service.recordTelemetryHistogram("PWMGR_MANAGE_OPENED");
   } else {
     Services.telemetry.getHistogramById("PWMGR_MANAGE_OPENED").add(0);
-    Weave.Service.recordTelemetryHistogram("PWMGR_MANAGE_OPENED");
   }
 
   FocusFilterBox();
@@ -412,7 +409,6 @@ function DeleteAllSignons() {
   removeAllButton.setAttribute("disabled", "true");
   FinalizeSignonDeletions(syncNeeded);
   Services.telemetry.getHistogramById("PWMGR_MANAGE_DELETED_ALL").add(1);
-  Weave.Service.recordTelemetryHistogram("PWMGR_MANAGE_DELETED_ALL");
 }
 
 function TogglePasswordVisible() {
@@ -428,7 +424,6 @@ function TogglePasswordVisible() {
   // completed.  (Mostly useful for tests)
   Services.obs.notifyObservers(null, "passwordmgr-password-toggle-complete");
   Services.telemetry.getHistogramById("PWMGR_MANAGE_VISIBILITY_TOGGLED").add(showingPasswords);
-  Weave.Service.recordTelemetryHistogram("PWMGR_MANAGE_VISIBILITY_TOGGLED");
 }
 
 function AskUserShowPasswords() {
@@ -445,7 +440,6 @@ function FinalizeSignonDeletions(syncNeeded) {
   for (let s = 0; s < deletedSignons.length; s++) {
     Services.logins.removeLogin(deletedSignons[s]);
     Services.telemetry.getHistogramById("PWMGR_MANAGE_DELETED").add(1);
-    Weave.Service.recordTelemetryHistogram("PWMGR_MANAGE_DELETED");
   }
   // If the deletion has been performed in a filtered view, reflect the deletion in the unfiltered table.
   // See bug 405389.
@@ -631,7 +625,6 @@ function CopyPassword() {
   let password = signonsTreeView.getCellText(row, {id: "passwordCol" });
   clipboard.copyString(password);
   Services.telemetry.getHistogramById("PWMGR_MANAGE_COPIED_PASSWORD").add(1);
-  Weave.Service.recordTelemetryHistogram("PWMGR_MANAGE_COPIED_PASSWORD");
 }
 
 function CopyUsername() {
@@ -642,7 +635,6 @@ function CopyUsername() {
   let username = signonsTreeView.getCellText(row, {id: "userCol" });
   clipboard.copyString(username);
   Services.telemetry.getHistogramById("PWMGR_MANAGE_COPIED_USERNAME").add(1);
-  Weave.Service.recordTelemetryHistogram("PWMGR_MANAGE_COPIED_USERNAME");
 }
 
 function EditCellInSelectedRow(columnName) {

toolkit/components/passwordmgr/nsLoginManager.js

@@ -11,7 +11,6 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/Timer.jsm");
 ChromeUtils.import("resource://gre/modules/LoginManagerContent.jsm");
-ChromeUtils.import("resource://services-sync/main.js");
 
 ChromeUtils.defineModuleGetter(this, "BrowserUtils",
                                "resource://gre/modules/BrowserUtils.jsm");
@@ -200,11 +199,9 @@ LoginManager.prototype = {
     clearAndGetHistogram("PWMGR_BLOCKLIST_NUM_SITES").add(
       this.getAllDisabledHosts({}).length
     );
-    Weave.Service.recordTelemetryHistogram("PWMGR_BLOCKLIST_NUM_SITES");
     clearAndGetHistogram("PWMGR_NUM_SAVED_PASSWORDS").add(
       this.countLogins("", "", "")
     );
-    Weave.Service.recordTelemetryHistogram("PWMGR_NUM_SAVED_PASSWORDS");
     clearAndGetHistogram("PWMGR_NUM_HTTPAUTH_PASSWORDS").add(
       this.countLogins("", null, "")
     );
@@ -212,7 +209,6 @@ LoginManager.prototype = {
     // This is a boolean histogram, and not a flag, because we don't want to
     // record any value if _gatherTelemetry is not called.
     clearAndGetHistogram("PWMGR_SAVING_ENABLED").add(this._remember);
-    Weave.Service.recordTelemetryHistogram("PWMGR_SAVING_ENABLED");
 
     // Don't try to get logins if MP is enabled, since we don't want to show a MP prompt.
     if (!this.isLoggedIn) {
@@ -223,7 +219,6 @@ LoginManager.prototype = {
 
     let usernamePresentHistogram = clearAndGetHistogram("PWMGR_USERNAME_PRESENT");
     let loginLastUsedDaysHistogram = clearAndGetHistogram("PWMGR_LOGIN_LAST_USED_DAYS");
-    Weave.Service.recordTelemetryHistogram("PWMGR_LOGIN_LAST_USED_DAYS");
 
     let hostnameCount = new Map();
     for (let login of logins) {
@@ -242,7 +237,6 @@ LoginManager.prototype = {
     }
 
     let passwordsCountHistogram = clearAndGetHistogram("PWMGR_NUM_PASSWORDS_PER_HOSTNAME");
-    Weave.Service.recordTelemetryHistogram("PWMGR_NUM_PASSWORDS_PER_HOSTNAME");
     for (let count of hostnameCount.values()) {
       passwordsCountHistogram.add(count);
     }

toolkit/components/passwordmgr/nsLoginManagerPrompter.js

@@ -5,7 +5,6 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-ChromeUtils.import("resource://services-sync/main.js");
 const { PromptUtils } = ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm", {});
 
 ChromeUtils.defineModuleGetter(this, "LoginHelper",
@@ -822,7 +821,6 @@ LoginManagerPrompter.prototype = {
                                                 : "PWMGR_PROMPT_UPDATE_ACTION";
     let histogram = Services.telemetry.getHistogramById(histogramName);
     histogram.add(PROMPT_DISPLAYED);
-    Weave.Service.recordTelemetryHistogram(histogramName);
 
     const promptType = type == "password-save" ? "save" : "update";
     const flow_id = browser.ownerGlobal.gBrowser.getTabForBrowser(browser).linkedPanel;
@@ -959,7 +957,6 @@ LoginManagerPrompter.prototype = {
       accessKey: this._getLocalizedString(initialMsgNames.buttonAccessKey),
       callback: () => {
         histogram.add(PROMPT_ADD_OR_UPDATE);
-        Weave.Service.recordTelemetryHistogram(histogramName);
         const flow_id = browser.ownerGlobal.gBrowser.getTabForBrowser(browser).linkedPanel;
         if (histogramName == "PWMGR_PROMPT_REMEMBER_ACTION") {
           Services.obs.notifyObservers(null, "LoginStats:NewSavedPassword");
@@ -986,7 +983,6 @@ LoginManagerPrompter.prototype = {
       accessKey: this._getLocalizedString(initialMsgNames.secondaryButtonAccessKey),
       callback: () => {
         histogram.add(PROMPT_NOTNOW);
-        Weave.Service.recordTelemetryHistogram(histogramName);
         browser.focus();
       }
     }];
@@ -998,7 +994,6 @@ LoginManagerPrompter.prototype = {
         callback: () => {
           histogram.add(PROMPT_NEVER);
           Services.logins.setLoginSavingEnabled(login.hostname, false);
-          Weave.Service.recordTelemetryHistogram(histogramName);
           browser.focus();
         }
       });

toolkit/components/telemetry/docs/data/sync-ping.rst

@@ -102,8 +102,7 @@ Structure:
         }],
         events: [
           event_array // See events below.
-        ],
-        histograms: { ... } // See histograms below
+        ]
       }
     }
 
@@ -205,36 +204,6 @@ reason. It is included to improve flow analysis across multiple clients.
 Every event recorded in this ping will have a category of ``sync``. The following
 events are defined, categorized by the event method.
 
-Histograms in the "sync" ping
------------------------------
-
-The sync ping includes histograms relating to measurements of password manager usage.
-These histograms are duplicated in the main ping. Histograms are only included in a ping if they have been set by the pwmgr code.
-Currently, the histograms that can be included are:
-
-PWMGR_BLOCKLIST_NUM_SITES
-PWMGR_FORM_AUTOFILL_RESULT
-PWMGR_LOGIN_LAST_USED_DAYS
-PWMGR_LOGIN_PAGE_SAFETY
-PWMGR_MANAGE_COPIED_PASSWORD
-PWMGR_MANAGE_COPIED_USERNAME
-PWMGR_MANAGE_DELETED
-PWMGR_MANAGE_OPENED
-PWMGR_MANAGE_VISIBILITY_TOGGLED
-PWMGR_NUM_PASSWORDS_PER_HOSTNAME
-PWMGR_NUM_SAVED_PASSWORDS
-PWMGR_PROMPT_REMEMBER_ACTION
-PWMGR_PROMPT_UPDATE_ACTION
-PWMGR_SAVING_ENABLED
-
-Histograms are objects with the following 6 properties:
-- min - minimum bucket size
-- max - maximum bucket size
-- histogram_type
-- counts - array representing contents of the buckets in the histogram
-- ranges - array with calculated bucket sizes
-- sum - sum of the bucket contents
-
 sendcommand
 ~~~~~~~~~~~