summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/content/aboutNetError.xhtml6
-rw-r--r--base/content/browser-data-submission-info-bar.js6
-rw-r--r--base/content/browser-fullScreenAndPointerLock.js5
-rw-r--r--base/content/browser-plugins.js27
-rwxr-xr-xbase/content/browser.js51
-rw-r--r--base/content/content.js6
-rw-r--r--base/content/newtab/sites.js19
-rw-r--r--base/content/tabbrowser.xml92
-rw-r--r--base/content/urlbarBindings.xml10
9 files changed, 2 insertions, 220 deletions
diff --git a/base/content/aboutNetError.xhtml b/base/content/aboutNetError.xhtml
index 1502a9b..952a1d5 100644
--- a/base/content/aboutNetError.xhtml
+++ b/base/content/aboutNetError.xhtml
@@ -130,12 +130,6 @@
var div = document.getElementById("certificateErrorDebugInformation");
div.style.display = "none";
}
-
- if (panel.style.display == "block") {
- // send event to trigger telemetry ping
- var event = new CustomEvent("AboutNetErrorUIExpanded", {bubbles:true});
- document.dispatchEvent(event);
- }
});
if (allowOverride) {
diff --git a/base/content/browser-data-submission-info-bar.js b/base/content/browser-data-submission-info-bar.js
index 0c87d19..bb76903 100644
--- a/base/content/browser-data-submission-info-bar.js
+++ b/base/content/browser-data-submission-info-bar.js
@@ -2,9 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-const LOGGER_NAME = "Toolkit.Telemetry";
-const LOGGER_PREFIX = "DataNotificationInfoBar::";
-
/**
* Represents an info bar that shows a data submission notification.
*/
@@ -22,9 +19,6 @@ var gDataNotificationInfoBar = {
},
get _log() {
- let Log = Cu.import("resource://gre/modules/Log.jsm", {}).Log;
- delete this._log;
- return this._log = Log.repository.getLoggerWithMessagePrefix(LOGGER_NAME, LOGGER_PREFIX);
},
init: function() {
diff --git a/base/content/browser-fullScreenAndPointerLock.js b/base/content/browser-fullScreenAndPointerLock.js
index ebe5537..f4f0514 100644
--- a/base/content/browser-fullScreenAndPointerLock.js
+++ b/base/content/browser-fullScreenAndPointerLock.js
@@ -348,11 +348,6 @@ var FullScreen = {
// TabsInTitlebar._update() and bug 1173768.
TabsInTitlebar.updateAppearance(true);
}
-
- if (enterFS && !document.fullscreenElement) {
- Services.telemetry.getHistogramById("FX_BROWSER_FULLSCREEN_USED")
- .add(1);
- }
},
exitDomFullScreen : function() {
diff --git a/base/content/browser-plugins.js b/base/content/browser-plugins.js
index c1bc658..5b043d1 100644
--- a/base/content/browser-plugins.js
+++ b/base/content/browser-plugins.js
@@ -111,18 +111,7 @@ var gPluginHandler = {
},
_clickToPlayNotificationEventCallback: function PH_ctpEventCallback(event) {
- if (event == "showing") {
- Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_SHOWN")
- .add(!this.options.primaryPlugin);
- // Histograms always start at 0, even though our data starts at 1
- let histogramCount = this.options.pluginData.size - 1;
- if (histogramCount > 4) {
- histogramCount = 4;
- }
- Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_PLUGIN_COUNT")
- .add(histogramCount);
- }
- else if (event == "dismissed") {
+ if (event == "dismissed") {
// Once the popup is dismissed, clicking the icon should show the full
// list again
this.options.primaryPlugin = null;
@@ -138,8 +127,6 @@ var gPluginHandler = {
let permission;
let expireType;
let expireTime;
- let histogram =
- Services.telemetry.getHistogramById("PLUGINS_NOTIFICATION_USER_ACTION");
// Update the permission manager.
// Also update the current state of pluginInfo.fallbackType so that
@@ -149,7 +136,6 @@ var gPluginHandler = {
permission = Ci.nsIPermissionManager.ALLOW_ACTION;
expireType = Ci.nsIPermissionManager.EXPIRE_SESSION;
expireTime = Date.now() + Services.prefs.getIntPref(this.PREF_SESSION_PERSIST_MINUTES) * 60 * 1000;
- histogram.add(0);
aPluginInfo.fallbackType = Ci.nsIObjectLoadingContent.PLUGIN_ACTIVE;
break;
@@ -158,7 +144,6 @@ var gPluginHandler = {
expireType = Ci.nsIPermissionManager.EXPIRE_TIME;
expireTime = Date.now() +
Services.prefs.getIntPref(this.PREF_PERSISTENT_DAYS) * 24 * 60 * 60 * 1000;
- histogram.add(1);
aPluginInfo.fallbackType = Ci.nsIObjectLoadingContent.PLUGIN_ACTIVE;
break;
@@ -166,7 +151,6 @@ var gPluginHandler = {
permission = Ci.nsIPermissionManager.PROMPT_ACTION;
expireType = Ci.nsIPermissionManager.EXPIRE_NEVER;
expireTime = 0;
- histogram.add(2);
switch (aPluginInfo.blocklistState) {
case Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE:
aPluginInfo.fallbackType = Ci.nsIObjectLoadingContent.PLUGIN_VULNERABLE_UPDATABLE;
@@ -347,9 +331,6 @@ var gPluginHandler = {
return;
}
- Services.telemetry.getHistogramById("PLUGINS_INFOBAR_SHOWN").
- add(true);
-
let message;
// Icons set directly cannot be manipulated using moz-image-region, so
// we use CSS classes instead.
@@ -386,9 +367,6 @@ var gPluginHandler = {
label: gNavigatorBundle.getString("pluginContinueBlocking.label"),
accessKey: gNavigatorBundle.getString("pluginContinueBlocking.accesskey"),
callback: function() {
- Services.telemetry.getHistogramById("PLUGINS_INFOBAR_BLOCK").
- add(true);
-
Services.perms.addFromPrincipal(principal,
"plugin-hidden-notification",
Services.perms.DENY_ACTION);
@@ -398,9 +376,6 @@ var gPluginHandler = {
label: gNavigatorBundle.getString("pluginActivateTrigger.label"),
accessKey: gNavigatorBundle.getString("pluginActivateTrigger.accesskey"),
callback: function() {
- Services.telemetry.getHistogramById("PLUGINS_INFOBAR_ALLOW").
- add(true);
-
let curNotification =
PopupNotifications.getNotification("click-to-play-plugins",
browser);
diff --git a/base/content/browser.js b/base/content/browser.js
index 352f5e6..58a57be 100755
--- a/base/content/browser.js
+++ b/base/content/browser.js
@@ -1041,10 +1041,6 @@ var gBrowserInit = {
_delayedStartup: function() {
let tmp = {};
- Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
- let TelemetryTimestamps = tmp.TelemetryTimestamps;
- TelemetryTimestamps.add("delayedStartupStarted");
-
this._cancelDelayedStartup();
// We need to set the OfflineApps message listeners up before we
@@ -1186,8 +1182,6 @@ var gBrowserInit = {
PanelUI.init();
LightweightThemeListener.init();
- Services.telemetry.getHistogramById("E10S_WINDOW").add(gMultiProcessBrowser);
-
SidebarUI.startDelayedLoad();
UpdateUrlbarSearchSplitterState();
@@ -1345,23 +1339,6 @@ var gBrowserInit = {
// Start monitoring slow add-ons
AddonWatcher.init();
- // Telemetry for master-password - we do this after 5 seconds as it
- // can cause IO if NSS/PSM has not already initialized.
- setTimeout(() => {
- if (window.closed) {
- return;
- }
- let secmodDB = Cc["@mozilla.org/security/pkcs11moduledb;1"]
- .getService(Ci.nsIPKCS11ModuleDB);
- let slot = secmodDB.findSlotByName("");
- let mpEnabled = slot &&
- slot.status != Ci.nsIPKCS11Slot.SLOT_UNINITIALIZED &&
- slot.status != Ci.nsIPKCS11Slot.SLOT_READY;
- if (mpEnabled) {
- Services.telemetry.getHistogramById("MASTER_PASSWORD_ENABLED").add(mpEnabled);
- }
- }, 5000);
-
PanicButtonNotifier.init();
});
@@ -1376,7 +1353,6 @@ var gBrowserInit = {
this.delayedStartupFinished = true;
Services.obs.notifyObservers(window, "browser-delayed-startup-finished", "");
- TelemetryTimestamps.add("delayedStartupFinished");
},
// Returns the URI(s) to load at startup.
@@ -2659,12 +2635,6 @@ var gMenuButtonUpdateBadge = {
}
};
-// Values for telemtery bins: see TLS_ERROR_REPORT_UI in Histograms.json
-const TLS_ERROR_REPORT_TELEMETRY_AUTO_CHECKED = 2;
-const TLS_ERROR_REPORT_TELEMETRY_AUTO_UNCHECKED = 3;
-const TLS_ERROR_REPORT_TELEMETRY_MANUAL_SEND = 4;
-const TLS_ERROR_REPORT_TELEMETRY_AUTO_SEND = 5;
-
const PREF_SSL_IMPACT_ROOTS = ["security.tls.version.", "security.ssl3."];
const PREF_SSL_IMPACT = PREF_SSL_IMPACT_ROOTS.reduce((prefs, root) => {
@@ -2684,7 +2654,6 @@ var BrowserOnClick = {
mm.addMessageListener("Browser:SiteBlockedError", this);
mm.addMessageListener("Browser:EnableOnlineMode", this);
mm.addMessageListener("Browser:ResetSSLPreferences", this);
- mm.addMessageListener("Browser:SSLErrorReportTelemetry", this);
mm.addMessageListener("Browser:OverrideWeakCrypto", this);
mm.addMessageListener("Browser:SSLErrorGoBack", this);
@@ -2698,7 +2667,6 @@ var BrowserOnClick = {
mm.removeMessageListener("Browser:SiteBlockedError", this);
mm.removeMessageListener("Browser:EnableOnlineMode", this);
mm.removeMessageListener("Browser:ResetSSLPreferences", this);
- mm.removeMessageListener("Browser:SSLErrorReportTelemetry", this);
mm.removeMessageListener("Browser:OverrideWeakCrypto", this);
mm.removeMessageListener("Browser:SSLErrorGoBack", this);
@@ -2744,11 +2712,6 @@ var BrowserOnClick = {
}
msg.target.reload();
break;
- case "Browser:SSLErrorReportTelemetry":
- let reportStatus = msg.data.reportStatus;
- Services.telemetry.getHistogramById("TLS_ERROR_REPORT_UI")
- .add(reportStatus);
- break;
case "Browser:OverrideWeakCrypto":
let weakCryptoOverride = Cc["@mozilla.org/security/weakcryptooverride;1"]
.getService(Ci.nsIWeakCryptoOverride);
@@ -4898,11 +4861,6 @@ var gTabletModePageCounter = {
},
finish() {
- if (this.enabled) {
- let histogram = Services.telemetry.getKeyedHistogramById("FX_TABLETMODE_PAGE_LOAD");
- histogram.add("tablet", this._tabletCount);
- histogram.add("desktop", this._desktopCount);
- }
},
};
@@ -6433,12 +6391,6 @@ var gIdentityHandler = {
},
disableMixedContentProtection() {
- // Use telemetry to measure how often unblocking happens
- const kMIXED_CONTENT_UNBLOCK_EVENT = 2;
- let histogram =
- Services.telemetry.getHistogramById(
- "MIXED_CONTENT_UNBLOCK_COUNTER");
- histogram.add(kMIXED_CONTENT_UNBLOCK_EVENT);
// Reload the page with the content unblocked
BrowserReloadWithFlags(
Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_MIXED_CONTENT);
@@ -7155,9 +7107,6 @@ var gIdentityHandler = {
this._permissionJustRemoved = true;
this.updatePermissionHint();
- // Set telemetry values for clearing a permission
- let histogram = Services.telemetry.getKeyedHistogramById("WEB_PERMISSION_CLEARED");
-
let permissionType = 0;
if (aPermission.state == SitePermissions.ALLOW) {
// 1 : clear permanently allowed permission
diff --git a/base/content/content.js b/base/content/content.js
index e21cedf..26c30a9 100644
--- a/base/content/content.js
+++ b/base/content/content.js
@@ -216,12 +216,6 @@ Cc["@mozilla.org/eventlistenerservice;1"]
.getService(Ci.nsIEventListenerService)
.addSystemEventListener(global, "contextmenu", handleContentContextMenu, false);
-// Values for telemtery bins: see TLS_ERROR_REPORT_UI in Histograms.json
-const TLS_ERROR_REPORT_TELEMETRY_UI_SHOWN = 0;
-const TLS_ERROR_REPORT_TELEMETRY_EXPANDED = 1;
-const TLS_ERROR_REPORT_TELEMETRY_SUCCESS = 6;
-const TLS_ERROR_REPORT_TELEMETRY_FAILURE = 7;
-
const SEC_ERROR_BASE = Ci.nsINSSErrorsService.NSS_SEC_ERROR_BASE;
const MOZILLA_PKIX_ERROR_BASE = Ci.nsINSSErrorsService.MOZILLA_PKIX_ERROR_BASE;
diff --git a/base/content/newtab/sites.js b/base/content/newtab/sites.js
index 1ede993..a3d0160 100644
--- a/base/content/newtab/sites.js
+++ b/base/content/newtab/sites.js
@@ -281,21 +281,6 @@ Site.prototype = {
},
/**
- * Record interaction with site using telemetry.
- */
- _recordSiteClicked: function Site_recordSiteClicked(aIndex) {
- if (Services.prefs.prefHasUserValue("browser.newtabpage.rows") ||
- Services.prefs.prefHasUserValue("browser.newtabpage.columns") ||
- aIndex > 8) {
- // We only want to get indices for the default configuration, everything
- // else goes in the same bucket.
- aIndex = 9;
- }
- Services.telemetry.getHistogramById("NEWTAB_PAGE_SITE_CLICKED")
- .add(aIndex);
- },
-
- /**
* Handles site click events.
*/
onClick: function Site_onClick(aEvent) {
@@ -306,10 +291,6 @@ Site.prototype = {
// Handle tile/thumbnail link click
if (target.classList.contains("newtab-link") ||
target.parentElement.classList.contains("newtab-link")) {
- // Record for primary and middle clicks
- if (button == 0 || button == 1) {
- this._recordSiteClicked(tileIndex);
- }
}
// Only handle primary clicks for the remaining targets
else if (button == 0) {
diff --git a/base/content/tabbrowser.xml b/base/content/tabbrowser.xml
index 3b17718..c6202d2 100644
--- a/base/content/tabbrowser.xml
+++ b/base/content/tabbrowser.xml
@@ -1310,8 +1310,7 @@
This function assumes we have an LRU cache of tabs (either
images of tab content or their layers). The goal is to find
out how far into the cache we need to look in order to find
- aTab. We record this number in telemetry and also move aTab to
- the front of the cache.
+ aTab. We move aTab to the front of the cache.
A newly created tab has position Infinity in the cache.
If a tab is closed, it has no effect on the position of other
@@ -1323,10 +1322,6 @@
<method name="_recordTabAccess">
<parameter name="aTab"/>
<body><![CDATA[
- if (!Services.telemetry.canRecordExtended) {
- return;
- }
-
let tabs = Array.from(this.visibleTabs);
let pos = aTab.cachePosition;
@@ -1338,10 +1333,6 @@
}
}
aTab.cachePosition = 0;
-
- if (isFinite(pos)) {
- Services.telemetry.getHistogramById("TAB_SWITCH_CACHE_POSITION").add(pos);
- }
]]></body>
</method>
@@ -2249,8 +2240,6 @@
if (animate) {
requestAnimationFrame(function () {
- this.tabContainer._handleTabTelemetryStart(t, aURI);
-
// kick the animation off
t.setAttribute("fadein", "true");
}.bind(this));
@@ -2434,8 +2423,6 @@
return;
}
- this.tabContainer._handleTabTelemetryStart(aTab);
-
this._blurTab(aTab);
aTab.style.maxWidth = ""; // ensure that fade-out transition happens
aTab.removeAttribute("fadein");
@@ -5858,81 +5845,6 @@
</body>
</method>
- <method name="_handleTabTelemetryStart">
- <parameter name="aTab"/>
- <parameter name="aURI"/>
- <body>
- <![CDATA[
- // Animation-smoothness telemetry/logging
- if (Services.telemetry.canRecordExtended || this._tabAnimationLoggingEnabled) {
- if (aURI == "about:newtab" && (aTab._tPos == 1 || aTab._tPos == 2)) {
- // Indicate newtab page animation where other tabs are unaffected
- // (for which case, the 2nd or 3rd tabs are good representatives, even if not absolute)
- aTab._recordingTabOpenPlain = true;
- }
- aTab._recordingHandle = window.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIDOMWindowUtils)
- .startFrameTimeRecording();
- }
-
- // Overall animation duration
- aTab._animStartTime = Date.now();
- ]]>
- </body>
- </method>
-
- <method name="_handleTabTelemetryEnd">
- <parameter name="aTab"/>
- <body>
- <![CDATA[
- if (!aTab._animStartTime) {
- return;
- }
-
- aTab._animStartTime = 0;
-
- // Handle tab animation smoothness telemetry/logging of frame intervals and paint times
- if (!("_recordingHandle" in aTab)) {
- return;
- }
-
- let intervals = window.QueryInterface(Ci.nsIInterfaceRequestor)
- .getInterface(Ci.nsIDOMWindowUtils)
- .stopFrameTimeRecording(aTab._recordingHandle);
- delete aTab._recordingHandle;
- let frameCount = intervals.length;
-
- if (this._tabAnimationLoggingEnabled) {
- let msg = "Tab " + (aTab.closing ? "close" : "open") + " (Frame-interval):\n";
- for (let i = 0; i < frameCount; i++) {
- msg += Math.round(intervals[i]) + "\n";
- }
- Services.console.logStringMessage(msg);
- }
-
- // For telemetry, the first frame interval is not useful since it may represent an interval
- // to a relatively old frame (prior to recording start). So we'll ignore it for the average.
- if (frameCount > 1) {
- let averageInterval = 0;
- for (let i = 1; i < frameCount; i++) {
- averageInterval += intervals[i];
- }
- averageInterval = averageInterval / (frameCount - 1);
-
- Services.telemetry.getHistogramById("FX_TAB_ANIM_ANY_FRAME_INTERVAL_MS").add(averageInterval);
-
- if (aTab._recordingTabOpenPlain) {
- delete aTab._recordingTabOpenPlain;
- // While we do have a telemetry probe NEWTAB_PAGE_ENABLED to monitor newtab preview, it'll be
- // easier to overview the data without slicing by it. Hence the additional histograms with _PREVIEW.
- let preview = this._browserNewtabpageEnabled ? "_PREVIEW" : "";
- Services.telemetry.getHistogramById("FX_TAB_ANIM_OPEN" + preview + "_FRAME_INTERVAL_MS").add(averageInterval);
- }
- }
- ]]>
- </body>
- </method>
-
<!-- Deprecated stuff, implemented for backwards compatibility. -->
<property name="mAllTabsPopup" readonly="true"
onget="return document.getElementById('alltabs-popup');"/>
@@ -5947,8 +5859,6 @@
var tab = event.target;
- this._handleTabTelemetryEnd(tab);
-
if (tab.getAttribute("fadein") == "true") {
if (tab._fullyOpen)
this.adjustTabstrip();
diff --git a/base/content/urlbarBindings.xml b/base/content/urlbarBindings.xml
index b2a1f32..4ff1e66 100644
--- a/base/content/urlbarBindings.xml
+++ b/base/content/urlbarBindings.xml
@@ -601,7 +601,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
typeof(engineOrEngineName) == "string" ?
Services.search.getEngineByName(engineOrEngineName) :
engineOrEngineName;
- let isOneOff = this.popup.oneOffSearchButtons;
// Infer the type of the event which triggered the search.
let eventType = "unknown";
if (event instanceof KeyboardEvent) {
@@ -611,7 +610,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
}
// Augment the search action details object.
let details = searchActionDetails || {};
- details.isOneOff = isOneOff;
details.type = eventType;
let submission = engine.getSubmission(query, null, "keyword");
@@ -1287,12 +1285,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
var searchBar = BrowserSearch.searchBar;
var popupForSearchBar = searchBar && searchBar.textbox == this.mInput;
- if (popupForSearchBar) {
- searchBar.telemetrySearchDetails = {
- index: controller.selection.currentIndex,
- kind: "mouse"
- };
- }
// Check for unmodified left-click, and use default behavior
if (aEvent.button == 0 && !aEvent.shiftKey && !aEvent.ctrlKey &&
@@ -1435,12 +1427,10 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
<body><![CDATA[
this._oneOffSearchesEnabled = enable;
if (enable) {
- this.oneOffSearchButtons.telemetryOrigin = "urlbar";
this.oneOffSearchButtons.style.display = "-moz-box";
this.oneOffSearchButtons.popup = this;
this.oneOffSearchButtons.textbox = this.input;
} else {
- this.oneOffSearchButtons.telemetryOrigin = null;
this.oneOffSearchButtons.style.display = "none";
this.oneOffSearchButtons.popup = null;
this.oneOffSearchButtons.textbox = null;
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-02 03:34:49 +0000