fix attributes

Author: cijothomas

opentelemetry-proto/src/transform/metrics.rs

@@ -210,7 +210,7 @@ pub mod tonic {
                 data_points: hist
                     .data_points()
                     .map(|dp| TonicHistogramDataPoint {
-                        attributes: dp.attributes.iter().map(Into::into).collect(),
+                        attributes: dp.attributes().map(Into::into).collect(),
                         start_time_unix_nano: to_nanos(hist.start_time),
                         time_unix_nano: to_nanos(hist.time),
                         count: dp.count,
@@ -237,7 +237,7 @@ pub mod tonic {
                 data_points: hist
                     .data_points()
                     .map(|dp| TonicExponentialHistogramDataPoint {
-                        attributes: dp.attributes.iter().map(Into::into).collect(),
+                        attributes: dp.attributes().map(Into::into).collect(),
                         start_time_unix_nano: to_nanos(hist.start_time),
                         time_unix_nano: to_nanos(hist.time),
                         count: dp.count as u64,
@@ -273,7 +273,7 @@ pub mod tonic {
                 data_points: sum
                     .data_points()
                     .map(|dp| TonicNumberDataPoint {
-                        attributes: dp.attributes.iter().map(Into::into).collect(),
+                        attributes: dp.attributes().map(Into::into).collect(),
                         start_time_unix_nano: to_nanos(sum.start_time),
                         time_unix_nano: to_nanos(sum.time),
                         exemplars: dp.exemplars.iter().map(Into::into).collect(),
@@ -296,7 +296,7 @@ pub mod tonic {
                 data_points: gauge
                     .data_points()
                     .map(|dp| TonicNumberDataPoint {
-                        attributes: dp.attributes.iter().map(Into::into).collect(),
+                        attributes: dp.attributes().map(Into::into).collect(),
                         start_time_unix_nano: gauge.start_time.map(to_nanos).unwrap_or_default(),
                         time_unix_nano: to_nanos(gauge.time),
                         exemplars: dp.exemplars.iter().map(Into::into).collect(),

opentelemetry-sdk/CHANGELOG.md

@@ -47,12 +47,16 @@ also modified to suppress telemetry before invoking exporters.
 - *Breaking* change, affecting custom `PushMetricExporter` authors:
   - The `export` method on `PushMetricExporter` now accepts `&ResourceMetrics`
     instead of `&mut ResourceMetrics`.
-  - `ResourceMetrics` no longer exposes `scope_metrics` field, but instead offers
-    `scope_metrics()` method that returns an iterator over the same.
+  - `ResourceMetrics` no longer exposes `scope_metrics` field, but instead
+    offers `scope_metrics()` method that returns an iterator over the same.
   - `ScopeMetrics` no longer exposes `metrics` field, but instead offers
     `metrics()` method that returns an iterator over the same.
-  - `Sum`, `Gauge` no longer exposes `data_points` field, but instead offers
-    `data_points()` method that returns an iterator over the same.
+  - `Sum`, `Gauge`, `Histogram` & `ExponentialHistogram` no longer exposes
+    `data_points` field, but instead offers `data_points()` method that returns
+    an iterator over the same.
+  - `SumDataPoint`, `GaugeDataPoint`, `HistogramDataPoint` &
+    `ExponentialHistogramDataPoint` no longer exposes `attributes` field, but
+    instead offers `attributes()` method that returns an iterator over the same.
 
 ## 0.29.0
 

opentelemetry-sdk/src/metrics/data/mod.rs

@@ -135,13 +135,20 @@ impl<T> From<ExponentialHistogram<T>> for MetricData<T> {
 pub struct GaugeDataPoint<T> {
     /// Attributes is the set of key value pairs that uniquely identify the
     /// time series.
-    pub attributes: Vec<KeyValue>,
+    pub(crate) attributes: Vec<KeyValue>,
     /// The value of this data point.
     pub value: T,
     /// The sampled [Exemplar]s collected during the time series.
     pub exemplars: Vec<Exemplar<T>>,
 }
 
+impl<T> GaugeDataPoint<T> {
+    /// Returns an iterator over the attributes in [GaugeDataPoint].
+    pub fn attributes(&self) -> impl Iterator<Item = &KeyValue> {
+        self.attributes.iter()
+    }
+}
+
 /// A measurement of the current value of an instrument.
 #[derive(Debug, Clone)]
 pub struct Gauge<T> {
@@ -165,13 +172,20 @@ impl<T> Gauge<T> {
 pub struct SumDataPoint<T> {
     /// Attributes is the set of key value pairs that uniquely identify the
     /// time series.
-    pub attributes: Vec<KeyValue>,
+    pub(crate) attributes: Vec<KeyValue>,
     /// The value of this data point.
     pub value: T,
     /// The sampled [Exemplar]s collected during the time series.
     pub exemplars: Vec<Exemplar<T>>,
 }
 
+impl<T> SumDataPoint<T> {
+    /// Returns an iterator over the attributes in [SumDataPoint].
+    pub fn attributes(&self) -> impl Iterator<Item = &KeyValue> {
+        self.attributes.iter()
+    }
+}
+
 /// Represents the sum of all measurements of values from an instrument.
 #[derive(Debug, Clone)]
 pub struct Sum<T> {
@@ -220,7 +234,7 @@ impl<T> Histogram<T> {
 #[derive(Debug, Clone, PartialEq)]
 pub struct HistogramDataPoint<T> {
     /// The set of key value pairs that uniquely identify the time series.
-    pub attributes: Vec<KeyValue>,
+    pub(crate) attributes: Vec<KeyValue>,
     /// The number of updates this histogram has been calculated with.
     pub count: u64,
     /// The upper bounds of the buckets of the histogram.
@@ -241,6 +255,13 @@ pub struct HistogramDataPoint<T> {
     pub exemplars: Vec<Exemplar<T>>,
 }
 
+impl<T> HistogramDataPoint<T> {
+    /// Returns an iterator over the attributes in [HistogramDataPoint].
+    pub fn attributes(&self) -> impl Iterator<Item = &KeyValue> {
+        self.attributes.iter()
+    }
+}
+
 /// The histogram of all measurements of values from an instrument.
 #[derive(Debug, Clone)]
 pub struct ExponentialHistogram<T> {
@@ -266,7 +287,7 @@ impl<T> ExponentialHistogram<T> {
 #[derive(Debug, Clone, PartialEq)]
 pub struct ExponentialHistogramDataPoint<T> {
     /// The set of key value pairs that uniquely identify the time series.
-    pub attributes: Vec<KeyValue>,
+    pub(crate) attributes: Vec<KeyValue>,
 
     /// The number of updates this histogram has been calculated with.
     pub count: usize,
@@ -307,6 +328,13 @@ pub struct ExponentialHistogramDataPoint<T> {
     pub exemplars: Vec<Exemplar<T>>,
 }
 
+impl<T> ExponentialHistogramDataPoint<T> {
+    /// Returns an iterator over the attributes in [ExponentialHistogramDataPoint].
+    pub fn attributes(&self) -> impl Iterator<Item = &KeyValue> {
+        self.attributes.iter()
+    }
+}
+
 /// A set of bucket counts, encoded in a contiguous array of counts.
 #[derive(Debug, Clone, PartialEq)]
 pub struct ExponentialBucket {

opentelemetry-stdout/src/metrics/exporter.rs

@@ -203,7 +203,7 @@ fn print_sum_data_points<'a, T: Debug + 'a>(
         println!("\t\tDataPoint #{}", i);
         println!("\t\t\tValue        : {:#?}", data_point.value);
         println!("\t\t\tAttributes   :");
-        for kv in data_point.attributes.iter() {
+        for kv in data_point.attributes() {
             println!("\t\t\t\t ->  {}: {}", kv.key, kv.value.as_str());
         }
     }
@@ -216,7 +216,7 @@ fn print_gauge_data_points<'a, T: Debug + 'a>(
         println!("\t\tDataPoint #{}", i);
         println!("\t\t\tValue        : {:#?}", data_point.value);
         println!("\t\t\tAttributes   :");
-        for kv in data_point.attributes.iter() {
+        for kv in data_point.attributes() {
             println!("\t\t\t\t ->  {}: {}", kv.key, kv.value.as_str());
         }
     }
@@ -238,7 +238,7 @@ fn print_hist_data_points<'a, T: Debug + 'a>(
         }
 
         println!("\t\t\tAttributes   :");
-        for kv in data_point.attributes.iter() {
+        for kv in data_point.attributes() {
             println!("\t\t\t\t ->  {}: {}", kv.key, kv.value.as_str());
         }