[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

Title: GitLab

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:

Changes:

  • browser/base/content/browser.js
    ... ... @@ -6004,6 +6004,7 @@ var TabsProgressListener = {
    6004 6004 
       onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
    6005 6005 
         // Collect telemetry data about tab load times.
    6006 6006 
         if (
    6007 
    +      AppConstants.MOZ_TELEMETRY_REPORTING &&
    6007 6008 
           aWebProgress.isTopLevel &&
    6008 6009 
           (!aRequest.originalURI || aRequest.originalURI.scheme != "about")
    6009 6010 
         ) {

  • browser/components/BrowserGlue.jsm
    ... ... @@ -1668,7 +1668,9 @@ BrowserGlue.prototype = {
    1668 1668 
         this._firstWindowTelemetry(aWindow);
    1669 1669 
         this._firstWindowLoaded();
    1670 1670
    1671 
    -    this._collectStartupConditionsTelemetry();
    1671 
    +    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    1672 
    +      this._collectStartupConditionsTelemetry();
    1673 
    +    }
    1672 1674
    1673 1675 
         // Set the default favicon size for UI views that use the page-icon protocol.
    1674 1676 
         PlacesUtils.favicons.setDefaultIconURIPreferredSize(
    ... ... @@ -2839,13 +2841,21 @@ BrowserGlue.prototype = {
    2839 2841 
             }
    2840 2842 
           },
    2841 2843
    2842 
    -      () => BrowserUsageTelemetry.reportProfileCount(),
    2844 
    +      () => {
    2845 
    +        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    2846 
    +          BrowserUsageTelemetry.reportProfileCount();
    2847 
    +        }
    2848 
    +      },
    2843 2849
    2844 2850 
           () => OsEnvironment.reportAllowedAppSources(),
    2845 2851
    2846 2852 
           () => Services.search.runBackgroundChecks(),
    2847 2853
    2848 
    -      () => BrowserUsageTelemetry.reportInstallationTelemetry(),
    2854 
    +      () => {
    2855 
    +        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    2856 
    +          BrowserUsageTelemetry.reportInstallationTelemetry();
    2857 
    +        }
    2858 
    +      },
    2849 2859 
         ];
    2850 2860
    2851 2861 
         for (let task of idleTasks) {

  • toolkit/components/telemetry/app/TelemetryEnvironment.jsm
    ... ... @@ -973,7 +973,9 @@ function EnvironmentCache() {
    973 973 
       p.push(this._addonBuilder.init());
    974 974
    975 975 
       this._currentEnvironment.profile = "">
    976 
    -  p.push(this._updateProfile());
    976 
    +  if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    977 
    +    p.push(this._updateProfile());
    978 
    +  }
    977 979 
       if (AppConstants.MOZ_BUILD_APP == "browser") {
    978 980 
         p.push(this._loadAttributionAsync());
    979 981 
       }

  • toolkit/xre/nsAppRunner.cpp
    ... ... @@ -2800,7 +2800,9 @@ static ReturnAbortOnError ProfileLockedDialog(nsIFile* aProfileDir,
    2800 2800 
       rv = xpcom.Initialize();
    2801 2801 
       NS_ENSURE_SUCCESS(rv, rv);
    2802 2802
    2803 
    +#if defined(MOZ_TELEMETRY_REPORTING)
    2803 2804 
       if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);
    2805 
    +#endif
    2804 2806
    2805 2807 
       rv = xpcom.SetWindowCreator(aNative);
    2806 2808 
       NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits