Use the same test ping names consistently throughout all tests

glean-core/android/src/test/java/mozilla/telemetry/glean/GleanTest.kt

@@ -535,7 +535,7 @@ class GleanTest {
                 category = "telemetry",
                 lifetime = Lifetime.PING,
                 name = "string_metric",
-                sendInPings = listOf("default"),
+                sendInPings = listOf("store1"),
             ),
         )
 

glean-core/python/tests/data/core.yaml

@@ -20,7 +20,7 @@ telemetry:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
 core_ping:
@@ -37,7 +37,7 @@ core_ping:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   created:
@@ -52,7 +52,7 @@ core_ping:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   sessions:
@@ -66,7 +66,7 @@ core_ping:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   durations:
@@ -82,7 +82,7 @@ core_ping:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   searches:
@@ -105,7 +105,7 @@ core_ping:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   flash_usage:
@@ -120,7 +120,7 @@ core_ping:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   default_browser:
@@ -134,7 +134,7 @@ core_ping:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
 environment:
@@ -149,7 +149,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   os:
@@ -163,7 +163,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   os_version:
@@ -177,7 +177,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   device:
@@ -194,7 +194,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   arch:
@@ -221,7 +221,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   default_search:
@@ -236,7 +236,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   display_version:
@@ -251,7 +251,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   distribution_id:
@@ -266,7 +266,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   campaign_id:
@@ -281,7 +281,7 @@ environment:
     notification_emails:
       - CHANGE-ME@example.com
     send_in_pings:
-      - core
+      - store1
     expires: 2100-01-01
 
   event_example:

glean-core/rlb/src/private/event.rs

