fix min and max and value

Author: cijothomas

opentelemetry-proto/src/transform/metrics.rs

@@ -282,7 +282,7 @@ pub mod tonic {
                         time_unix_nano: to_nanos(sum.time()),
                         exemplars: dp.exemplars().map(Into::into).collect(),
                         flags: TonicDataPointFlags::default() as u32,
-                        value: Some(dp.value.into()),
+                        value: Some(dp.value().into()),
                     })
                     .collect(),
                 aggregation_temporality: TonicTemporality::from(sum.temporality()).into(),
@@ -305,7 +305,7 @@ pub mod tonic {
                         time_unix_nano: to_nanos(gauge.time()),
                         exemplars: dp.exemplars().map(Into::into).collect(),
                         flags: TonicDataPointFlags::default() as u32,
-                        value: Some(dp.value.into()),
+                        value: Some(dp.value().into()),
                     })
                     .collect(),
             }

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

@@ -169,7 +169,7 @@ pub struct GaugeDataPoint<T> {
     /// time series.
     pub(crate) attributes: Vec<KeyValue>,
     /// The value of this data point.
-    pub value: T,
+    pub(crate) value: T,
     /// The sampled [Exemplar]s collected during the time series.
     pub(crate) exemplars: Vec<Exemplar<T>>,
 }
@@ -186,6 +186,13 @@ impl<T> GaugeDataPoint<T> {
     }
 }
 
+impl<T: Copy> GaugeDataPoint<T> {
+    /// Returns the value of this data point.
+    pub fn value(&self) -> T {
+        self.value
+    }
+}
+
 /// A measurement of the current value of an instrument.
 #[derive(Debug, Clone)]
 pub struct Gauge<T> {
@@ -238,6 +245,13 @@ impl<T> SumDataPoint<T> {
     }
 }
 
+impl<T: Copy> SumDataPoint<T> {
+    /// Returns the value of this data point.
+    pub fn value(&self) -> T {
+        self.value
+    }
+}
+
 /// Represents the sum of all measurements of values from an instrument.
 #[derive(Debug, Clone)]
 pub struct Sum<T> {
@@ -334,9 +348,9 @@ pub struct HistogramDataPoint<T> {
     pub(crate) bucket_counts: Vec<u64>,
 
     /// The minimum value recorded.
-    pub min: Option<T>,
+    pub(crate) min: Option<T>,
     /// The maximum value recorded.
-    pub max: Option<T>,
+    pub(crate) max: Option<T>,
     /// The sum of the values recorded.
     pub(crate) sum: T,
 
@@ -376,6 +390,18 @@ impl<T> HistogramDataPoint<T> {
     }
 }
 
+impl<T: Copy> HistogramDataPoint<T> {
+    /// Returns the minimum value recorded.
+    pub fn min(&self) -> Option<T> {
+        self.min
+    }
+
+    /// Returns the maximum value recorded.
+    pub fn max(&self) -> Option<T> {
+        self.max
+    }
+}
+
 /// The histogram of all measurements of values from an instrument.
 #[derive(Debug, Clone)]
 pub struct ExponentialHistogram<T> {

opentelemetry-stdout/src/metrics/exporter.rs

@@ -105,7 +105,7 @@ fn print_metrics<'a>(metrics: impl Iterator<Item = &'a ScopeMetrics>) {
 
             fn print_info<T>(data: &MetricData<T>)
             where
-                T: Debug,
+                T: Debug + Copy,
             {
                 match data {
                     MetricData::Gauge(gauge) => {
@@ -156,7 +156,7 @@ fn print_sum<T: Debug>(sum: &Sum<T>) {
     print_sum_data_points(sum.data_points());
 }
 
-fn print_gauge<T: Debug>(gauge: &Gauge<T>) {
+fn print_gauge<T: Debug + Copy>(gauge: &Gauge<T>) {
     println!("\t\tGauge DataPoints");
     if let Some(start_time) = gauge.start_time() {
         let datetime: DateTime<Utc> = start_time.into();
@@ -173,7 +173,7 @@ fn print_gauge<T: Debug>(gauge: &Gauge<T>) {
     print_gauge_data_points(gauge.data_points());
 }
 
-fn print_histogram<T: Debug>(histogram: &Histogram<T>) {
+fn print_histogram<T: Debug + Copy>(histogram: &Histogram<T>) {
     if histogram.temporality() == Temporality::Cumulative {
         println!("\t\tTemporality  : Cumulative");
     } else {
@@ -206,31 +206,31 @@ fn print_sum_data_points<'a, T: Debug + 'a>(
     }
 }
 
-fn print_gauge_data_points<'a, T: Debug + 'a>(
+fn print_gauge_data_points<'a, T: Debug + Copy + 'a>(
     data_points: impl Iterator<Item = &'a GaugeDataPoint<T>>,
 ) {
     for (i, data_point) in data_points.enumerate() {
         println!("\t\tDataPoint #{}", i);
-        println!("\t\t\tValue        : {:#?}", data_point.value);
+        println!("\t\t\tValue        : {:#?}", data_point.value());
         println!("\t\t\tAttributes   :");
         for kv in data_point.attributes() {
             println!("\t\t\t\t ->  {}: {}", kv.key, kv.value.as_str());
         }
     }
 }
 
-fn print_hist_data_points<'a, T: Debug + 'a>(
+fn print_hist_data_points<'a, T: Debug + Copy + 'a>(
     data_points: impl Iterator<Item = &'a HistogramDataPoint<T>>,
 ) {
     for (i, data_point) in data_points.enumerate() {
         println!("\t\tDataPoint #{}", i);
         println!("\t\t\tCount        : {}", data_point.count());
         println!("\t\t\tSum          : {:?}", data_point.sum());
-        if let Some(min) = &data_point.min {
+        if let Some(min) = &data_point.min() {
             println!("\t\t\tMin          : {:?}", min);
         }
 
-        if let Some(max) = &data_point.max {
+        if let Some(max) = &data_point.max() {
             println!("\t\t\tMax          : {:?}", max);
         }