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

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



Title: GitLab

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:

Changes:

  • browser/base/content/browser.js
    ... ... @@ -6053,6 +6053,7 @@ var TabsProgressListener = {
    6053 6053
     
    
    6054 6054
         // Collect telemetry data about tab load times.
    
    6055 6055
         if (
    
    6056
    +      AppConstants.MOZ_TELEMETRY_REPORTING &&
    
    6056 6057
           aWebProgress.isTopLevel &&
    
    6057 6058
           (!aRequest.originalURI || aRequest.originalURI.scheme != "about")
    
    6058 6059
         ) {
    

  • browser/components/BrowserGlue.jsm
    ... ... @@ -1721,7 +1721,9 @@ BrowserGlue.prototype = {
    1721 1721
         this._firstWindowTelemetry(aWindow);
    
    1722 1722
         this._firstWindowLoaded();
    
    1723 1723
     
    
    1724
    -    this._collectStartupConditionsTelemetry();
    
    1724
    +    if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    
    1725
    +      this._collectStartupConditionsTelemetry();
    
    1726
    +    }
    
    1725 1727
     
    
    1726 1728
         // Set the default favicon size for UI views that use the page-icon protocol.
    
    1727 1729
         PlacesUtils.favicons.setDefaultIconURIPreferredSize(
    
    ... ... @@ -2920,13 +2922,21 @@ BrowserGlue.prototype = {
    2920 2922
             }
    
    2921 2923
           },
    
    2922 2924
     
    
    2923
    -      () => BrowserUsageTelemetry.reportProfileCount(),
    
    2925
    +      () => {
    
    2926
    +        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    
    2927
    +          BrowserUsageTelemetry.reportProfileCount();
    
    2928
    +        }
    
    2929
    +      },
    
    2924 2930
     
    
    2925 2931
           () => OsEnvironment.reportAllowedAppSources(),
    
    2926 2932
     
    
    2927 2933
           () => Services.search.runBackgroundChecks(),
    
    2928 2934
     
    
    2929
    -      () => BrowserUsageTelemetry.reportInstallationTelemetry(),
    
    2935
    +      () => {
    
    2936
    +        if (AppConstants.MOZ_TELEMETRY_REPORTING) {
    
    2937
    +          BrowserUsageTelemetry.reportInstallationTelemetry();
    
    2938
    +        }
    
    2939
    +      },
    
    2930 2940
         ];
    
    2931 2941
     
    
    2932 2942
         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
    ... ... @@ -2886,7 +2886,9 @@ static ReturnAbortOnError ProfileErrorDialog(nsIFile* aProfileDir,
    2886 2886
       rv = xpcom.Initialize();
    
    2887 2887
       NS_ENSURE_SUCCESS(rv, rv);
    
    2888 2888
     
    
    2889
    +#if defined(MOZ_TELEMETRY_REPORTING)
    
    2889 2890
       if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);
    
    2891
    +#endif
    
    2890 2892
     
    
    2891 2893
       rv = xpcom.SetWindowCreator(aNative);
    
    2892 2894
       NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
    

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