Bug 1151267 - app update telemetry for UPDATE_CANNOT_APPLY_* is reversed. r=spohl

toolkit/components/telemetry/Histograms.json

@@ -3503,6 +3503,16 @@
     "high": "180",
     "description": "Update: interval in days since the last background update check (timer initiated)"
   },
+  "UPDATE_PING_COUNT_EXTERNAL": {
+    "expires_in_version": "never",
+    "kind": "count",
+    "description": "Update: count of systems for this ping for comparison with other pings (externally initiated)"
+  },
+  "UPDATE_PING_COUNT_NOTIFY": {
+    "expires_in_version": "never",
+    "kind": "count",
+    "description": "Update: count of systems for this ping for comparison with other pings (timer initiated)"
+  },
   "UPDATE_SERVICE_INSTALLED_EXTERNAL": {
     "expires_in_version": "never",
     "kind": "boolean",
@@ -3523,15 +3533,15 @@
     "kind": "count",
     "description": "Update: count of systems that manually uninstalled the service (timer initiated)"
   },
-  "UPDATE_CANNOT_APPLY_EXTERNAL": {
+  "UPDATE_UNABLE_TO_APPLY_EXTERNAL": {
     "expires_in_version": "never",
-    "kind": "boolean",
-    "description": "Update: systems that cannot apply updates (externally initiated)"
+    "kind": "count",
+    "description": "Update: count of systems that cannot apply updates (externally initiated)"
   },
-  "UPDATE_CANNOT_APPLY_NOTIFY": {
+  "UPDATE_UNABLE_TO_APPLY_NOTIFY": {
     "expires_in_version": "never",
-    "kind": "boolean",
-    "description": "Update: systems that cannot apply updates (timer initiated)"
+    "kind": "count",
+    "description": "Update: count of systems that cannot apply updates (timer initiated)"
   },
   "UPDATE_CANNOT_STAGE_EXTERNAL": {
     "expires_in_version": "never",

toolkit/mozapps/update/UpdateTelemetry.jsm

@@ -363,12 +363,6 @@ this.AUSTLMY = {
    * service is installed and a telemetry ping for a boolean type histogram that
    * indicates if the service was at some point installed and is now
    * uninstalled.
-   * Note: the total for the following histogram IDs can be used to determine
-   *       the total number of telemetry timer and externally initiated
-   *       submissions for systems that build with MOZ_MAINTENANCE_SERVICE
-   *       defined:
-   *       UPDATE_SERVICE_INSTALLED_EXTERNAL
-   *       UPDATE_SERVICE_INSTALLED_NOTIFY
    *
    * @param  aSuffix
    *         The histogram id suffix for histogram IDs:
@@ -489,11 +483,6 @@ this.AUSTLMY = {
    * the aExpected parameter is specified. If the aExpected parameter is
    * specified and it equals the value specified by the aValue
    * parameter the telemetry submission will be skipped.
-   * Note: the total for the following histogram IDs can be used to determine
-   *       the total number of telemetry timer and externally initiated
-   *       submissions:
-   *       UPDATE_CANNOT_APPLY_EXTERNAL
-   *       UPDATE_CANNOT_APPLY_NOTIFY
    *
    * @param  aID
    *         The histogram ID to report to.

toolkit/mozapps/update/nsUpdateService.js

@@ -164,8 +164,6 @@ const FOTA_GENERAL_ERROR                   = 80;
 const FOTA_UNKNOWN_ERROR                   = 81;
 const FOTA_FILE_OPERATION_ERROR            = 82;
 const FOTA_RECOVERY_ERROR                  = 83;
-// Staging failed and changed the state to pending
-const STAGE_FAIL_FALLBACK                  = 97;
 const INVALID_UPDATER_STATE_CODE           = 98;
 const INVALID_UPDATER_STATUS_CODE          = 99;
 
@@ -1432,8 +1430,6 @@ function pingStateAndStatusCodes(aUpdate, aStartup, aStatus) {
         break;
       case STATE_PENDING:
         stateCode = 4;
-        parts[0] = STATE_FAILED;
-        parts.push(STAGE_FAIL_FALLBACK);
         break;
       case STATE_PENDING_SVC:
         stateCode = 5;
@@ -2375,10 +2371,16 @@ UpdateService.prototype = {
     this._isNotify = isNotify;
 
     // Histogram IDs:
-    // UPDATE_CANNOT_APPLY_EXTERNAL
-    // UPDATE_CANNOT_APPLY_NOTIFY
-    AUSTLMY.pingGeneric("UPDATE_CANNOT_APPLY_" + this._pingSuffix,
-                        gCanApplyUpdates);
+    // UPDATE_PING_COUNT_EXTERNAL
+    // UPDATE_PING_COUNT_NOTIFY
+    AUSTLMY.pingGeneric("UPDATE_PING_COUNT_" + this._pingSuffix,
+                        true, false);
+
+    // Histogram IDs:
+    // UPDATE_UNABLE_TO_APPLY_EXTERNAL
+    // UPDATE_UNABLE_TO_APPLY_NOTIFY
+    AUSTLMY.pingGeneric("UPDATE_UNABLE_TO_APPLY_" + this._pingSuffix,
+                        gCanApplyUpdates, true);
     // Histogram IDs:
     // UPDATE_CANNOT_STAGE_EXTERNAL
     // UPDATE_CANNOT_STAGE_NOTIFY