[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING

[Richard Pospesel (@richard)]

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


Commits:
753674e7 by cypherpunks1 at 2023-02-09T16:16:49+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
=====================================
@@ -6053,6 +6053,7 @@ var TabsProgressListener = {
 
     // Collect telemetry data about tab load times.
     if (
+      AppConstants.MOZ_TELEMETRY_REPORTING &&
       aWebProgress.isTopLevel &&
       (!aRequest.originalURI || aRequest.originalURI.scheme != "about")
     ) {


=====================================
browser/components/BrowserGlue.jsm
=====================================
@@ -1721,7 +1721,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(
@@ -2920,13 +2922,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
=====================================
@@ -2886,7 +2886,9 @@ static ReturnAbortOnError ProfileErrorDialog(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/753674e70ccb3988513f6a4665ba9b9b3d5e04a5

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/753674e70ccb3988513f6a4665ba9b9b3d5e04a5
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230209/d944d986/attachment-0001.htm>