Add support of instruments in configuration for telemetry

apollo-router/src/configuration/metrics.rs

@@ -307,6 +307,14 @@ impl InstrumentData {
             "$..events",
             opt.instruments,
             "$..instruments",
+            opt.instruments.router,
+            "$..instruments.router",
+            opt.instruments.supergraph,
+            "$..instruments.supergraph",
+            opt.instruments.subgraph,
+            "$..instruments.subgraph",
+            opt.instruments.default_attribute_requirement_level,
+            "$..instruments.default_attribute_requirement_level",
             opt.spans,
             "$..spans",
             opt.spans.mode,

apollo-router/src/configuration/snapshots/apollo_router__configuration__metrics__test__metrics@telemetry.router.yaml.snap

@@ -9,6 +9,10 @@ expression: "&metrics.non_zero()"
         attributes:
           opt.events: false
           opt.instruments: false
+          opt.instruments.default_attribute_requirement_level: false
+          opt.instruments.router: false
+          opt.instruments.subgraph: false
+          opt.instruments.supergraph: false
           opt.logging.experimental_when_header: true
           opt.metrics.otlp: true
           opt.metrics.prometheus: true

apollo-router/src/metrics/mod.rs

@@ -231,11 +231,9 @@ pub(crate) mod test_utils {
                 } else if let Some(histogram) = metric.data.as_any().downcast_ref::<Histogram<T>>()
                 {
                     if matches!(ty, MetricType::Histogram) {
-                        if let Some(value) = value.to_u64() {
-                            return histogram.data_points.iter().any(|datapoint| {
-                                datapoint.attributes == *attributes && datapoint.count == value
-                            });
-                        }
+                        return histogram.data_points.iter().any(|datapoint| {
+                            datapoint.attributes == *attributes && datapoint.sum == value
+                        });
                     }
                 }
             }
@@ -905,7 +903,7 @@ macro_rules! assert_gauge {
 }
 
 #[cfg(test)]
-macro_rules! assert_histogram {
+macro_rules! assert_histogram_sum {
 
     ($($name:ident).+, $value: expr, $($attr_key:literal = $attr_value:expr),+) => {
         let attributes = vec![$(opentelemetry::KeyValue::new($attr_key, $attr_value)),+];
@@ -932,7 +930,7 @@ macro_rules! assert_histogram {
     };
 
     ($name:literal, $value: expr) => {
-        let result = crate::metrics::collect_metrics().assert($name, $value, &[]);
+        let result = crate::metrics::collect_metrics().assert($name, crate::metrics::test_utils::MetricType::Histogram, $value, &[]);
         assert_metric!(result, $name, None, Some($value.into()), &[]);
     };
 }
@@ -1143,7 +1141,7 @@ mod test {
     async fn test_u64_histogram() {
         async {
             u64_histogram!("test", "test description", 1, "attr" = "val");
-            assert_histogram!("test", 1, "attr" = "val");
+            assert_histogram_sum!("test", 1, "attr" = "val");
         }
         .with_metrics()
         .await;
@@ -1153,7 +1151,7 @@ mod test {
     async fn test_i64_histogram() {
         async {
             i64_histogram!("test", "test description", 1, "attr" = "val");
-            assert_histogram!("test", 1, "attr" = "val");
+            assert_histogram_sum!("test", 1, "attr" = "val");
         }
         .with_metrics()
         .await;
@@ -1163,7 +1161,7 @@ mod test {
     async fn test_f64_histogram() {
         async {
             f64_histogram!("test", "test description", 1.0, "attr" = "val");
-            assert_histogram!("test", 1, "attr" = "val");
+            assert_histogram_sum!("test", 1, "attr" = "val");
         }
         .with_metrics()
         .await;
@@ -1185,7 +1183,7 @@ mod test {
     async fn test_type_counter() {
         async {
             f64_counter!("test", "test description", 1.0, "attr" = "val");
-            assert_histogram!("test", 1, "attr" = "val");
+            assert_histogram_sum!("test", 1, "attr" = "val");
         }
         .with_metrics()
         .await;
@@ -1196,7 +1194,7 @@ mod test {
     async fn test_type_up_down_counter() {
         async {
             f64_up_down_counter!("test", "test description", 1.0, "attr" = "val");
-            assert_histogram!("test", 1, "attr" = "val");
+            assert_histogram_sum!("test", 1, "attr" = "val");
         }
         .with_metrics()
         .await;
@@ -1211,7 +1209,7 @@ mod test {
                 .u64_observable_gauge("test")
                 .with_callback(|m| m.observe(5, &[]))
                 .init();
-            assert_histogram!("test", 1, "attr" = "val");
+            assert_histogram_sum!("test", 1, "attr" = "val");
         }
         .with_metrics()
         .await;

apollo-router/src/plugins/telemetry/config.rs

@@ -88,9 +88,8 @@ pub(crate) struct Instrumentation {
     pub(crate) events: config_new::events::Events,
     /// Span configuration
     pub(crate) spans: config_new::spans::Spans,
-    #[serde(skip)]
     /// Instrument configuration
-    pub(crate) instruments: config_new::instruments::Instruments,
+    pub(crate) instruments: config_new::instruments::InstrumentsConfig,
 }
 
 /// Metrics configuration
@@ -168,14 +167,14 @@ impl TryInto<Box<dyn View>> for MetricView {
                     record_min_max: true,
                 },
             );
-        let mut instrument = Instrument::new().name(self.name);
+        let instrument = Instrument::new().name(self.name);
+        let mut mask = Stream::new();
         if let Some(desc) = self.description {
-            instrument = instrument.description(desc);
+            mask = mask.description(desc);
         }
         if let Some(unit) = self.unit {
-            instrument = instrument.unit(Unit::new(unit));
+            mask = mask.unit(Unit::new(unit));
         }
-        let mut mask = Stream::new();
         if let Some(aggregation) = aggregation {
             mask = mask.aggregation(aggregation);
         }