Define server_knobs_config metric in internal_metrics.rs

Author: travis79

glean-core/metrics.yaml

@@ -425,13 +425,23 @@ glean.internal.metrics:
           description: |
             Map of metric identifiers (category.name) to boolean values
             indicating whether the metric is enabled.
+          properties:
+            key:
+              type: string
+            value:
+              type: boolean
         pings_enabled:
           type: object
           description: |
             Map of ping names to boolean values indicating whether
             the ping is enabled.
+          properties:
+            key:
+              type: string
+            value:
+              type: boolean
         event_threshold:
-          type: integer
+          type: number
           description: |
             Optional threshold for event buffering before an events
             ping is collected and submitted. Can be null if not set.

glean-core/src/core/mod.rs

@@ -1113,17 +1113,6 @@ impl Glean {
             .get_value(self, None)
     }
 
-    /// Returns the ObjectMetric used to store Server Knobs configuration.
-    pub(crate) fn server_knobs_metric() -> metrics::ObjectMetric {
-        metrics::ObjectMetric::new(CommonMetricData {
-            name: "server_knobs_config".into(),
-            category: "glean.internal".into(),
-            send_in_pings: vec![INTERNAL_STORAGE.into()],
-            lifetime: Lifetime::Application,
-            ..Default::default()
-        })
-    }
-
     /// Set configuration to override the default state, typically initiated from a
     /// remote_settings experiment or rollout
     ///
@@ -1153,8 +1142,9 @@ impl Glean {
         drop(remote_settings_config); // Release lock before storage operation
 
         // Store the configuration using the server knobs ObjectMetric
-        let server_knobs_metric = Self::server_knobs_metric();
-        server_knobs_metric.set_sync(self, serde_json::to_value(&config_clone).unwrap());
+        self.additional_metrics
+            .server_knobs_config
+            .set_sync(self, serde_json::to_value(&config_clone).unwrap());
 
         // Update remote_settings epoch
         self.remote_settings_epoch.fetch_add(1, Ordering::SeqCst);

glean-core/src/internal_metrics.rs

@@ -44,6 +44,9 @@ pub struct AdditionalMetrics {
     /// The number of times we had to clamp an event timestamp
     /// for exceeding the range of a signed 64-bit integer (9223372036854775807).
     pub event_timestamp_clamped: CounterMetric,
+
+    /// Server knobs configuration received from remote settings.
+    pub server_knobs_config: ObjectMetric,
 }
 
 impl CoreMetrics {
@@ -211,6 +214,15 @@ impl AdditionalMetrics {
                 disabled: false,
                 dynamic_label: None,
             }),
+
+            server_knobs_config: ObjectMetric::new(CommonMetricData {
+                name: "server_knobs_config".into(),
+                category: "glean.internal.metrics".into(),
+                send_in_pings: vec!["glean_internal_info".into()],
+                lifetime: Lifetime::Application,
+                disabled: false,
+                dynamic_label: None,
+            }),
         }
     }
 }

glean-core/src/ping/mod.rs

@@ -163,8 +163,11 @@ impl PingMaker {
         };
 
         // Get the Server Knobs configuration, if available.
-        let server_knobs_metric = crate::Glean::server_knobs_metric();
-        if let Some(config_json) = server_knobs_metric.get_value(glean, INTERNAL_STORAGE) {
+        if let Some(config_json) = glean
+            .additional_metrics
+            .server_knobs_config
+            .get_value(glean, INTERNAL_STORAGE)
+        {
             let server_knobs_config = serde_json::from_str(&config_json).unwrap();
             map.as_object_mut()
                 .unwrap() // safe unwrap, we created the object above
@@ -605,7 +608,13 @@ mod test {
         let ping_info1 = ping_maker.get_ping_info(&glean, "store1", None, TimeUnit::Minute);
         let ping_info2 = ping_maker.get_ping_info(&glean, "store2", None, TimeUnit::Minute);
 
-        assert_eq!(ping_info1["server_knobs_config"]["metrics_enabled"]["test.counter"], true);
-        assert_eq!(ping_info2["server_knobs_config"]["metrics_enabled"]["test.counter"], true);
+        assert_eq!(
+            ping_info1["server_knobs_config"]["metrics_enabled"]["test.counter"],
+            true
+        );
+        assert_eq!(
+            ping_info2["server_knobs_config"]["metrics_enabled"]["test.counter"],
+            true
+        );
     }
 }