Backed out changeset f65f933ecdce (bug 1359306) for bustage
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 27 Jul 2017 08:22:15 +0200
changeset 422375 c1ed71da57073d0f5fdbd279c9ad6037f9ae2d06
parent 422374 f683a2f11afbbeb8fbd750596f750d87d77e35e0
child 422466 e5693cea1ec944ca077c7a46c5f127c828a90f1b
child 422516 452f3e6d539b68941487365917c437e66352401e
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1359306
milestone56.0a1
backs outf65f933ecdce1161bed0a3ef3cdf02e4efb197be
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 f65f933ecdce (bug 1359306) for bustage
browser/components/preferences/in-content-new/findInPage.js
toolkit/components/telemetry/Scalars.yaml
--- a/browser/components/preferences/in-content-new/findInPage.js
+++ b/browser/components/preferences/in-content-new/findInPage.js
@@ -220,21 +220,16 @@ var gSearchResultsPane = {
    *    to search for filted query in
    */
   searchFunction(event) {
     this.query = event.target.value.trim().toLowerCase();
     this.getFindSelection(window).removeAllRanges();
     this.removeAllSearchTooltips();
     this.removeAllSearchMenuitemIndicators();
 
-    // Clear telemetry request if user types very frequently.
-    if (this.telemetryTimer) {
-      clearTimeout(this.telemetryTimer);
-    }
-
     let srHeader = document.getElementById("header-searchResults");
 
     if (this.query) {
       // Showing the Search Results Tag
       gotoPref("paneSearchResults");
 
       let resultsFound = false;
 
@@ -274,23 +269,16 @@ var gSearchResultsPane = {
         let helpUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "preferences";
         let brandName = document.getElementById("bundleBrand").getString("brandShortName");
         // eslint-disable-next-line no-unsanitized/property
         document.getElementById("need-help").innerHTML =
           strings.getFormattedString("searchResults.needHelp2", [helpUrl, brandName]);
       } else {
         // Creating tooltips for all the instances found
         this.listSearchTooltips.forEach((anchorNode) => this.createSearchTooltip(anchorNode, this.query));
-
-        // Implant search telemetry probe after user stops typing for a while
-        if (this.query.length >= 2) {
-          this.telemetryTimer = setTimeout(() => {
-            Services.telemetry.keyedScalarAdd("preferences.search_query", this.query, 1);
-          }, 1000);
-        }
       }
     } else {
       document.getElementById("sorry-message").textContent = "";
       // Going back to General when cleared
       gotoPref("paneGeneral");
     }
   },
 
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -393,31 +393,16 @@ preferences:
       Set to true if user.js exists and was read.
     expires: "62"
     kind: boolean
     notification_emails:
       - bsmedberg@mozilla.com
     release_channel_collection: opt-out
     record_in_processes:
       - main
-  search_query:
-    bug_numbers:
-        - 1359306
-      description: >-
-        Each key is a search query string when user performs a search action within
-        about:preferences, and each value is the number of times that key is recorded.
-        The telemetry data will be recorded if there is a successful search result highlighted.
-      expires: "62"
-      kind: uint
-      keyed: true
-      notification_emails:
-        - chsiang@mozilla.com
-      release_channel_collection: opt-in
-      record_in_processes:
-        - main
 
 # The following section contains WebRTC nICEr scalars
 # For more info on ICE, see https://tools.ietf.org/html/rfc5245
 # For more info on STUN, see https://tools.ietf.org/html/rfc5389
 # For more info on TURN, see https://tools.ietf.org/html/rfc5766
 webrtc.nicer:
   stun_retransmits:
     bug_numbers: