diff --git a/browser/base/content/sanitize.js b/browser/base/content/sanitize.js index 6da116fd3b9d..2e01cbd2f21b 100644 --- a/browser/base/content/sanitize.js +++ b/browser/base/content/sanitize.js @@ -180,6 +180,7 @@ Sanitizer.prototype = { clear: function () { TelemetryStopwatch.start("FX_SANITIZE_COOKIES"); + TelemetryStopwatch.start("FX_SANITIZE_COOKIES_2"); var cookieMgr = Components.classes["@mozilla.org/cookiemanager;1"] .getService(Ci.nsICookieManager); @@ -199,12 +200,15 @@ Sanitizer.prototype = { cookieMgr.removeAll(); } + TelemetryStopwatch.finish("FX_SANITIZE_COOKIES_2"); + // Clear deviceIds. Done asynchronously (returns before complete). let mediaMgr = Components.classes["@mozilla.org/mediaManagerService;1"] .getService(Ci.nsIMediaManagerService); mediaMgr.sanitizeDeviceIds(this.range && this.range[0]); // Clear plugin data. + TelemetryStopwatch.start("FX_SANITIZE_PLUGINS"); const phInterface = Ci.nsIPluginHost; const FLAG_CLEAR_ALL = phInterface.FLAG_CLEAR_ALL; let ph = Cc["@mozilla.org/plugin/host;1"].getService(phInterface); @@ -234,6 +238,7 @@ Sanitizer.prototype = { } } + TelemetryStopwatch.finish("FX_SANITIZE_PLUGINS"); TelemetryStopwatch.finish("FX_SANITIZE_COOKIES"); }, diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json index 56b6f8c0a6a7..3a398c945d0c 100644 --- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -7844,6 +7844,24 @@ "extended_statistics_ok": true, "description": "Sanitize: Time it takes to sanitize cookies (ms)" }, + "FX_SANITIZE_COOKIES_2": { + "alert_emails": ["firefox-dev@mozilla.org"], + "expires_in_version": "50", + "kind": "exponential", + "high": "30000", + "n_buckets": 20, + "extended_statistics_ok": true, + "description": "Sanitize: Time it takes to sanitize firefox cookies (ms). A subset of FX_SANITIZE_COOKIES." + }, + "FX_SANITIZE_PLUGINS": { + "alert_emails": ["firefox-dev@mozilla.org"], + "expires_in_version": "50", + "kind": "exponential", + "high": "30000", + "n_buckets": 20, + "extended_statistics_ok": true, + "description": "Sanitize: Time it takes to sanitize plugin cookies (ms). A subset of FX_SANITIZE_COOKIES." + }, "FX_SANITIZE_OFFLINEAPPS": { "alert_emails": ["firefox-dev@mozilla.org", "gavin@mozilla.com"], "expires_in_version": "50",