Backed out changeset 3a6b42b3d233 (bug 1336376) for build failures a=backout CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Mon, 06 Feb 2017 18:36:24 -0800
changeset 479891 2ff48b77d380c9c649d2f5f1d54b4f5c5b3340ad
parent 479890 ce39540ba30ffe06bd6042d990f5aa806f4dfc86
child 479892 370b66055c098a255d1d6a061b357f932ed70b5f
push id44393
push userVYV03354@nifty.ne.jp
push dateTue, 07 Feb 2017 13:53:48 +0000
reviewersbackout
bugs1336376
milestone54.0a1
backs out3a6b42b3d2335f99d68d1e63ac6bb04a8ec78b4c
Backed out changeset 3a6b42b3d233 (bug 1336376) for build failures a=backout CLOSED TREE MozReview-Commit-ID: L3oVRVqNDKj
toolkit/components/telemetry/Histograms.json
toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3941,22 +3941,22 @@
     "alert_emails": ["froydnj@mozilla.com"],
     "bug_numbers": [731004],
     "expires_in_version": "default",
     "kind": "exponential",
     "high": 5000,
     "n_buckets": 10,
     "description": "Time spent checking for and notifying listeners that the user is idle (ms)"
   },
-  "URLCLASSIFIER_LOOKUP_TIME_2": {
+  "URLCLASSIFIER_LOOKUP_TIME": {
     "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
     "expires_in_version": "never",
     "kind": "exponential",
-    "high": 5000,
-    "n_buckets": 30,
+    "high": 500,
+    "n_buckets": 10,
     "description": "Time spent per dbservice lookup (ms)"
   },
   "URLCLASSIFIER_SHUTDOWN_TIME": {
     "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
     "expires_in_version": "58",
     "kind": "exponential",
     "high": 60000,
     "n_buckets": 50,
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -319,17 +319,17 @@ nsUrlClassifierDBServiceWorker::HandlePe
   while (mPendingLookups.Length() > 0) {
     PendingLookup lookup = mPendingLookups[0];
     mPendingLookups.RemoveElementAt(0);
     {
       MutexAutoUnlock unlock(mPendingLookupLock);
       DoLookup(lookup.mKey, lookup.mTables, lookup.mCallback);
     }
     double lookupTime = (TimeStamp::Now() - lookup.mStartTime).ToMilliseconds();
-    Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LOOKUP_TIME_2,
+    Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LOOKUP_TIME,
                           static_cast<uint32_t>(lookupTime));
   }
 
   return NS_OK;
 }
 
 nsresult
 nsUrlClassifierDBServiceWorker::AddNoise(const Prefix aPrefix,