Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 32 insertions, 8 deletions

diff --git a/toolkit/components/telemetry/Scalars.yaml b/toolkit/components/telemetry/Scalars.yaml
index 66a8b787e7..fee6594b81 100644
--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -155,6 +155,24 @@ a11y:
     record_in_processes:
       - 'main'
 
+browser.backup:
+  prof_d_disk_space:
+    bug_numbers:
+      - 1884407
+    description: >
+      The total disk space available on the storage device that the profile
+      directory is stored on. To reduce fingerprintability, we round to the
+      nearest 10 megabytes and return the result in kilobytes.
+    expires: never
+    kind: uint
+    notification_emails:
+      - mconley@mozilla.com
+    release_channel_collection: opt-out
+    products:
+      - 'firefox'
+    record_in_processes:
+      - 'main'
+
 # The following section contains the browser engagement scalars.
 browser.engagement:
   max_concurrent_tab_count:
@@ -1444,13 +1462,14 @@ extensions.apis.dnr:
     bug_numbers:
       - 1803363
       - 1850890
+      - 1881406
     description: >
       Counters for startup cache data hits or misses on initializating
       DNR rules for extensions loaded on application startup.
       The expected keys are 'hit' and 'miss'.
       This probe is mirrored from a Glean metric with the same name.
     keyed: true
-    expires: '126'
+    expires: '138'
     kind: uint
     notification_emails:
       - addons-dev-internal@mozilla.com
@@ -1462,9 +1481,10 @@ extensions.apis.dnr:
     bug_numbers:
       - 1803363
       - 1850890
+      - 1881406
     description: >
       Max amount of DNR rules being evaluated.
-    expires: '126'
+    expires: '138'
     kind: uint
     notification_emails:
       - addons-dev-internal@mozilla.com
@@ -4028,7 +4048,7 @@ apz:
       - 1836870
     description: >
       Count of overshoot events, where the user reverses scrollwheel direction soon after the last scrollwheel input.
-    expires: "126"
+    expires: "134"
     kind: uint
     notification_emails:
       - botond@mozilla.com
@@ -5014,7 +5034,7 @@ update:
       to be moved from the downloading update directory to the ready update
       directory. This probe counts the results that we get when attempting to
       perform this file move. Valid values for the keys for this probe are
-      stored in the MOVE_RESULT_* values in UpdateTelemetry.jsm.
+      stored in the MOVE_RESULT_* values in UpdateTelemetry.sys.mjs.
     expires: never
     kind: uint
     keyed: true
@@ -5894,10 +5914,11 @@ browser.searchinit:
       - 1789438
       - 1811158
       - 1846899
+      - 1881408
     description: >
       Records the number of secure (i.e., using https) OpenSearch search
       engines a given user has installed
-    expires: "126"
+    expires: "133"
     keyed: false
     kind: uint
     notification_emails:
@@ -5913,10 +5934,11 @@ browser.searchinit:
       - 1789438
       - 1811158
       - 1846899
+      - 1881408
     description: >
       Records the number of insecure (i.e., using http) OpenSearch search
       engines a given user has installed
-    expires: "126"
+    expires: "133"
     keyed: false
     kind: uint
     notification_emails:
@@ -5932,10 +5954,11 @@ browser.searchinit:
       - 1789438
       - 1811158
       - 1846899
+      - 1881408
     description: >
       Records the number of OpenSearch search engines with secure updates
       enabled (i.e., using https) a given user has installed
-    expires: "126"
+    expires: "133"
     keyed: false
     kind: uint
     notification_emails:
@@ -5951,10 +5974,11 @@ browser.searchinit:
       - 1789438
       - 1811158
       - 1846899
+      - 1881408
     description: >
       Records the number of OpenSearch search engines with insecure updates
       enabled (i.e., using http) a given user has installed
-    expires: "126"
+    expires: "133"
     keyed: false
     kind: uint
     notification_emails: