Bug 1254550 - Make Telemetry configuration consistent across builds. r=gfritzsche
authorAlessio Placitelli <alessio.placitelli@gmail.com>
Fri, 11 Mar 2016 06:31:00 +0100
changeset 289565 ae45c837f71ff925e848bb7f44353681a581207f
parent 289535 e10424cf620fabac9a0850668bff5875583402f0
child 289566 4586dc1cf6e9e03d04cbd87e8b7c4c78880906ef
push id30107
push usercbook@mozilla.com
push dateTue, 22 Mar 2016 10:00:23 +0000
treeherdermozilla-central@3587b25bae30 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgfritzsche
bugs1254550
milestone48.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 1254550 - Make Telemetry configuration consistent across builds. r=gfritzsche
toolkit/components/telemetry/Telemetry.cpp
toolkit/components/telemetry/nsITelemetry.idl
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -3343,17 +3343,17 @@ TelemetryImpl::SetCanRecordExtended(bool
  */
 bool
 TelemetryImpl::CanRecordExtended() {
   return !sTelemetry || sTelemetry->mCanRecordExtended;
 }
 
 NS_IMETHODIMP
 TelemetryImpl::GetIsOfficialTelemetry(bool *ret) {
-#if defined(MOZILLA_OFFICIAL) && defined(MOZ_TELEMETRY_REPORTING)
+#if defined(MOZILLA_OFFICIAL) && defined(MOZ_TELEMETRY_REPORTING) && !defined(DEBUG)
   *ret = true;
 #else
   *ret = false;
 #endif
   return NS_OK;
 }
 
 already_AddRefed<nsITelemetry>
--- a/toolkit/components/telemetry/nsITelemetry.idl
+++ b/toolkit/components/telemetry/nsITelemetry.idl
@@ -275,18 +275,18 @@ interface nsITelemetry : nsISupports
    * set to false during tests.
    *
    * Set this to false in tests to disable gathering of extended telemetry statistics.
    */
   attribute boolean canRecordExtended;
 
   /**
    * A flag indicating whether Telemetry can submit official results (for base or extended
-   * data). This is true on official builds with built in support for Mozilla Telemetry
-   * reporting.
+   * data). This is true on official, non-debug builds with built in support for Mozilla
+   * Telemetry reporting.
    */
   readonly attribute boolean isOfficialTelemetry;
 
   /** Addon telemetry hooks */
 
   /**
    * Register a histogram for an addon.  Throws an error if the
    * histogram name has been registered previously.