Merging upstream version 127.0.

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

1 files changed, 42 insertions, 14 deletions

diff --git a/toolkit/components/cookiebanners/metrics.yaml b/toolkit/components/cookiebanners/metrics.yaml
index 98f86fd4a7..78ce343d37 100644
--- a/toolkit/components/cookiebanners/metrics.yaml
+++ b/toolkit/components/cookiebanners/metrics.yaml
@@ -75,17 +75,19 @@ cookie.banners:
       - https://bugzilla.mozilla.org/1827765
       - https://bugzilla.mozilla.org/1850874
       - https://bugzilla.mozilla.org/1861317
+      - https://bugzilla.mozilla.org/1892152
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1797073#c6
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1827765#c9
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1850874#c7
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1861317#c3
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892152#c6
     data_sensitivity:
       - interaction
     notification_emails:
       - tihuang@mozilla.com
       - pbz@mozilla.com
-    expires: 128
+    expires: 134
     labels:
       - top_hit
       - top_hit_opt_in
@@ -126,17 +128,19 @@ cookie.banners:
       - https://bugzilla.mozilla.org/1827765
       - https://bugzilla.mozilla.org/1850874
       - https://bugzilla.mozilla.org/1861317
+      - https://bugzilla.mozilla.org/1892152
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1797073#c6
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1827765#c9
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1850874#c7
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1861317#c3
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892152#c6
     data_sensitivity:
       - interaction
     notification_emails:
       - tihuang@mozilla.com
       - pbz@mozilla.com
-    expires: 128
+    expires: 134
     labels:
       - top_hit
       - top_hit_opt_in
@@ -173,15 +177,17 @@ cookie.banners:
       - https://bugzilla.mozilla.org/1827765
       - https://bugzilla.mozilla.org/1850874
       - https://bugzilla.mozilla.org/1861317
+      - https://bugzilla.mozilla.org/1892152
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1797079#c6
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1827765#c9
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1850874#c7
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1861317#c3
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892152#c6
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
     data_sensitivity:
       - interaction
     extra_keys:
@@ -202,14 +208,16 @@ cookie.banners:
       cookies.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128#c10
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     data_sensitivity:
       - interaction
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
   google_gdpr_choice_cookie:
     type: labeled_string
     description: >
@@ -289,15 +297,17 @@ cookie.banners.click:
       - https://bugzilla.mozilla.org/1827765
       - https://bugzilla.mozilla.org/1850874
       - https://bugzilla.mozilla.org/1861317
+      - https://bugzilla.mozilla.org/1892152
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1797078#c6
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1827765#c9
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1850874#c7
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1861317#c3
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892152#c6
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
     telemetry_mirror: COOKIE_BANNERS_CLICK_HANDLE_DURATION_MS
   # TODO: consider moving this out of "click". It also records cookie injection.
   result:
@@ -316,15 +326,17 @@ cookie.banners.click:
       - https://bugzilla.mozilla.org/1827765
       - https://bugzilla.mozilla.org/1850874
       - https://bugzilla.mozilla.org/1861317
+      - https://bugzilla.mozilla.org/1892152
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1797078#c6
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1827765#c9
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1850874#c7
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1861317#c3
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892152#c6
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
     labels:
       - success
       - success_cookie_injected
@@ -348,13 +360,15 @@ cookie.banners.click:
       content window.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1855495
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1855495#c3
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1871200#c4
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
   query_selector_run_count_per_window_frame:
     type: custom_distribution
     bucket_count: 20
@@ -365,13 +379,15 @@ cookie.banners.click:
       content window.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1855495
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1855495#c3
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1871200#c4
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
   query_selector_run_duration_per_window_top_level:
     type: custom_distribution
     bucket_count: 8
@@ -382,13 +398,15 @@ cookie.banners.click:
       lifetime of a top-level content window.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1855495
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1855495#c3
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1871200#c4
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
   query_selector_run_duration_per_window_frame:
     type: custom_distribution
     bucket_count: 8
@@ -399,13 +417,15 @@ cookie.banners.click:
       lifetime of a sub-frame content window.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1855495
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1855495#c3
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1871200#c4
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
 cookie.banners.cmp:
   ratio_handled_by_cmp_rule:
     type: rate
@@ -414,14 +434,16 @@ cookie.banners.cmp:
       number of cases handled, including those handled by site-specific rules.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128#c10
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     data_sensitivity:
       - interaction
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
   detected_cmp:
     type: labeled_counter
     description: >
@@ -429,14 +451,16 @@ cookie.banners.cmp:
       handling.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128#c10
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     data_sensitivity:
       - interaction
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
   result:
     type: labeled_counter
     description: >
@@ -446,14 +470,16 @@ cookie.banners.cmp:
       incremented after the content window has been destroyed.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128#c10
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     data_sensitivity:
       - interaction
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134
     labels:
       - success
       - success_dom_content_loaded
@@ -474,11 +500,13 @@ cookie.banners.cmp:
       cookieBanners.click.handle_duration.
     bugs:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154
     data_reviews:
       - https://bugzilla.mozilla.org/show_bug.cgi?id=1813128#c10
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1892154#c6
     data_sensitivity:
       - interaction
     notification_emails:
       - pbz@mozilla.com
       - tihuang@mozilla.com
-    expires: 128
+    expires: 134