From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:43:14 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 toolkit/components/glean/api/src/common_test.rs  | 2 +-
 toolkit/components/glean/api/src/private/ping.rs | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'toolkit/components/glean/api/src')

diff --git a/toolkit/components/glean/api/src/common_test.rs b/toolkit/components/glean/api/src/common_test.rs
index 46062736f2..1e02bfccf4 100644
--- a/toolkit/components/glean/api/src/common_test.rs
+++ b/toolkit/components/glean/api/src/common_test.rs
@@ -43,7 +43,7 @@ fn setup_glean(tempdir: Option<tempfile::TempDir>) -> tempfile::TempDir {
         rate_limit: None,
         enable_event_timestamps: false,
         experimentation_id: None,
-        enable_internal_pings: true
+        enable_internal_pings: true,
     };
 
     let client_info = glean::ClientInfoMetrics {
diff --git a/toolkit/components/glean/api/src/private/ping.rs b/toolkit/components/glean/api/src/private/ping.rs
index 7e03c1ff00..5defa9b5c6 100644
--- a/toolkit/components/glean/api/src/private/ping.rs
+++ b/toolkit/components/glean/api/src/private/ping.rs
@@ -31,6 +31,8 @@ impl Ping {
         send_if_empty: bool,
         precise_timestamps: bool,
         include_info_sections: bool,
+        enabled: bool,
+        schedules_pings: Vec<String>,
         reason_codes: Vec<String>,
     ) -> Self {
         if need_ipc() {
@@ -42,6 +44,8 @@ impl Ping {
                 send_if_empty,
                 precise_timestamps,
                 include_info_sections,
+                enabled,
+                schedules_pings,
                 reason_codes,
             ))
         }
@@ -105,7 +109,7 @@ mod test {
 
     // Smoke test for what should be the generated code.
     static PROTOTYPE_PING: Lazy<Ping> =
-        Lazy::new(|| Ping::new("prototype", false, true, true, true, vec![]));
+        Lazy::new(|| Ping::new("prototype", false, true, true, true, true, vec![], vec![]));
 
     #[test]
     fn smoke_test_custom_ping() {
-- 
cgit v1.2.3