Bug 1544939 - Remove BROWSER_SHIM_USAGE_BLOCKED probe r=jmathies
authorWilliam Lachance <wlachance@mozilla.com>
Thu, 26 Mar 2020 18:52:12 +0000
changeset 520624 59814e3789c1f482cf7ff0a694a58aa89b93230c
parent 520623 380eb92fd801cf72d4caa01a2761bc7e4c1f9d5f
child 520625 2511ace99c5ee25e81c48749173b34b31eb2dfce
push id37254
push usernerli@mozilla.com
push dateFri, 27 Mar 2020 04:48:07 +0000
treeherdermozilla-central@2d758b42bd73 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmathies
bugs1544939
milestone76.0a1
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
Bug 1544939 - Remove BROWSER_SHIM_USAGE_BLOCKED probe r=jmathies Differential Revision: https://phabricator.services.mozilla.com/D67538
js/ipc/JavaScriptParent.cpp
toolkit/components/telemetry/Histograms.json
toolkit/components/telemetry/histogram-allowlists.json
--- a/js/ipc/JavaScriptParent.cpp
+++ b/js/ipc/JavaScriptParent.cpp
@@ -68,17 +68,16 @@ bool JavaScriptParent::allowMessage(JSCo
   nsIGlobalObject* global = dom::GetIncumbentGlobal();
   JS::Rooted<JSObject*> jsGlobal(
       cx, global ? global->GetGlobalJSObject() : nullptr);
   if (jsGlobal) {
     JSAutoRealm ar(cx, jsGlobal);
 
     if (!xpc::CompartmentPrivate::Get(jsGlobal)->allowCPOWs &&
         ForbidUnsafeBrowserCPOWs()) {
-      Telemetry::Accumulate(Telemetry::BROWSER_SHIM_USAGE_BLOCKED, 1);
       JS_ReportErrorASCII(cx, "unsafe CPOW usage forbidden");
       return false;
     }
   }
 
   static bool disableUnsafeCPOWWarnings =
       PR_GetEnv("DISABLE_UNSAFE_CPOW_WARNINGS");
   if (!disableUnsafeCPOWWarnings) {
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -83,26 +83,16 @@
     "products": ["firefox", "fennec", "geckoview"],
     "expires_in_version": "never",
     "kind": "count",
     "keyed": true,
     "description": "Counts the number of times a given add-on used CPOWs when it was marked as e10s compatible.",
     "bug_numbers": [1214824],
     "alert_emails": ["wmccloskey@mozilla.com"]
   },
-  "BROWSER_SHIM_USAGE_BLOCKED": {
-    "record_in_processes": ["main", "content"],
-    "products": ["firefox", "fennec", "geckoview"],
-    "expires_in_version": "never",
-    "kind": "count",
-    "description": "Counts the number of times a CPOW shim was blocked from being created by browser code.",
-    "releaseChannelCollection": "opt-out",
-    "bug_numbers": [1245901],
-    "alert_emails": ["benjamin@smedbergs.us"]
-  },
   "APPLICATION_REPUTATION_BINARY_TYPE": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec", "geckoview"],
     "alert_emails": ["dlee@mozilla.com", "safebrowsing-telemetry@mozilla.org"],
     "bug_numbers": [156404],
     "expires_in_version": "never",
     "releaseChannelCollection": "opt-out",
     "kind": "categorical",
--- a/toolkit/components/telemetry/histogram-allowlists.json
+++ b/toolkit/components/telemetry/histogram-allowlists.json
@@ -1160,17 +1160,16 @@
     "GEOLOCATION_WIN8_SOURCE_IS_MLS"
   ],
   "kind": [
     "A11Y_IATABLE_USAGE_FLAG",
     "A11Y_INSTANTIATED_FLAG",
     "A11Y_ISIMPLEDOM_USAGE_FLAG",
     "ADDON_FORBIDDEN_CPOW_USAGE",
     "AUTO_REJECTED_TRANSLATION_OFFERS",
-    "BROWSER_SHIM_USAGE_BLOCKED",
     "CANVAS_WEBGL_ACCL_FAILURE_ID",
     "CANVAS_WEBGL_FAILURE_ID",
     "CHANGES_OF_TARGET_LANGUAGE",
     "COMPONENTS_SHIM_ACCESSED_BY_CONTENT",
     "CONTENT_DOCUMENTS_DESTROYED",
     "CSP_DOCUMENTS_COUNT",
     "CSP_UNSAFE_EVAL_DOCUMENTS_COUNT",
     "CSP_UNSAFE_INLINE_DOCUMENTS_COUNT",