Backed out changeset 5733e0b0e096 (bug 1120409) for causing frequent timeouts in test_XHR_timeout.html
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 21 Mar 2017 11:28:38 +0100
changeset 502161 ca4ae502156eaea6fffb296bb9c3b3930af8ab58
parent 501879 5fe5dcf1c10a4523ba3f0a20295551462c2dae11
child 502162 529593652eff1ce3e03e7acb8724753648013ddb
child 502163 e2e5412a00d2ee2890a36152b69498dcf58b1f49
child 502223 67ecac412f76a6bf229fead47b40eed69c146d61
push id50205
push userbmo:walkingice0204@gmail.com
push dateTue, 21 Mar 2017 10:45:39 +0000
bugs1120409
milestone55.0a1
backs out5733e0b0e0969bdcdcd53ae25641bafeeae095bf
Backed out changeset 5733e0b0e096 (bug 1120409) for causing frequent timeouts in test_XHR_timeout.html
toolkit/components/telemetry/TelemetryHistogram.cpp
toolkit/components/telemetry/tests/unit/test_TelemetryHistograms.js
--- a/toolkit/components/telemetry/TelemetryHistogram.cpp
+++ b/toolkit/components/telemetry/TelemetryHistogram.cpp
@@ -2274,22 +2274,16 @@ TelemetryHistogram::CreateHistogramSnaps
   // OK, now we can actually reflect things.
   JS::Rooted<JSObject*> hobj(cx);
   for (auto h : hs) {
     if (!internal_ShouldReflectHistogram(h) || internal_IsEmpty(h) ||
         internal_IsExpired(h)) {
       continue;
     }
 
-    mozilla::Telemetry::HistogramID id;
-    nsresult rv = internal_GetHistogramEnumId(h->histogram_name().c_str(), &id);
-    if (NS_WARN_IF(NS_FAILED(rv)) || gHistograms[id].keyed) {
-      continue;
-    }
-
     Histogram* original = h;
 #if !defined(MOZ_WIDGET_ANDROID)
     if (subsession) {
       h = internal_GetSubsessionHistogram(*h);
       if (!h) {
         continue;
       }
     }
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryHistograms.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryHistograms.js
@@ -752,24 +752,16 @@ add_task(function* test_keyed_histogram_
 
   // Restore to disabled
   Telemetry.setHistogramRecordingEnabled("TELEMETRY_TEST_KEYED_COUNT_INIT_NO_RECORD", false);
   h.add(TEST_KEY, 1);
   Assert.equal(h.snapshot(TEST_KEY).sum, 1,
     "Keyed histogram add should not record when recording is disabled");
 });
 
-add_task(function* test_histogramSnapshots() {
-  let keyed = Telemetry.getKeyedHistogramById("TELEMETRY_TEST_KEYED_COUNT");
-  keyed.add("a", 1);
-
-  // Check that keyed histograms are not returned
-  Assert.ok(!("TELEMETRY_TEST_KEYED_COUNT#a" in Telemetry.histogramSnapshots));
-});
-
 add_task(function* test_datasets() {
   // Check that datasets work as expected.
 
   const RELEASE_CHANNEL_OPTOUT = Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTOUT;
   const RELEASE_CHANNEL_OPTIN  = Ci.nsITelemetry.DATASET_RELEASE_CHANNEL_OPTIN;
 
   // Check that registeredHistogram works properly
   let registered = Telemetry.registeredHistograms(RELEASE_CHANNEL_OPTIN, []);