corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1140132 - Annotate the current telemetry environment in crash reports. r=ted/gfritzsche

Browse Source
This commit is contained in:
Benjamin Smedberg
2015-04-13 12:51:31 -04:00
parent c620bbe567
commit f91cde6fe3
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
toolkit/components/telemetry/TelemetryStartup.js
View File

@@ -5,10 +5,11 @@
"use strict";
const Cu = Components.utils;
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/TelemetryController.jsm", this);
Cu.import("resource://gre/modules/TelemetrySession.jsm", this);
Cu.import("resource://gre/modules/TelemetryEnvironment.jsm", this);
Cu.import("resource://gre/modules/XPCOMUtils.jsm", this);
/**
@@ -19,12 +20,28 @@ function TelemetryStartup() {
}
TelemetryStartup.prototype.classID = Components.ID("{117b219f-92fe-4bd2-a21b-95a342a9d474}");
TelemetryStartup.prototype.QueryInterface = XPCOMUtils.generateQI([Components.interfaces.nsIObserver])
TelemetryStartup.prototype.QueryInterface = XPCOMUtils.generateQI([Components.interfaces.nsIObserver]);
TelemetryStartup.prototype.observe = function(aSubject, aTopic, aData) {
if (aTopic == "profile-after-change" || aTopic == "app-startup") {
TelemetryController.observe(null, aTopic, null);
TelemetrySession.observe(null, aTopic, null);
}
if (aTopic == "profile-after-change") {
annotateEnvironment();
TelemetryEnvironment.registerChangeListener("CrashAnnotator", annotateEnvironment);
TelemetryEnvironment.onInitialized().then(() => annotateEnvironment());
}
}
function annotateEnvironment() {
try {
let cr = Cc["@mozilla.org/toolkit/crash-reporter;1"]
.getService(Ci.nsICrashReporter);
let env = JSON.stringify(TelemetryEnvironment.currentEnvironment);
cr.annotateCrashReport("TelemetryEnvironment", env);
} catch (e) {
// crash reporting not built or disabled? Ignore errors
}
}
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TelemetryStartup]);