Bug 1298208 - FX_MIGRATION_HOMEPAGE_IMPORTED probe is (incorrectly) always true. r=mattn a=lizzard
authorJustin Dolske <dolske@mozilla.com>
Fri, 26 Aug 2016 15:20:48 -0700
changeset 347927 47d0465d6f577407e3a9e4cc9e16c4a5ab887b53
parent 347926 c3e815e20c7f689023910729b3178b9728c2cd29
child 347928 5ed3f227fe0bb039f7e0b7210d2d3d9517d82d53
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattn, lizzard
bugs1298208
milestone50.0a2
Bug 1298208 - FX_MIGRATION_HOMEPAGE_IMPORTED probe is (incorrectly) always true. r=mattn a=lizzard MozReview-Commit-ID: 6wZUeRTKExw
browser/components/migration/content/migration.js
toolkit/components/telemetry/Histograms.json
toolkit/components/telemetry/histogram-whitelists.json
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
@@ -423,18 +423,19 @@ var MigrationWizard = {
       if (label)
         label.removeAttribute("style");
       break;
     case "Migration:Ended":
       if (this.isInitialMigration) {
         this.reportDataRecencyTelemetry();
       }
       if (this._autoMigrate) {
-        Services.telemetry.getKeyedHistogramById("FX_MIGRATION_HOMEPAGE_IMPORTED")
-                          .add(this._source, !!this._newHomePage);
+        let hasImportedHomepage = !!(this._newHomePage && this._newHomePage != "DEFAULT");
+        Services.telemetry.getKeyedHistogramById("FX_MIGRATION_IMPORTED_HOMEPAGE")
+                          .add(this._source, hasImportedHomepage);
         if (this._newHomePage) {
           try {
             // set homepage properly
             var prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
                                     .getService(Components.interfaces.nsIPrefService);
             var prefBranch = prefSvc.getBranch(null);
 
             if (this._newHomePage == "DEFAULT") {
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -4268,17 +4268,17 @@
   "FX_MIGRATION_USAGE": {
     "expires_in_version": "53",
     "kind": "enumerated",
     "keyed": true,
     "n_values": 12,
     "releaseChannelCollection": "opt-out",
     "description": "Usage of migration for each datatype when migration is run through the post-firstrun flow which allows individual datatypes, keyed by the string description of the browser."
   },
-  "FX_MIGRATION_HOMEPAGE_IMPORTED": {
+  "FX_MIGRATION_IMPORTED_HOMEPAGE": {
     "expires_in_version": "53",
     "kind": "boolean",
     "keyed": true,
     "releaseChannelCollection": "opt-out",
     "description": "Whether the homepage was imported during browser migration. Only available on release builds during firstrun."
   },
   "FX_MIGRATION_BOOKMARKS_IMPORT_MS": {
     "bug_numbers": [1289436],
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -427,17 +427,17 @@
     "FONT_CACHE_HIT",
     "FORCED_DEVICE_RESET_REASON",
     "FX_BOOKMARKS_TOOLBAR_INIT_MS",
     "FX_BROWSER_FULLSCREEN_USED",
     "FX_GESTURE_COMPRESS_SNAPSHOT_OF_PAGE",
     "FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE",
     "FX_MIGRATION_ENTRY_POINT",
     "FX_MIGRATION_ERRORS",
-    "FX_MIGRATION_HOMEPAGE_IMPORTED",
+    "FX_MIGRATION_IMPORTED_HOMEPAGE",
     "FX_MIGRATION_SOURCE_BROWSER",
     "FX_MIGRATION_USAGE",
     "FX_NEW_WINDOW_MS",
     "FX_PAGE_LOAD_MS",
     "FX_SESSION_RESTORE_DOM_STORAGE_SIZE_ESTIMATE_CHARS",
     "FX_SESSION_RESTORE_NUMBER_OF_EAGER_TABS_RESTORED",
     "FX_SESSION_RESTORE_NUMBER_OF_TABS_RESTORED",
     "FX_SESSION_RESTORE_NUMBER_OF_WINDOWS_RESTORED",
@@ -1480,17 +1480,17 @@
     "FORCED_DEVICE_RESET_REASON",
     "FORGET_SKIPPABLE_MAX",
     "FX_BOOKMARKS_TOOLBAR_INIT_MS",
     "FX_BROWSER_FULLSCREEN_USED",
     "FX_GESTURE_COMPRESS_SNAPSHOT_OF_PAGE",
     "FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE",
     "FX_MIGRATION_ENTRY_POINT",
     "FX_MIGRATION_ERRORS",
-    "FX_MIGRATION_HOMEPAGE_IMPORTED",
+    "FX_MIGRATION_IMPORTED_HOMEPAGE",
     "FX_MIGRATION_SOURCE_BROWSER",
     "FX_MIGRATION_USAGE",
     "FX_NEW_WINDOW_MS",
     "FX_PAGE_LOAD_MS",
     "FX_SANITIZE_CACHE",
     "FX_SANITIZE_COOKIES",
     "FX_SANITIZE_COOKIES_2",
     "FX_SANITIZE_DOWNLOADS",