Bug 1564241 - Remove the contentblocking.exceptions scalar probe since it's expired. a=permafail-fix
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 08 Jul 2019 23:29:02 +0200
changeset 481756 50fec259d5a66e44a087253fa5f9f805d32e8ef3
parent 481755 b38eb112eb036b814a1158c70d327af182f5b24a
child 481759 b782ed36b2e87f3466c4871f32649dfeb41a2ab5
push id113632
push usernbeleuzu@mozilla.com
push dateTue, 09 Jul 2019 03:54:50 +0000
treeherdermozilla-inbound@d178951a5dcb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspermafail-fix
bugs1564241
milestone70.0a1
first release with
nightly linux32
50fec259d5a6 / 70.0a1 / 20190708213342 / files
nightly linux64
50fec259d5a6 / 70.0a1 / 20190708213342 / files
nightly mac
50fec259d5a6 / 70.0a1 / 20190708213342 / files
nightly win32
50fec259d5a6 / 70.0a1 / 20190708213342 / files
nightly win64
50fec259d5a6 / 70.0a1 / 20190708213342 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1564241 - Remove the contentblocking.exceptions scalar probe since it's expired. a=permafail-fix Differential Revision: https://phabricator.services.mozilla.com//D37330
browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
browser/components/BrowserGlue.jsm
toolkit/components/telemetry/Scalars.yaml
--- a/browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
+++ b/browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
@@ -36,20 +36,16 @@ add_task(async function setup() {
   let TrackingProtection = gBrowser.ownerGlobal.TrackingProtection;
   ok(TrackingProtection, "TP is attached to the browser window");
   ok(!TrackingProtection.enabled, "TP is not enabled");
 
   let enabledCounts = Services.telemetry
     .getHistogramById("TRACKING_PROTECTION_ENABLED")
     .snapshot().values;
   is(enabledCounts[0], 1, "TP was not enabled on start up");
-
-  let scalars = Services.telemetry.getSnapshotForScalars("main", false).parent;
-
-  is(scalars["contentblocking.exceptions"], 0, "no CB exceptions at startup");
 });
 
 add_task(async function testShieldHistogram() {
   Services.prefs.setBoolPref(PREF, true);
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
 
   // Reset these to make counting easier
   getShieldHistogram().clear();
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -1731,24 +1731,16 @@ BrowserGlue.prototype = {
       .getHistogramById("TRACKING_PROTECTION_PBM_DISABLED")
       .add(!tpPBDisabled);
 
     let cookieBehavior = Services.prefs.getIntPref(
       "network.cookie.cookieBehavior"
     );
     Services.telemetry.getHistogramById("COOKIE_BEHAVIOR").add(cookieBehavior);
 
-    let exceptions = 0;
-    for (let permission of Services.perms.enumerator) {
-      if (permission.type == "trackingprotection") {
-        exceptions++;
-      }
-    }
-    Services.telemetry.scalarSet("contentblocking.exceptions", exceptions);
-
     let fpEnabled = Services.prefs.getBoolPref(
       "privacy.trackingprotection.fingerprinting.enabled"
     );
     let cmEnabled = Services.prefs.getBoolPref(
       "privacy.trackingprotection.cryptomining.enabled"
     );
     let categoryPref;
     switch (
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -483,30 +483,16 @@ security:
     notification_emails:
       - seceng-telemetry@mozilla.com
       - dkeeler@mozilla.com
     release_channel_collection: opt-out
     record_in_processes:
       - main
 
 contentblocking:
-  exceptions:
-    bug_numbers:
-      - 1484251
-    description: >
-      How many tracking protection/content blocking exceptions a user has at startup.
-    expires: "70"
-    kind: uint
-    notification_emails:
-      - jhofmann@mozilla.com
-      - pdol@mozilla.com
-      - seceng-telemetry@mozilla.com
-    release_channel_collection: opt-out
-    record_in_processes:
-      - main
   cryptomining_blocking_enabled:
     bug_numbers:
       - 1522919
     description: >
       True if cryptominer blocking is enabled globally at startup.
     expires: never
     kind: boolean
     notification_emails: