mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 17:55:50 +00:00
Bug 1140132 - Annotate the current telemetry environment in crash reports. r=ted/gfritzsche
--HG-- extra : rebase_source : e02554cb696874333050ed2d2ea27a5f9045dbdd extra : source : 8602b9bc551d5c1eea72eb0fefabcf6b1c07a20e
This commit is contained in:
parent
e2c2aa0c0a
commit
d66884dc5f
@ -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]);
|
||||
|
Loading…
Reference in New Issue
Block a user