summaryrefslogtreecommitdiff
path: root/components/sessionstore
diff options
context:
space:
mode:
Diffstat (limited to 'components/sessionstore')
-rw-r--r--components/sessionstore/SessionFile.jsm27
-rw-r--r--components/sessionstore/SessionStore.jsm33
-rw-r--r--components/sessionstore/SessionWorker.js5
-rw-r--r--components/sessionstore/StartupPerformance.jsm12
-rw-r--r--components/sessionstore/content/content-sessionStore.js19
-rw-r--r--components/sessionstore/nsSessionStartup.js5
6 files changed, 6 insertions, 95 deletions
diff --git a/components/sessionstore/SessionFile.jsm b/components/sessionstore/SessionFile.jsm
index 3c55101..3fa6e2a 100644
--- a/components/sessionstore/SessionFile.jsm
+++ b/components/sessionstore/SessionFile.jsm
@@ -45,8 +45,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "RunState",
"resource:///modules/sessionstore/RunState.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Task",
"resource://gre/modules/Task.jsm");
-XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
- "@mozilla.org/base/telemetry;1", "nsITelemetry");
XPCOMUtils.defineLazyServiceGetter(this, "sessionStartup",
"@mozilla.org/browser/sessionstartup;1", "nsISessionStartup");
XPCOMUtils.defineLazyModuleGetter(this, "SessionWorker",
@@ -234,10 +232,6 @@ var SessionFileInternal = {
source: source,
parsed: parsed
};
- Telemetry.getHistogramById("FX_SESSION_RESTORE_CORRUPT_FILE").
- add(false);
- Telemetry.getHistogramById("FX_SESSION_RESTORE_READ_FILE_MS").
- add(Date.now() - startMs);
break;
} catch (ex if ex instanceof OS.File.Error && ex.becauseNoSuchFile) {
exists = false;
@@ -253,16 +247,12 @@ var SessionFileInternal = {
} finally {
if (exists) {
noFilesFound = false;
- Telemetry.getHistogramById("FX_SESSION_RESTORE_CORRUPT_FILE").
- add(corrupted);
}
}
}
// All files are corrupted if files found but none could deliver a result.
let allCorrupt = !noFilesFound && !result;
- Telemetry.getHistogramById("FX_SESSION_RESTORE_ALL_FILES_CORRUPT").
- add(allCorrupt);
if (!result) {
// If everything fails, start with an empty session.
@@ -331,7 +321,6 @@ var SessionFileInternal = {
// Wait until the write is done.
promise = promise.then(msg => {
// Record how long the write took.
- this._recordTelemetry(msg.telemetry);
this._successes++;
if (msg.result.upgradeBackup) {
// We have just completed a backup-on-upgrade, store the information
@@ -378,20 +367,4 @@ var SessionFileInternal = {
wipe: function () {
return this._postToWorker("wipe");
},
-
- _recordTelemetry: function(telemetry) {
- for (let id of Object.keys(telemetry)){
- let value = telemetry[id];
- let samples = [];
- if (Array.isArray(value)) {
- samples.push(...value);
- } else {
- samples.push(value);
- }
- let histogram = Telemetry.getHistogramById(id);
- for (let sample of samples) {
- histogram.add(sample);
- }
- }
- }
};
diff --git a/components/sessionstore/SessionStore.jsm b/components/sessionstore/SessionStore.jsm
index 086bb91..1e886b7 100644
--- a/components/sessionstore/SessionStore.jsm
+++ b/components/sessionstore/SessionStore.jsm
@@ -135,7 +135,6 @@ Cu.import("resource://gre/modules/PrivateBrowsingUtils.jsm", this);
Cu.import("resource://gre/modules/Promise.jsm", this);
Cu.import("resource://gre/modules/Services.jsm", this);
Cu.import("resource://gre/modules/Task.jsm", this);
-Cu.import("resource://gre/modules/TelemetryTimestamps.jsm", this);
Cu.import("resource://gre/modules/Timer.jsm", this);
Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
Cu.import("resource://gre/modules/debug.js", this);
@@ -145,8 +144,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "gSessionStartup",
"@mozilla.org/browser/sessionstartup;1", "nsISessionStartup");
XPCOMUtils.defineLazyServiceGetter(this, "gScreenManager",
"@mozilla.org/gfx/screenmanager;1", "nsIScreenManager");
-XPCOMUtils.defineLazyServiceGetter(this, "Telemetry",
- "@mozilla.org/base/telemetry;1", "nsITelemetry");
XPCOMUtils.defineLazyModuleGetter(this, "console",
"resource://gre/modules/Console.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
@@ -550,7 +547,6 @@ var SessionStoreInternal = {
throw new Error("SessionStore.init() must only be called once!");
}
- TelemetryTimestamps.add("sessionRestoreInitialized");
OBSERVING.forEach(function(aTopic) {
Services.obs.addObserver(this, aTopic, true);
}, this);
@@ -782,9 +778,8 @@ var SessionStoreInternal = {
return;
}
- // Record telemetry measurements done in the child and update the tab's
- // cached state. Mark the window as dirty and trigger a delayed write.
- this.recordTelemetry(aMessage.data.telemetry);
+ // Update the tab's cached state.
+ // Mark the window as dirty and trigger a delayed write.
TabState.update(browser, aMessage.data);
this.saveStateDelayed(win);
@@ -919,18 +914,6 @@ var SessionStoreInternal = {
}
},
- /**
- * Record telemetry measurements stored in an object.
- * @param telemetry
- * {histogramID: value, ...} An object mapping histogramIDs to the
- * value to be recorded for that ID,
- */
- recordTelemetry: function (telemetry) {
- for (let histogramId in telemetry){
- Telemetry.getHistogramById(histogramId).add(telemetry[histogramId]);
- }
- },
-
/* ........ Window Event Handlers .............. */
/**
@@ -1081,7 +1064,6 @@ var SessionStoreInternal = {
// Nothing to restore now, notify observers things are complete.
Services.obs.notifyObservers(null, NOTIFY_WINDOWS_RESTORED, "");
} else {
- TelemetryTimestamps.add("sessionRestoreRestoring");
this._restoreCount = aInitialState.windows ? aInitialState.windows.length : 0;
// global data must be restored before restoreWindow is called so that
@@ -3810,8 +3792,7 @@ var SessionStoreInternal = {
},
/**
- * Update the session start time and send a telemetry measurement
- * for the number of days elapsed since the session was started.
+ * Update the session start time.
*
* @param state
* The session state.
@@ -4437,13 +4418,7 @@ var SessionStoreInternal = {
* Handle an error report from a content process.
*/
reportInternalError(data) {
- // For the moment, we only report errors through Telemetry.
- if (data.telemetry) {
- for (let key of Object.keys(data.telemetry)) {
- let histogram = Telemetry.getHistogramById(key);
- histogram.add(data.telemetry[key]);
- }
- }
+ // STUB, was only reported through Telemetry.
},
/**
diff --git a/components/sessionstore/SessionWorker.js b/components/sessionstore/SessionWorker.js
index 7d802a7..1297a11 100644
--- a/components/sessionstore/SessionWorker.js
+++ b/components/sessionstore/SessionWorker.js
@@ -126,7 +126,6 @@ var Agent = {
*/
write: function (state, options = {}) {
let exn;
- let telemetry = {};
// Cap the number of backward and forward shistory entries on shutdown.
if (options.isFinalWrite) {
@@ -197,9 +196,6 @@ var Agent = {
});
}
- telemetry.FX_SESSION_RESTORE_WRITE_FILE_MS = Date.now() - startWriteMs;
- telemetry.FX_SESSION_RESTORE_FILE_SIZE_BYTES = data.byteLength;
-
} catch (ex) {
// Don't throw immediately
exn = exn || ex;
@@ -276,7 +272,6 @@ var Agent = {
result: {
upgradeBackup: upgradeBackupComplete
},
- telemetry: telemetry,
};
},
diff --git a/components/sessionstore/StartupPerformance.jsm b/components/sessionstore/StartupPerformance.jsm
index d1b77a2..361602b 100644
--- a/components/sessionstore/StartupPerformance.jsm
+++ b/components/sessionstore/StartupPerformance.jsm
@@ -111,18 +111,6 @@ this.StartupPerformance = {
return;
}
- // Once we are done restoring tabs, update Telemetry.
- let histogramName = isAutoRestore ?
- "FX_SESSION_RESTORE_AUTO_RESTORE_DURATION_UNTIL_EAGER_TABS_RESTORED_MS" :
- "FX_SESSION_RESTORE_MANUAL_RESTORE_DURATION_UNTIL_EAGER_TABS_RESTORED_MS";
- let histogram = Services.telemetry.getHistogramById(histogramName);
- let delta = this._latestRestoredTimeStamp - this._startTimeStamp;
- histogram.add(delta);
-
- Services.telemetry.getHistogramById("FX_SESSION_RESTORE_NUMBER_OF_EAGER_TABS_RESTORED").add(this._totalNumberOfEagerTabs);
- Services.telemetry.getHistogramById("FX_SESSION_RESTORE_NUMBER_OF_TABS_RESTORED").add(this._totalNumberOfTabs);
- Services.telemetry.getHistogramById("FX_SESSION_RESTORE_NUMBER_OF_WINDOWS_RESTORED").add(this._totalNumberOfWindows);
-
// Reset
this._startTimeStamp = null;
} catch (ex) {
diff --git a/components/sessionstore/content/content-sessionStore.js b/components/sessionstore/content/content-sessionStore.js
index 858e357..8af3350 100644
--- a/components/sessionstore/content/content-sessionStore.js
+++ b/components/sessionstore/content/content-sessionStore.js
@@ -628,7 +628,6 @@ var SessionStorageListener = {
let size = this.estimateStorageSize(collected);
- MessageQueue.push("telemetry", () => ({ FX_SESSION_RESTORE_DOM_STORAGE_SIZE_ESTIMATE_CHARS: size }));
if (size > Preferences.get("browser.sessionstore.dom_storage_limit", DOM_STORAGE_MAX_CHARS)) {
// Rather than keeping the old storage, which wouldn't match the rest
// of the state of the page, empty the storage. DOM storage will be
@@ -800,37 +799,23 @@ var MessageQueue = {
let durationMs = Date.now();
let data = {};
- let telemetry = {};
for (let [key, func] of this._data) {
let value = func();
- if (key == "telemetry") {
- for (let histogramId of Object.keys(value)) {
- telemetry[histogramId] = value[histogramId];
- }
- } else if (value || (key != "storagechange" && key != "historychange")) {
+ if (value || (key != "storagechange" && key != "historychange")) {
data[key] = value;
}
}
this._data.clear();
- durationMs = Date.now() - durationMs;
- telemetry.FX_SESSION_RESTORE_CONTENT_COLLECT_DATA_LONGEST_OP_MS = durationMs;
-
try {
// Send all data to the parent process.
sendAsyncMessage("SessionStore:update", {
- data, telemetry, flushID,
+ data, flushID,
isFinal: options.isFinal || false,
epoch: gCurrentEpoch
});
} catch (ex if ex && ex.result == Cr.NS_ERROR_OUT_OF_MEMORY) {
- let telemetry = {
- FX_SESSION_RESTORE_SEND_UPDATE_CAUSED_OOM: 1
- };
- sendAsyncMessage("SessionStore:error", {
- telemetry
- });
}
},
};
diff --git a/components/sessionstore/nsSessionStartup.js b/components/sessionstore/nsSessionStartup.js
index 9cda155..c7bb338 100644
--- a/components/sessionstore/nsSessionStartup.js
+++ b/components/sessionstore/nsSessionStartup.js
@@ -203,11 +203,6 @@ SessionStartup.prototype = {
}
}
- // Report shutdown success via telemetry. Shortcoming here are
- // being-killed-by-OS-shutdown-logic, shutdown freezing after
- // session restore was written, etc.
- Services.telemetry.getHistogramById("SHUTDOWN_OK").add(!this._previousSessionCrashed);
-
// set the startup type
if (this._previousSessionCrashed && resumeFromCrash)
this._sessionType = Ci.nsISessionStartup.RECOVER_SESSION;
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-07 00:10:29 +0000