Bug 1391633: Remove the JS_AOT_USAGE telemetry value; r=luke

The use counters JS_ASMJS and JS_WASM will measure usage in a more interesting
fashion.

MozReview-Commit-ID: BhZTWKN1oTQ

--HG--
extra : rebase_source : 5ffc84b34418a2422afd6384f8ebbe67b94c6717

js/src/jsfriendapi.h

@@ -157,7 +157,6 @@ enum {
     JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_CONTENT,
     JS_TELEMETRY_DEPRECATED_LANGUAGE_EXTENSIONS_IN_ADDONS,
     JS_TELEMETRY_ADDON_EXCEPTIONS,
-    JS_TELEMETRY_AOT_USAGE,
     JS_TELEMETRY_PRIVILEGED_PARSER_COMPILE_LAZY_AFTER_MS,
     JS_TELEMETRY_WEB_PARSER_COMPILE_LAZY_AFTER_MS,
     JS_TELEMETRY_END

js/src/wasm/WasmBinaryConstants.h

@@ -478,15 +478,6 @@ enum class NameType
     Local                                = 2
 };
 
-// Telemetry sample values for the JS_AOT_USAGE key, indicating whether asm.js
-// or WebAssembly is used.
-
-enum class Telemetry
-{
-    ASMJS = 0,
-    WASM = 1
-};
-
 // These limits are agreed upon with other engines for consistency.
 
 static const unsigned MaxTypes               =  1000000;

js/src/wasm/WasmModule.cpp

@@ -1220,9 +1220,6 @@ Module::instantiate(JSContext* cx,
             return false;
     }
 
-    uint32_t mode = uint32_t(metadata().isAsmJS() ? Telemetry::ASMJS : Telemetry::WASM);
-    cx->runtime()->addTelemetry(JS_TELEMETRY_AOT_USAGE, mode);
-
     JSUseCounter useCounter = metadata().isAsmJS() ? JSUseCounter::ASMJS : JSUseCounter::WASM;
     cx->runtime()->setUseCounter(instance, useCounter);
 

js/xpconnect/src/XPCJSRuntime.cpp

@@ -2669,9 +2669,6 @@ AccumulateTelemetryCallback(int id, uint32_t sample, const char* key)
       case JS_TELEMETRY_ADDON_EXCEPTIONS:
         Telemetry::Accumulate(Telemetry::JS_TELEMETRY_ADDON_EXCEPTIONS, nsDependentCString(key), sample);
         break;
-      case JS_TELEMETRY_AOT_USAGE:
-        Telemetry::Accumulate(Telemetry::JS_AOT_USAGE, sample);
-        break;
       case JS_TELEMETRY_PRIVILEGED_PARSER_COMPILE_LAZY_AFTER_MS:
         Telemetry::Accumulate(Telemetry::JS_PRIVILEGED_PARSER_COMPILE_LAZY_AFTER_MS, sample);
         break;

toolkit/components/telemetry/Histograms.json

@@ -13017,15 +13017,6 @@
     "n_values": 6,
     "description": "Number of revoke actions on permissions in the control center, keyed by permission id. Values represent the permission type that was revoked. (0=unknown, 1=permanently allowed, 2=permanently blocked, 3=temporarily allowed, 4=temporarily blocked)"
   },
-  "JS_AOT_USAGE": {
-    "record_in_processes": ["main", "content"],
-    "alert_emails": ["luke@mozilla.com", "bbouvier@mozilla.com"],
-    "bug_numbers": [1288778],
-    "expires_in_version": "60",
-    "kind": "enumerated",
-    "n_values": 4,
-    "description": "Counts the number of asm.js vs WebAssembly modules instanciations, at the time modules are getting instanciated."
-  },
   "TIME_TO_FIRST_CLICK_MS": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["hkirschner@mozilla.com"],