1 files changed, 44 insertions, 0 deletions
diff --git a/toolkit/components/telemetry/TelemetryStartup.sys.mjs b/toolkit/components/telemetry/TelemetryStartup.sys.mjs
new file mode 100644
index 0000000000..445cd906c2
--- /dev/null
+++ b/toolkit/components/telemetry/TelemetryStartup.sys.mjs
@@ -0,0 +1,44 @@
+/* -*- js-indent-level: 2; indent-tabs-mode: nil -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const lazy = {};
+
+ChromeUtils.defineESModuleGetters(lazy, {
+  TelemetryController: "resource://gre/modules/TelemetryController.sys.mjs",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
+});
+
+/**
+ * TelemetryStartup is needed to forward the "profile-after-change" notification
+ * to TelemetryController.jsm.
+ */
+export function TelemetryStartup() {}
+
+TelemetryStartup.prototype.QueryInterface = ChromeUtils.generateQI([
+  "nsIObserver",
+]);
+TelemetryStartup.prototype.observe = function (aSubject, aTopic, aData) {
+  if (aTopic == "profile-after-change") {
+    // In the content process, this is done in ContentProcessSingleton.js.
+    lazy.TelemetryController.observe(null, aTopic, null);
+  }
+  if (aTopic == "profile-after-change") {
+    annotateEnvironment();
+    lazy.TelemetryEnvironment.registerChangeListener(
+      "CrashAnnotator",
+      annotateEnvironment
+    );
+    lazy.TelemetryEnvironment.onInitialized().then(() => annotateEnvironment());
+  }
+};
+
+function annotateEnvironment() {
+  try {
+    let env = JSON.stringify(lazy.TelemetryEnvironment.currentEnvironment);
+    Services.appinfo.annotateCrashReport("TelemetryEnvironment", env);
+  } catch (e) {
+    // crash reporting not built or disabled? Ignore errors
+  }
+}