Bug 1406087 - All PingCentre pings should go to production by default. r=ursula, a=ritu
authorMarina Samuel <msamuel@mozilla.com>
Thu, 05 Oct 2017 11:12:17 -0400
changeset 432401 8278598e288cd21d10106e4b7535974b6c0df11e
parent 432400 f9a13d4d62b64b82555300447695c33036856def
child 432402 361361c9a042452fdad9c4dbe0343d3d8d7f2065
push id7950
push userryanvm@gmail.com
push dateThu, 12 Oct 2017 01:17:29 +0000
treeherdermozilla-beta@98a72bed57b7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersursula, ritu
bugs1406087
milestone57.0
Bug 1406087 - All PingCentre pings should go to production by default. r=ursula, a=ritu MozReview-Commit-ID: 9ZmAG9fBWqX
browser/modules/PingCentre.jsm
--- a/browser/modules/PingCentre.jsm
+++ b/browser/modules/PingCentre.jsm
@@ -13,17 +13,16 @@ XPCOMUtils.defineLazyModuleGetter(this, 
   "resource://gre/modules/ClientID.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TelemetryEnvironment",
   "resource://gre/modules/TelemetryEnvironment.jsm");
 
 const PREF_BRANCH = "browser.ping-centre.";
 
 const TELEMETRY_PREF = `${PREF_BRANCH}telemetry`;
 const LOGGING_PREF = `${PREF_BRANCH}log`;
-const STAGING_ENDPOINT_PREF = `${PREF_BRANCH}staging.endpoint`;
 const PRODUCTION_ENDPOINT_PREF = `${PREF_BRANCH}production.endpoint`;
 
 const FHR_UPLOAD_ENABLED_PREF = "datareporting.healthreport.uploadEnabled";
 
 /**
  * Observe various notifications and send them to a telemetry endpoint.
  *
  * @param {Object} options
@@ -67,20 +66,18 @@ class PingCentre {
     return this._enabled && this._fhrEnabled;
   }
 
   _setPingEndpoint(topic, overrideEndpointPref) {
     const overrideValue = overrideEndpointPref &&
       this._prefs.getStringPref(overrideEndpointPref);
     if (overrideValue) {
       this._pingEndpoint = overrideValue;
-    } else if (AppConstants.MOZ_UPDATE_CHANNEL === "release") {
+    } else {
       this._pingEndpoint = this._prefs.getStringPref(PRODUCTION_ENDPOINT_PREF);
-    } else {
-      this._pingEndpoint = this._prefs.getStringPref(STAGING_ENDPOINT_PREF);
     }
   }
 
   _onLoggingPrefChange(aSubject, aTopic, prefKey) {
     this.logging = this._prefs.getBoolPref(prefKey);
   }
 
   _onTelemetryPrefChange(aSubject, aTopic, prefKey) {