Verified Commit 136abaec authored by cypherpunks1's avatar cypherpunks1 Committed by Pier Angelo Vendrame
Browse files

Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING 


(cherry picked from commit 47eb7d305746bd1a9e328b1fb7fef40d56769d5b)
parent e56bdf6c

browser/base/content/browser.js

+1 −0
Original line number Diff line number Diff line
@@ -6004,6 +6004,7 @@ var TabsProgressListener = { 
  onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {

    // Collect telemetry data about tab load times.

    if (

      AppConstants.MOZ_TELEMETRY_REPORTING &&

      aWebProgress.isTopLevel &&

      (!aRequest.originalURI || aRequest.originalURI.scheme != "about")

    ) {

browser/components/BrowserGlue.jsm

+13 −3
Original line number Diff line number Diff line
@@ -1668,7 +1668,9 @@ BrowserGlue.prototype = { 
    this._firstWindowTelemetry(aWindow);

    this._firstWindowLoaded();



    if (AppConstants.MOZ_TELEMETRY_REPORTING) {

      this._collectStartupConditionsTelemetry();

    }



    // Set the default favicon size for UI views that use the page-icon protocol.

    PlacesUtils.favicons.setDefaultIconURIPreferredSize(
@@ -2839,13 +2841,21 @@ BrowserGlue.prototype = { 
        }

      },



      () => BrowserUsageTelemetry.reportProfileCount(),

      () => {

        if (AppConstants.MOZ_TELEMETRY_REPORTING) {

          BrowserUsageTelemetry.reportProfileCount();

        }

      },



      () => OsEnvironment.reportAllowedAppSources(),



      () => Services.search.runBackgroundChecks(),



      () => BrowserUsageTelemetry.reportInstallationTelemetry(),

      () => {

        if (AppConstants.MOZ_TELEMETRY_REPORTING) {

          BrowserUsageTelemetry.reportInstallationTelemetry();

        }

      },

    ];



    for (let task of idleTasks) {

toolkit/components/telemetry/app/TelemetryEnvironment.jsm

+3 −1
Original line number Diff line number Diff line
@@ -973,7 +973,9 @@ function EnvironmentCache() { 
  p.push(this._addonBuilder.init());



  this._currentEnvironment.profile = {};

  if (AppConstants.MOZ_TELEMETRY_REPORTING) {

    p.push(this._updateProfile());

  }

  if (AppConstants.MOZ_BUILD_APP == "browser") {

    p.push(this._loadAttributionAsync());

  }

toolkit/xre/nsAppRunner.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2800,7 +2800,9 @@ static ReturnAbortOnError ProfileLockedDialog(nsIFile* aProfileDir, 
  rv = xpcom.Initialize();

  NS_ENSURE_SUCCESS(rv, rv);



#if defined(MOZ_TELEMETRY_REPORTING)

  if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);

#endif



  rv = xpcom.SetWindowCreator(aNative);

  NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);