Bug 1577217: Let third-party-modules ride to early beta; r=mhowell
authorAaron Klotz <aklotz@mozilla.com>
Thu, 14 Nov 2019 21:53:12 +0000
changeset 502061 6fc0c2b4b9096e7ff61265dddb682adb21ee5eed
parent 502060 a21f7f0b362ef9cd81c2f8262d535c2e3396c4b4
child 502062 78cd6dd843caca297127b2c190295501142cb3bd
push id36805
push useraiakab@mozilla.com
push dateFri, 15 Nov 2019 09:53:19 +0000
treeherdermozilla-central@1e1617c67238 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhowell
bugs1577217, 1542830
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1577217: Let third-party-modules ride to early beta; r=mhowell We've decided to let this ride through to early beta. We'll evaluate how the early beta numbers look, and if there are no significant issues we'll follow up with another patch to ride to release. This is already covered by the data review for bug 1542830. Differential Revision: https://phabricator.services.mozilla.com/D53084
toolkit/components/telemetry/app/TelemetryController.jsm
toolkit/xre/UntrustedModulesProcessor.cpp
--- a/toolkit/components/telemetry/app/TelemetryController.jsm
+++ b/toolkit/components/telemetry/app/TelemetryController.jsm
@@ -813,17 +813,20 @@ var Impl = {
             // Report the modules loaded in the Firefox process.
             TelemetryModules.start();
 
             // Send coverage ping.
             await CoveragePing.startup();
 
             // Start the untrusted modules ping, which reports events where
             // untrusted modules were loaded into the Firefox process.
-            if (AppConstants.NIGHTLY_BUILD && AppConstants.platform == "win") {
+            if (
+              AppConstants.EARLY_BETA_OR_EARLIER &&
+              AppConstants.platform == "win"
+            ) {
               TelemetryUntrustedModulesPing.start();
             }
           }
 
           TelemetryEventPing.startup();
           EcosystemTelemetry.startup();
           TelemetryPrioPing.startup();
 
--- a/toolkit/xre/UntrustedModulesProcessor.cpp
+++ b/toolkit/xre/UntrustedModulesProcessor.cpp
@@ -83,31 +83,31 @@ class MOZ_RAII BackgroundPriorityRegion 
   }
 
  private:
   const BOOL mIsBackground;
 };
 
 /* static */
 RefPtr<UntrustedModulesProcessor> UntrustedModulesProcessor::Create() {
-#if defined(NIGHTLY_BUILD)
+#if defined(EARLY_BETA_OR_EARLIER)
   if (!XRE_IsParentProcess()) {
     // Not currently supported outside the parent process
     return nullptr;
   }
 
   if (!Telemetry::CanRecordReleaseData()) {
     return nullptr;
   }
 
   RefPtr<UntrustedModulesProcessor> result(new UntrustedModulesProcessor());
   return result.forget();
 #else
   return nullptr;
-#endif  // defined(NIGHTLY_BUILD)
+#endif  // defined(EARLY_BETA_OR_EARLIER)
 }
 
 NS_IMPL_ISUPPORTS(UntrustedModulesProcessor, nsIObserver)
 
 static const uint32_t kThreadTimeoutMS = 120000;  // 2 minutes
 
 UntrustedModulesProcessor::UntrustedModulesProcessor()
     : mThread(new LazyIdleThread(kThreadTimeoutMS,