Bug 1577217 - Enable the third-party-modules ping in Release build. r=aklotz
authorToshihito Kikuchi <tkikuchi@mozilla.com>
Thu, 19 Mar 2020 22:23:58 +0000
changeset 519738 73614f918c31a9e28f857f59a3fe025d14cd8778
parent 519737 1e174ff5c656af1aeb1d069e1fc6aa61271c2c97
child 519739 5b5137d9329c4fe789c933337a950b2cc0c16618
push id37232
push usercsabou@mozilla.com
push dateFri, 20 Mar 2020 09:53:53 +0000
treeherdermozilla-central@32d6a3f1f83c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaklotz
bugs1577217
milestone76.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 - Enable the third-party-modules ping in Release build. r=aklotz No significant issues has been reported since we enabled the ping in early beta of 73. It's time to enable it in all versions including Release build. Differential Revision: https://phabricator.services.mozilla.com/D67023
toolkit/components/telemetry/app/TelemetryController.jsm
toolkit/components/telemetry/core/Telemetry.cpp
toolkit/xre/UntrustedModulesProcessor.cpp
--- a/toolkit/components/telemetry/app/TelemetryController.jsm
+++ b/toolkit/components/telemetry/app/TelemetryController.jsm
@@ -847,20 +847,17 @@ 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.EARLY_BETA_OR_EARLIER &&
-              AppConstants.platform == "win"
-            ) {
+            if (AppConstants.platform == "win") {
               TelemetryUntrustedModulesPing.start();
             }
           }
 
           TelemetryEventPing.startup();
           EcosystemTelemetry.startup();
           TelemetryPrioPing.startup();
 
--- a/toolkit/components/telemetry/core/Telemetry.cpp
+++ b/toolkit/components/telemetry/core/Telemetry.cpp
@@ -57,17 +57,17 @@
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsIFileStreams.h"
 #include "nsIMemoryReporter.h"
 #include "nsISeekableStream.h"
 #include "nsITelemetry.h"
-#if defined(XP_WIN) && defined(EARLY_BETA_OR_EARLIER)
+#if defined(XP_WIN)
 #  include "other/UntrustedModules.h"
 #endif
 #include "nsJSUtils.h"
 #include "nsLocalFile.h"
 #include "nsNativeCharsetUtils.h"
 #include "nsNetCID.h"
 #include "nsNetUtil.h"
 #include "nsProxyRelease.h"
@@ -680,17 +680,17 @@ TelemetryImpl::GetDebugSlowSQL(JSContext
 NS_IMETHODIMP
 TelemetryImpl::GetMaximalNumberOfConcurrentThreads(uint32_t* ret) {
   *ret = nsThreadManager::get().GetHighestNumberOfThreads();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 TelemetryImpl::GetUntrustedModuleLoadEvents(JSContext* cx, Promise** aPromise) {
-#if defined(XP_WIN) && defined(EARLY_BETA_OR_EARLIER)
+#if defined(XP_WIN)
   return Telemetry::GetUntrustedModuleLoadEvents(cx, aPromise);
 #else
   return NS_ERROR_NOT_IMPLEMENTED;
 #endif
 }
 
 NS_IMETHODIMP
 TelemetryImpl::SnapshotCapturedStacks(bool clear, JSContext* cx,
--- a/toolkit/xre/UntrustedModulesProcessor.cpp
+++ b/toolkit/xre/UntrustedModulesProcessor.cpp
@@ -99,26 +99,22 @@ bool UntrustedModulesProcessor::IsSuppor
       return true;
     default:
       return false;
   }
 }
 
 /* static */
 RefPtr<UntrustedModulesProcessor> UntrustedModulesProcessor::Create() {
-#if defined(EARLY_BETA_OR_EARLIER)
   if (!IsSupportedProcessType()) {
     return nullptr;
   }
 
   RefPtr<UntrustedModulesProcessor> result(new UntrustedModulesProcessor());
   return result.forget();
-#else
-  return nullptr;
-#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,