Bug 1386658 - Update follow-on search add-on to 0.9.2 - additional domains and logging fix. r=past, a=gchang
authorMark Banner <standard8@mozilla.com>
Wed, 02 Aug 2017 15:42:48 +0100
changeset 423810 e32763a1963116a83743ebff941f7bcf4ab582b5
parent 423809 d41a551ff96e556f2cf8e15358e030d24d1d73fa
child 423811 c0e5a9ba27f69be8bc2ebedc9770a8415eccd2df
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)
reviewerspast, gchang
bugs1386658
milestone56.0
Bug 1386658 - Update follow-on search add-on to 0.9.2 - additional domains and logging fix. r=past, a=gchang
browser/extensions/followonsearch/bootstrap.js
browser/extensions/followonsearch/content/followonsearch-fs.js
browser/extensions/followonsearch/install.rdf
--- a/browser/extensions/followonsearch/bootstrap.js
+++ b/browser/extensions/followonsearch/bootstrap.js
@@ -42,33 +42,33 @@ function log(message) {
 
 /**
  * Handles receiving a message from the content process to save telemetry.
  *
  * @param {Object} message The message received.
  */
 function handleSaveTelemetryMsg(message) {
   if (message.name != kSaveTelemetryMsg) {
-    throw new Error(`Unexpected message received: ${kSaveTelemetryMsg}`);
+    throw new Error(`Unexpected message received: ${message.name}`);
   }
 
   let info = message.data;
 
   if (!validSearchTypes.includes(info.type)) {
     throw new Error("Unexpected type!");
   }
 
   log(info);
 
   let histogram = Services.telemetry.getKeyedHistogramById("SEARCH_COUNTS");
   histogram.add(`${info.sap}.${info.type}:unknown:${info.code}`);
 }
 
 /**
- * Activites recording of telemetry if it isn't already activated.
+ * Activates recording of telemetry if it isn't already activated.
  */
 function activateTelemetry() {
   if (gTelemetryActivated) {
     return;
   }
 
   gTelemetryActivated = true;
 
--- a/browser/extensions/followonsearch/content/followonsearch-fs.js
+++ b/browser/extensions/followonsearch/content/followonsearch-fs.js
@@ -30,17 +30,17 @@ let searchDomains = [{
   "prefix": "pc",
   "reportPrefix": "form",
   "codes": ["MOZI"],
   "sap": "bing",
 }, {
   // The Yahoo domains to watch for.
   "domains": [
     "search.yahoo.com", "ca.search.yahoo.com", "hk.search.yahoo.com",
-    "tw.search.yahoo.com"
+    "tw.search.yahoo.com", "mozilla.search.yahoo.com", "us.search.yahoo.com"
   ],
   "search": "p",
   "followOnSearch": "fr2",
   "prefix": "hspart",
   "reportPrefix": "hsimp",
   "codes": ["mozilla"],
   "sap": "yahoo",
 }, {
--- a/browser/extensions/followonsearch/install.rdf
+++ b/browser/extensions/followonsearch/install.rdf
@@ -2,17 +2,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>followonsearch@mozilla.com</em:id>
     <em:name>Follow-on Search Telemetry</em:name>
-    <em:version>0.9.1</em:version>
+    <em:version>0.9.2</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>52.0</em:minVersion>
         <em:maxVersion>59.*</em:maxVersion>