Bug 1471647 - Enable Telemetry on ASan Nightly Reporter builds. r?dexter draft
authorChristian Holler <choller@mozilla.com>
Thu, 28 Jun 2018 15:14:19 +0200
changeset 814114 edd862e02e301fc41431e259670bdfd4e3ac5ccb
parent 814113 872486f61f9e61bcb225cf4c492127363b1bebb5
push id115101
push usercholler@mozilla.com
push dateWed, 04 Jul 2018 14:14:14 +0000
reviewersdexter
bugs1471647
milestone63.0a1
Bug 1471647 - Enable Telemetry on ASan Nightly Reporter builds. r?dexter MozReview-Commit-ID: LuSxiXSiEiM
browser/config/mozconfigs/linux64/nightly-asan-reporter
modules/libpref/init/all.js
--- a/browser/config/mozconfigs/linux64/nightly-asan-reporter
+++ b/browser/config/mozconfigs/linux64/nightly-asan-reporter
@@ -15,9 +15,15 @@ ac_add_options --disable-elf-hack
 ac_add_options --enable-address-sanitizer-reporter
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan-reporter
 
 # Need this to add source information into platform.ini
 export MOZILLA_OFFICIAL=1
 
+# Enable Telemetry
+# The channel reported by Telemetry here will be "nightly-asan" as specified
+# in the respective override pref (toolkit.telemetry.overrideUpdateChannel),
+# while the build otherwise identifies as "nightly" to receive its updates.
+export MOZ_TELEMETRY_REPORTING=1
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5777,16 +5777,17 @@ pref("dom.payments.loglevel", "Warn");
 
 #ifdef FUZZING
 pref("fuzzing.enabled", false);
 #endif
 
 #ifdef MOZ_ASAN_REPORTER
 pref("asanreporter.apiurl", "https://anf1.fuzzing.mozilla.org/crashproxy/submit/");
 pref("asanreporter.clientid", "unknown");
+pref("toolkit.telemetry.overrideUpdateChannel", "nightly-asan");
 #endif
 
 #if defined(XP_WIN)
 pref("layers.mlgpu.enabled", true);
 
 // Both this and the master "enabled" pref must be on to use Advanced Layers
 // on Windows 7.
 pref("layers.mlgpu.enable-on-windows7", true);