Issue #21 - Remove Telemetry from Push and devtools.

3 files changed, 1 insertions, 22 deletions

diff --git a/devtools/client/debugger/content/actions/sources.js b/devtools/client/debugger/content/actions/sources.js
index d7e0728e7c..4fea5b3cdd 100644
--- a/devtools/client/debugger/content/actions/sources.js
+++ b/devtools/client/debugger/content/actions/sources.js
@@ -180,13 +180,10 @@ function loadSourceText(source) {
       [PROMISE]: Task.spawn(function* () {
         let transportType = gClient.localTransport ? "_LOCAL" : "_REMOTE";
         let histogramId = "DEVTOOLS_DEBUGGER_DISPLAY_SOURCE" + transportType + "_MS";
-        let histogram = Services.telemetry.getHistogramById(histogramId);
         let startTime = Date.now();
 
         const response = yield sourceClient.source();
 
-        histogram.add(Date.now() - startTime);
-
         // Automatically pretty print if enabled and the test is
         // detected to be "minified"
         if (Prefs.autoPrettyPrint &&
diff --git a/devtools/client/debugger/new/bundle.js b/devtools/client/debugger/new/bundle.js
index 4200ed275b..2291d48f34 100644
--- a/devtools/client/debugger/new/bundle.js
+++ b/devtools/client/debugger/new/bundle.js
@@ -11474,7 +11474,6 @@ var Debugger =
 	    if (telemetry) {
 	      var transportType = this._transport.onOutputStreamReady === undefined ? "LOCAL_" : "REMOTE_";
 	      var histogramId = "DEVTOOLS_DEBUGGER_RDP_" + transportType + telemetry + "_MS";
-	      histogram = Services.telemetry.getHistogramById(histogramId);
 	      startTime = +new Date();
 	    }
 	    var outgoingPacket = {
@@ -11513,10 +11512,6 @@ var Debugger =
 	      if (thisCallback) {
 	        thisCallback(aResponse);
 	      }
-	
-	      if (histogram) {
-	        histogram.add(+new Date() - startTime);
-	      }
 	    }, "DebuggerClient.requester request callback"));
 	  }, "DebuggerClient.requester");
 	};
diff --git a/devtools/client/framework/test/browser_toolbox_hosts_telemetry.js b/devtools/client/framework/test/browser_toolbox_hosts_telemetry.js
index f8ff9b3e41..6e65831351 100644
--- a/devtools/client/framework/test/browser_toolbox_hosts_telemetry.js
+++ b/devtools/client/framework/test/browser_toolbox_hosts_telemetry.js
@@ -8,14 +8,7 @@ const {SIDE, BOTTOM, WINDOW} = Toolbox.HostType;
 
 const URL = "data:text/html;charset=utf8,browser_toolbox_hosts_telemetry.js";
 
-function getHostHistogram() {
-  return Services.telemetry.getHistogramById("DEVTOOLS_TOOLBOX_HOST");
-}
-
 add_task(function* () {
-  // Reset it to make counting easier
-  getHostHistogram().clear();
-
   info("Create a test tab and open the toolbox");
   let tab = yield addTab(URL);
   let target = TargetFactory.forTab(tab);
@@ -27,9 +20,6 @@ add_task(function* () {
 
   toolbox = target = null;
   gBrowser.removeCurrentTab();
-
-  // Cleanup
-  getHostHistogram().clear();
 });
 
 function* changeToolboxHost(toolbox) {
@@ -43,8 +33,5 @@ function* changeToolboxHost(toolbox) {
 }
 
 function checkResults() {
-  let counts = getHostHistogram().snapshot().counts;
-  is(counts[0], 3, "Toolbox HostType bottom has 3 successful entries");
-  is(counts[1], 2, "Toolbox HostType side has 2 successful entries");
-  is(counts[2], 2, "Toolbox HostType window has 2 successful entries");
+// STUB
 }