Backed out changeset 2e9eab35d1ea (bug 1334616) for bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 06 Feb 2017 22:04:16 -0800
changeset 341127 6db058fe1d63d9f4d8dc5ecc7b77b0330abc96dd
parent 341126 2e9eab35d1ea435da4b0a8438035b1ce614a1a6f
child 341128 b2d14d738d2c38bd56225340b4dad320fe50bc7d
push id86634
push usercbook@mozilla.com
push dateTue, 07 Feb 2017 13:14:58 +0000
treeherdermozilla-inbound@9dbd2d9b334e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1334616
milestone54.0a1
backs out2e9eab35d1ea435da4b0a8438035b1ce614a1a6f
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
Backed out changeset 2e9eab35d1ea (bug 1334616) for bustage CLOSED TREE
toolkit/components/telemetry/Histograms.json
toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3978,24 +3978,16 @@
     "keyed": true,
     "kind": "exponential",
     "low": 20,
     "high": 120000,
     "n_buckets": 30,
     "bug_numbers": [1315893],
     "description": "Time spent per classifier update (ms), keyed by the name of the provider."
   },
-  "URLCLASSIFIER_CLASSIFYLOCAL_TIME": {
-    "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
-    "expires_in_version": "never",
-    "kind": "exponential",
-    "high": 60000,
-    "n_buckets": 30,
-    "description": "Time spent inside ClassifyLocalWithTables (ms)"
-  },
   "URLCLASSIFIER_PS_FILELOAD_TIME": {
     "alert_emails": ["safebrowsing-telemetry@mozilla.org"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 10,
     "description": "Time spent loading PrefixSet from file (ms)"
   },
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -1562,17 +1562,16 @@ nsUrlClassifierDBService::ClassifyLocalW
                                                                   &aTableResults);
     if (result) {
       return rv;
     }
     return NS_ERROR_FAILURE;
   }
 
   PROFILER_LABEL_FUNC(js::ProfileEntry::Category::OTHER);
-  Telemetry::AutoTimer<Telemetry::URLCLASSIFIER_CLASSIFYLOCAL_TIME> timer;
 
   nsCOMPtr<nsIURI> uri = NS_GetInnermostURI(aURI);
   NS_ENSURE_TRUE(uri, NS_ERROR_FAILURE);
 
   nsAutoCString key;
   // Canonicalize the url
   nsCOMPtr<nsIUrlClassifierUtils> utilsService =
     do_GetService(NS_URLCLASSIFIERUTILS_CONTRACTID);