Bug 1730037 - Update expiration of blocklist probes r=rpl

And remove obsolete blocklist.lastModified_rs_plugins scalar,
which became obsolete with the removal of NPAPI plugins in
https://hg.mozilla.org/mozilla-central/rev/6e00aba7

Differential Revision: https://phabricator.services.mozilla.com/D126548

toolkit/components/telemetry/Events.yaml

@@ -417,11 +417,11 @@ blocklist:
         This field is documented in more detail in the definition of the blocklist.mlbf_source scalar.
         Possible values are "dump_match", "cache_match", "remote_match", "dump_fallback", "cache_fallback", "unknown".
     notification_emails: ["addons-dev-internal@mozilla.com", "rwu@mozilla.com"]
-    expiry_version: "95"
+    expiry_version: "102"
     products:
       - "firefox"
     record_in_processes: ["main"]
-    bug_numbers: [1662857]
+    bug_numbers: [1662857, 1730037]
     release_channel_collection: opt-out
 
 downloads:

toolkit/components/telemetry/Scalars.yaml

@@ -5953,11 +5953,12 @@ blocklist:
       - 1607744
       - 1649960
       - 1689274
+      - 1730037
     description: >
       Keep track of the last time the "addons" remotesetting blocklist has been successfully
       updated (as a datetime string in UTC format), set to "Missing Date" when the timestamp
       couldn't be retrieved.
-    expires: "95"
+    expires: "102"
     kind: string
     release_channel_collection: opt-out
     notification_emails:
@@ -5977,11 +5978,12 @@ blocklist:
       - 1633466
       - 1649960
       - 1689274
+      - 1730037
     description: >
       Keep track of the last time the "addons-bloomfilters" remotesetting blocklist has been successfully
       updated (as a datetime string in UTC format), set to "Missing Date" when the timestamp
       couldn't be retrieved.
-    expires: "95"
+    expires: "102"
     kind: string
     release_channel_collection: opt-out
     notification_emails:
@@ -5994,39 +5996,16 @@ blocklist:
     record_in_processes:
       - main
 
-  lastModified_rs_plugins:
-    bug_numbers:
-      - 1572711
-      - 1607744
-      - 1649960
-      - 1689274
-    description: >
-      Keep track of the last time the "plugins" remotesetting blocklist has been successfully
-      updated (as a datetime string in UTC format), set to "Missing Date" when the timestamp
-      couldn't be retrieved.
-    expires: "95"
-    kind: string
-    release_channel_collection: opt-out
-    notification_emails:
-      - addons-dev-internal@mozilla.com
-      - lgreco@mozilla.com
-      - awagner@mozilla.com
-      - rwu@mozilla.com
-    products:
-      - 'firefox'
-      - 'thunderbird'
-    record_in_processes:
-      - main
-
   mlbf_enabled:
     bug_numbers:
       - 1633466
       - 1649960
       - 1689274
+      - 1730037
     description: >
       Keep track of whether the addons blocklist engine uses bloom filters (blocklist v3).
       If false, the blocklist v2 is used instead.
-    expires: "95"
+    expires: "102"
     kind: boolean
     release_channel_collection: opt-out
     notification_emails:
@@ -6042,6 +6021,7 @@ blocklist:
   mlbf_source:
     bug_numbers:
       - 1662857
+      - 1730037
     description: >
       The source of the RemoteSettings attachment that holds the bloom filter.
       Possible values are "dump_match", "cache_match", "remote_match", "dump_fallback", "cache_fallback", "unknown".
@@ -6054,7 +6034,7 @@ blocklist:
       (e.g. because the latest version cannot be downloaded).
       "unknown" means that the bloomfilter cannot be loaded at all. This can happen if the blocklist is disabled
       via preferences or enterprise policies.
-    expires: "95"
+    expires: "102"
     kind: string
     release_channel_collection: opt-out
     notification_emails:
@@ -6070,12 +6050,13 @@ blocklist:
       - 1633466
       - 1649960
       - 1689274
+      - 1730037
     description: >
       Keep track of the generation time of the addon blocklist's bloom filter. This marks the
       point in time until which signed add-ons are recognized by the selected bloom filter from the
       addons-bloomfilters collection.
       The value is a datetime string in UTC format, or  "Missing Date" when unavailable.
-    expires: "95"
+    expires: "102"
     kind: string
     release_channel_collection: opt-out
     notification_emails:
@@ -6093,11 +6074,12 @@ blocklist:
       - 1633466
       - 1649960
       - 1689274
+      - 1730037
     description: >
       Keep track of the timestamp of the oldest stash of the addons blocklist.
       Only meaningful when mlbf_enabled is true.
       The value is a datetime string in UTC format, or "Missing Date" when unavailable.
-    expires: "95"
+    expires: "102"
     kind: string
     release_channel_collection: opt-out
     notification_emails:
@@ -6115,11 +6097,12 @@ blocklist:
       - 1633466
       - 1649960
       - 1689274
+      - 1730037
     description: >
       Keep track of the timestamp of the most recent stash of the addons blocklist.
       Only meaningful when mlbf_enabled is true.
       The value is a datetime string in UTC format, or "Missing Date" when unavailable.
-    expires: "95"
+    expires: "102"
     kind: string
     release_channel_collection: opt-out
     notification_emails:

toolkit/mozapps/extensions/Blocklist.jsm

@@ -168,8 +168,7 @@ const BlocklistTelemetry = {
    * to retrieve a valid timestamp).
    *
    * @param {string} blocklistType
-   *        The blocklist type that has been updated (one of "addons" or "plugins",
-   *        or "addons_mlbf";
+   *        The blocklist type that has been updated ("addons" or "addons_mlbf");
    *        the "gfx" blocklist is not covered by this telemetry).
    * @param {RemoteSettingsClient} remoteSettingsClient
    *        The RemoteSettings client to retrieve the lastModified timestamp from.