Bug 1337115 - Part 2 - Send telemetry if session restore completely fails and we're not on the first run. r=sebastian

For a fresh profile it is expected that there are no session files to restore from, however afterwards we should normally always have a valid - if possibly empty - session file available. We try excluding the first run case by checking the first run pref used by Telemetry so far and see whether we get any reasonable results out of this...

MozReview-Commit-ID: 2ZxmLqwhk32

--HG--
extra : rebase_source : 6e76cad14017aced2e4b5f00b8c385dc544529bf
This commit is contained in:
Jan Henning 2017-02-17 20:02:33 +01:00
parent 9e83e205d6
commit 52460f6ad2
2 changed files with 25 additions and 9 deletions

View File

@ -1385,6 +1385,14 @@ public abstract class GeckoApp
// Restoring the backup failed, too, so do a normal startup.
Log.e(LOGTAG, "An error occurred during restore", ex);
mShouldRestore = false;
if (!getSharedPreferencesForProfile().
getBoolean(PREFS_IS_FIRST_RUN, true)) {
// Except when starting with a fresh profile, we should normally
// always have a session file available, even if it might only
// contain an empty window.
Telemetry.addToHistogram("FENNEC_SESSIONSTORE_ALL_FILES_DAMAGED", 1);
}
}
}
}

View File

@ -10830,12 +10830,28 @@
},
"FENNEC_SESSIONSTORE_DAMAGED_SESSION_FILE": {
"alert_emails": ["jh+bugzilla@buttercookie.de"],
"expires_in_version": "56",
"expires_in_version": "61",
"kind": "flag",
"bug_numbers": [1284017],
"description": "When restoring tabs on startup, reading from sessionstore.js failed, even though the file exists and is not containing an explicitly empty window.",
"cpp_guard": "ANDROID"
},
"FENNEC_SESSIONSTORE_RESTORING_FROM_BACKUP": {
"alert_emails": ["jh+bugzilla@buttercookie.de"],
"expires_in_version": "61",
"kind": "flag",
"bug_numbers": [1190627],
"description": "When restoring tabs on startup, reading from sessionstore.js failed, but sessionstore.bak was read successfully.",
"cpp_guard": "ANDROID"
},
"FENNEC_SESSIONSTORE_ALL_FILES_DAMAGED": {
"alert_emails": ["jh+bugzilla@buttercookie.de"],
"expires_in_version": "61",
"kind": "flag",
"bug_numbers": [1337115],
"description": "Both the main session file and its backup could not be read and and the first run pref is false.",
"cpp_guard": "ANDROID"
},
"SHARED_WORKER_COUNT": {
"alert_emails": ["amarchesini@mozilla.com"],
"expires_in_version": "58",
@ -10843,14 +10859,6 @@
"bug_numbers": [1295980],
"description": "Number of the use of SharedWorkers."
},
"FENNEC_SESSIONSTORE_RESTORING_FROM_BACKUP": {
"alert_emails": ["jh+bugzilla@buttercookie.de"],
"expires_in_version": "56",
"kind": "flag",
"bug_numbers": [1190627],
"description": "When restoring tabs on startup, reading from sessionstore.js failed, but sessionstore.bak was read successfully.",
"cpp_guard": "ANDROID"
},
"NUMBER_OF_PROFILES": {
"alert_emails": ["amarchesini@mozilla.com"],
"expires_in_version": "58",