Richard Pospesel pushed to branch base-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser

Commits: 876c8a35 by cypherpunks1 at 2023-02-09T16:16:34+00:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING

(cherry picked from commit 47eb7d305746bd1a9e328b1fb7fef40d56769d5b) - - - - -

4 changed files:

- browser/base/content/browser.js - browser/components/BrowserGlue.jsm - toolkit/components/telemetry/app/TelemetryEnvironment.jsm - toolkit/xre/nsAppRunner.cpp

Changes:

===================================== browser/base/content/browser.js ===================================== @@ -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 ===================================== @@ -1668,7 +1668,9 @@ BrowserGlue.prototype = { this._firstWindowTelemetry(aWindow); this._firstWindowLoaded();

- this._collectStartupConditionsTelemetry(); + 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 ===================================== @@ -973,7 +973,9 @@ function EnvironmentCache() { p.push(this._addonBuilder.init());

this._currentEnvironment.profile = {}; - p.push(this._updateProfile()); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + p.push(this._updateProfile()); + } if (AppConstants.MOZ_BUILD_APP == "browser") { p.push(this._loadAttributionAsync()); }

===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -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);

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/876c8a35...