From 53fddbfeb547a2dfe0464751f00750d7f58f28ef Mon Sep 17 00:00:00 2001 From: Christian Holler Date: Thu, 28 Jun 2018 15:14:19 +0200 Subject: [PATCH] Bug 1471647 - Enable Telemetry on ASan Nightly Reporter builds. r=Dexter MozReview-Commit-ID: LuSxiXSiEiM --HG-- extra : rebase_source : 97d9193f08288a760810258a3222a448fcdaf5ba --- browser/config/mozconfigs/linux64/nightly-asan-reporter | 6 ++++++ modules/libpref/init/all.js | 1 + 2 files changed, 7 insertions(+) diff --git a/browser/config/mozconfigs/linux64/nightly-asan-reporter b/browser/config/mozconfigs/linux64/nightly-asan-reporter index 307f42e7d6e8..1fc6a464c387 100644 --- a/browser/config/mozconfigs/linux64/nightly-asan-reporter +++ b/browser/config/mozconfigs/linux64/nightly-asan-reporter @@ -20,4 +20,10 @@ 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" diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 8e68558daf80..3d2c2761d30c 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5782,6 +5782,7 @@ pref("fuzzing.enabled", false); #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)