Bug 1148500 - Part 1 (Fx 40): Introduce a toolkit.telemetry.unified pref. r=dexter
authorGeorg Fritzsche <georg.fritzsche@googlemail.com>
Thu, 30 Apr 2015 14:00:58 +0200
changeset 273198 833051c87c7be1a34d716c51ab50a4431d248be9
parent 273197 b30b620283bd852a543a0bd08928745a0c6f9f68
child 273199 0df0d478d39641db7e3b3a567397f37ca270b09e
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdexter
bugs1148500
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1148500 - Part 1 (Fx 40): Introduce a toolkit.telemetry.unified pref. r=dexter
mobile/android/app/mobile.js
modules/libpref/init/all.js
toolkit/components/telemetry/docs/index.rst
toolkit/components/telemetry/docs/preferences.rst
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -861,15 +861,19 @@ pref("reader.color_scheme", "auto");
 pref("reader.color_scheme.values", "[\"dark\",\"auto\",\"light\"]");
 
 // Whether to use a vertical or horizontal toolbar.
 pref("reader.toolbar.vertical", false);
 
 // Whether or not to display buttons related to reading list in reader view.
 pref("browser.readinglist.enabled", true);
 
+// Telemetry settings.
+// Whether to use the unified telemetry behavior, requires a restart.
+pref("toolkit.telemetry.unified", false);
+
 // Selection carets never fall-back to internal LongTap detector.
 pref("selectioncaret.detects.longtap", false);
 
 // Enable Service workers for Android on non-release builds
 #ifdef NIGHTLY_BUILD
 pref("dom.serviceWorkers.enabled", true);
 #endif
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -760,24 +760,28 @@ pref("toolkit.autocomplete.richBoundaryC
 pref("toolkit.osfile.log", false);
 
 pref("toolkit.scrollbox.smoothScroll", true);
 pref("toolkit.scrollbox.scrollIncrement", 20);
 pref("toolkit.scrollbox.verticalScrollDistance", 3);
 pref("toolkit.scrollbox.horizontalScrollDistance", 5);
 pref("toolkit.scrollbox.clickToScroll.scrollDelay", 150);
 
+// Telemetry settings.
+// Server to submit telemetry pings to.
 pref("toolkit.telemetry.server", "https://incoming.telemetry.mozilla.org");
 // Telemetry server owner. Please change if you set toolkit.telemetry.server to a different server
 pref("toolkit.telemetry.server_owner", "Mozilla");
 // Information page about telemetry (temporary ; will be about:telemetry in the end)
 pref("toolkit.telemetry.infoURL", "https://www.mozilla.org/legal/privacy/firefox.html#telemetry");
 // Determines whether full SQL strings are returned when they might contain sensitive info
 // i.e. dynamically constructed SQL strings or SQL executed by addons against addon DBs
 pref("toolkit.telemetry.debugSlowSql", false);
+// Whether to use the unified telemetry behavior, requires a restart.
+pref("toolkit.telemetry.unified", true);
 
 // Identity module
 pref("toolkit.identity.enabled", false);
 pref("toolkit.identity.debug", false);
 
 // AsyncShutdown delay before crashing in case of shutdown freeze
 pref("toolkit.asyncshutdown.timeout.crash", 60000);
 
--- a/toolkit/components/telemetry/docs/index.rst
+++ b/toolkit/components/telemetry/docs/index.rst
@@ -14,8 +14,9 @@ Client-side, this consists of:
 
 .. toctree::
    :maxdepth: 2
 
    pings
    common-ping
    environment
    main-ping
+   preferences
new file mode 100644
--- /dev/null
+++ b/toolkit/components/telemetry/docs/preferences.rst
@@ -0,0 +1,17 @@
+Preferences
+===========
+
+Telemetry behaviour is controlled through the following preferences:
+
+``toolkit.telemetry.unified``
+
+  This controls whether unified behavior is enabled. If true:
+
+  * Telemetry is always enabled and recording *base* data.
+  * Telemetry will send additional ``main`` pings.
+
+``toolkit.telemetry.enabled``
+
+  If unified is off, this controls whether the Telemetry module is enabled.
+  If unified is on, this controls whether to record *extended* data.
+  This preference is controlled through the `Preferences` dialog.