@@ -96,7 +96,7 @@ mod test {
         let metric: EventMetric<traits::NoExtraKeys> = EventMetric::new(CommonMetricData {
             name: "event".into(),
             category: "test".into(),
-            send_in_pings: vec!["test1".into()],
+            send_in_pings: vec!["store1".into()],
             ..Default::default()
         });
 
@@ -133,7 +133,7 @@ mod test {
         let metric: EventMetric<SomeExtra> = EventMetric::new(CommonMetricData {
             name: "event".into(),
             category: "test".into(),
-            send_in_pings: vec!["test1".into()],
+            send_in_pings: vec!["store1".into()],
             ..Default::default()
         });
 
@@ -188,7 +188,7 @@ mod test {
             CommonMetricData {
                 name: "event".into(),
                 category: "test".into(),
-                send_in_pings: vec!["test1".into()],
+                send_in_pings: vec!["store1".into()],
                 ..Default::default()
             },
             vec!["key1".into(), "key2".into()],

glean-core/rlb/src/private/object.rs

@@ -110,7 +110,7 @@ mod test {
         let metric: ObjectMetric<SimpleArray> = ObjectMetric::new(CommonMetricData {
             name: "object".into(),
             category: "test".into(),
-            send_in_pings: vec!["test1".into()],
+            send_in_pings: vec!["store1".into()],
             ..Default::default()
         });
 
@@ -144,7 +144,7 @@ mod test {
         let metric: ObjectMetric<BalloonsObject> = ObjectMetric::new(CommonMetricData {
             name: "object".into(),
             category: "test".into(),
-            send_in_pings: vec!["test1".into()],
+            send_in_pings: vec!["store1".into()],
             ..Default::default()
         });
 
@@ -178,7 +178,7 @@ mod test {
         let metric: ObjectMetric<SimpleArray> = ObjectMetric::new(CommonMetricData {
             name: "object".into(),
             category: "test".into(),
-            send_in_pings: vec!["test1".into()],
+            send_in_pings: vec!["store1".into()],
             ..Default::default()
         });
 
@@ -225,7 +225,7 @@ mod test {
         let metric: ObjectMetric<StackTrace> = ObjectMetric::new(CommonMetricData {
             name: "object".into(),
             category: "test".into(),
-            send_in_pings: vec!["test1".into()],
+            send_in_pings: vec!["store1".into()],
             ..Default::default()
         });
 

glean-core/rlb/src/test.rs

@@ -629,7 +629,7 @@ fn basic_metrics_should_be_cleared_when_disabling_uploading() {
     let metric = private::StringMetric::new(CommonMetricData {
         name: "string_metric".into(),
         category: "telemetry".into(),
-        send_in_pings: vec!["default".into()],
+        send_in_pings: vec!["store1".into()],
         lifetime: Lifetime::Ping,
         disabled: false,
         ..Default::default()

glean-core/rlb/tests/custom_distribution_buffered.rs

@@ -24,7 +24,7 @@ mod metrics {
             CommonMetricData {
                 name: "measure".into(),
                 category: "sample".into(),
-                send_in_pings: vec!["validation".into()],
+                send_in_pings: vec!["store1".into()],
                 lifetime: Lifetime::Ping,
                 disabled: false,
                 ..Default::default()

glean-core/rlb/tests/memory_distribution_buffered.rs

@@ -24,7 +24,7 @@ mod metrics {
             CommonMetricData {
                 name: "measure".into(),
                 category: "sample".into(),
-                send_in_pings: vec!["validation".into()],
+                send_in_pings: vec!["store1".into()],
                 lifetime: Lifetime::Ping,
                 disabled: false,
                 ..Default::default()

glean-core/rlb/tests/timing_distribution_buffered.rs

@@ -25,7 +25,7 @@ mod metrics {
             CommonMetricData {
                 name: "boo".into(),
                 category: "sample".into(),
-                send_in_pings: vec!["validation".into()],
+                send_in_pings: vec!["store1".into()],
                 lifetime: Lifetime::Ping,
                 disabled: false,
                 ..Default::default()

glean-core/rlb/tests/timing_distribution_single_sample.rs

@@ -26,7 +26,7 @@ mod metrics {
             CommonMetricData {
                 name: "boo".into(),
                 category: "sample".into(),
-                send_in_pings: vec!["validation".into()],
+                send_in_pings: vec!["store1".into()],
                 lifetime: Lifetime::Ping,
                 disabled: false,
                 ..Default::default()

glean-core/src/event_database/mod.rs

@@ -758,7 +758,7 @@ mod test {
         let (mut glean, dir) = new_glean(None);
         let db = EventDatabase::new(dir.path()).unwrap();
 
-        let test_storage = "test-storage";
+        let test_storage = "store1";
         let test_category = "category";
         let test_name = "name";
         let test_timestamp = 2;

glean-core/src/ping/mod.rs

@@ -426,15 +426,15 @@ mod test {
         let (mut glean, _t) = new_glean(None);
         let ping_maker = PingMaker::new();
 
-        assert_eq!(0, ping_maker.get_ping_seq(&glean, "custom"));
-        assert_eq!(1, ping_maker.get_ping_seq(&glean, "custom"));
+        assert_eq!(0, ping_maker.get_ping_seq(&glean, "store1"));
+        assert_eq!(1, ping_maker.get_ping_seq(&glean, "store1"));
 
         glean.set_upload_enabled(false);
-        assert_eq!(0, ping_maker.get_ping_seq(&glean, "custom"));
-        assert_eq!(0, ping_maker.get_ping_seq(&glean, "custom"));
+        assert_eq!(0, ping_maker.get_ping_seq(&glean, "store1"));
+        assert_eq!(0, ping_maker.get_ping_seq(&glean, "store1"));
 
         glean.set_upload_enabled(true);
-        assert_eq!(0, ping_maker.get_ping_seq(&glean, "custom"));
-        assert_eq!(1, ping_maker.get_ping_seq(&glean, "custom"));
+        assert_eq!(0, ping_maker.get_ping_seq(&glean, "store1"));
+        assert_eq!(1, ping_maker.get_ping_seq(&glean, "store1"));
     }
 }

glean-core/tests/event.rs

@@ -396,7 +396,7 @@ fn snapshot_sorts_the_timestamps() {
 fn ensure_custom_ping_events_dont_overflow() {
     let (glean, _dir) = new_glean(None);
 
-    let store_name = "store-name";
+    let store_name = "store1";
     let event_meta = CommonMetricData {
         name: "name".into(),
         category: "category".into(),
@@ -441,7 +441,7 @@ fn ensure_custom_ping_events_dont_overflow() {
 fn ensure_custom_ping_events_from_multiple_runs_work() {
     let (mut tempdir, _) = tempdir();
 
-    let store_name = "store-name";
+    let store_name = "store1";
     let event = EventMetric::new(
         CommonMetricData {
             name: "name".into(),
@@ -570,7 +570,7 @@ fn with_event_timestamps() {
     };
     let glean = Glean::new(cfg).unwrap();
 
-    let store_name = "store-name";
+    let store_name = "store1";
     let event = EventMetric::new(
         CommonMetricData {
             name: "name".into(),

glean-core/tests/rate.rs

@@ -16,7 +16,7 @@ fn rate_smoke() {
     let metric: RateMetric = RateMetric::new(CommonMetricData {
         name: "rate".into(),
         category: "test".into(),
-        send_in_pings: vec!["test1".into()],
+        send_in_pings: vec!["store1".into()],
         ..Default::default()
     });
 
@@ -52,7 +52,7 @@ fn numerator_smoke() {
     let metric: NumeratorMetric = NumeratorMetric::new(CommonMetricData {
         name: "rate".into(),
         category: "test".into(),
-        send_in_pings: vec!["test1".into()],
+        send_in_pings: vec!["store1".into()],
         ..Default::default()
     });
 
@@ -89,14 +89,14 @@ fn denominator_smoke() {
     let meta1 = CommonMetricData {
         name: "rate1".into(),
         category: "test".into(),
-        send_in_pings: vec!["test1".into()],
+        send_in_pings: vec!["store1".into()],
         ..Default::default()
     };
 
     let meta2 = CommonMetricData {
         name: "rate2".into(),
         category: "test".into(),
-        send_in_pings: vec!["test1".into()],
+        send_in_pings: vec!["store1".into()],
         ..Default::default()
     };
 
@@ -105,7 +105,7 @@ fn denominator_smoke() {
         CommonMetricData {
             name: "counter".into(),
             category: "test".into(),
-            send_in_pings: vec!["test1".into()],
+            send_in_pings: vec!["store1".into()],
             ..Default::default()
         },
         vec![meta1.clone(), meta2.clone()],