Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1136731 - Fix fragile subsession id resets. r=froydnj

Browse Source
This commit is contained in:
Georg Fritzsche 2015-02-25 23:54:35 +01:00
parent 7fec25f504
commit 4ec8f1cf47
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/components/telemetry/TelemetrySession.jsm
View File

@ -390,7 +390,9 @@ this.TelemetrySession = Object.freeze({
* Used only for testing purposes.
*/
reset: function() {
Impl._sessionId = Policy.generateSessionUUID();
Impl._sessionId = null;
Impl._subsessionId = null;
Impl._previousSubsessionId = null;
Impl._subsessionCounter = 0;
Impl._profileSubsessionCounter = 0;
this.uninstall();
@ -456,9 +458,9 @@ let Impl = {
// where source is a weak reference to the child process,
// and payload is the telemetry payload from that child process.
_childTelemetry: [],
// Generate a unique id once per session so the server can cope with duplicate
// Unique id that identifies this session so the server can cope with duplicate
// submissions, orphaning and other oddities. The id is shared across subsessions.
_sessionId: Policy.generateSessionUUID(),
_sessionId: null,
// Random subsession id.
_subsessionId: null,
// Subsession id of the previous subsession (even if it was in a different session),
@ -1086,6 +1088,9 @@ let Impl = {
return Promise.resolve();
}
// Generate a unique id once per session so the server can cope with duplicate
// submissions, orphaning and other oddities. The id is shared across subsessions.
this._sessionId = Policy.generateSessionUUID();
this.startNewSubsession();
// startNewSubsession sets |_subsessionStartDate| to the current date/time. Use
// the very same value for |_sessionStartDate|.

2
toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
View File

@ -1105,7 +1105,7 @@ add_task(function* test_invalidSessionData() {
// Load back the serialised session data.
let data = yield CommonUtils.readJSON(dataFilePath);
Assert.equal(data.profileSubsessionCounter, expectedSubsessions);
Assert.equal(data.previousSubsessionId, expectedUUID);
Assert.equal(data.previousSubsessionId, null);
});
add_task(function* stopServer(){