Bug 1608308 - Add telemetry to check that the libxul and omnijar build IDs match. r=rhelmer

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

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

toolkit/components/corroborator/Corroborate.jsm

@@ -47,6 +47,18 @@ this.Corroborate = {
       "corroborate.omnijar_corrupted",
       corruptOmnijar
     );
+
+    // Check whether libxul's build ID matches the one in the GRE omni jar.
+    // As above, Firefox could be running with an omni jar unpacked, in which
+    // case we're really just checking that the version in the unpacked
+    // AppConstants.jsm matches libxul.
+    let mismatchedOmnijar =
+      Services.appinfo.platformBuildID != AppConstants.MOZ_BUILDID;
+
+    Services.telemetry.scalarSet(
+      "corroborate.omnijar_mismatch",
+      mismatchedOmnijar
+    );
   },
 
   /**

toolkit/components/telemetry/Scalars.yaml

@@ -5605,6 +5605,23 @@ corroborate:
     record_in_processes:
       - main
 
+  omnijar_mismatch:
+    bug_numbers:
+      - 1608308
+    description: >-
+          Whether the build IDs of the omni jar (omni.ja) and libxul do not match.
+    expires: "80"
+    kind: boolean
+    notification_emails:
+      - rhelmer@mozilla.com
+    release_channel_collection: opt-out
+    products:
+      - 'firefox'
+      - 'fennec'
+      - 'geckoview'
+    record_in_processes:
+      - main
+
   system_addons_corrupted:
     bug_numbers:
       - 1515712

toolkit/modules/AppConstants.jsm

@@ -1,5 +1,6 @@
 #filter substitution
 #include @TOPOBJDIR@/source-repo.h
+#include @TOPOBJDIR@/buildid.h
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -305,6 +306,7 @@ this.AppConstants = Object.freeze({
   MOZ_APP_NAME: "@MOZ_APP_NAME@",
   MOZ_APP_VERSION: "@MOZ_APP_VERSION@",
   MOZ_APP_VERSION_DISPLAY: "@MOZ_APP_VERSION_DISPLAY@",
+  MOZ_BUILDID: "@MOZ_BUILDID@",
   MOZ_BUILD_APP: "@MOZ_BUILD_APP@",
   MOZ_MACBUNDLE_NAME: "@MOZ_MACBUNDLE_NAME@",
   MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",