fix histogramdatapoint in sdk

Author: cijothomas

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

@@ -143,7 +143,7 @@ impl<T: fmt::Debug + Send + Sync + 'static> Aggregation for Histogram<T> {
 #[derive(Debug)]
 pub struct HistogramDataPoint<T> {
     /// The set of key value pairs that uniquely identify the time series.
-    pub attributes: AttributeSet,
+    pub attributes: Vec<KeyValue>,
     /// The time when the time series was started.
     pub start_time: SystemTime,
     /// The time when the time series was recorded.

opentelemetry-sdk/src/metrics/internal/aggregate.rs

@@ -339,7 +339,7 @@ mod tests {
                 .explicit_bucket_histogram(vec![1.0], true, true);
             let mut a = Histogram {
                 data_points: vec![HistogramDataPoint {
-                    attributes: AttributeSet::from(&[KeyValue::new("a2", 2)][..]),
+                    attributes: vec![KeyValue::new("a1", 1)],
                     start_time: SystemTime::now(),
                     time: SystemTime::now(),
                     count: 2,
@@ -365,10 +365,7 @@ mod tests {
             assert!(new_agg.is_none());
             assert_eq!(a.temporality, temporality);
             assert_eq!(a.data_points.len(), 1);
-            assert_eq!(
-                a.data_points[0].attributes,
-                AttributeSet::from(&new_attributes[..])
-            );
+            assert_eq!(a.data_points[0].attributes, new_attributes.to_vec());
             assert_eq!(a.data_points[0].count, 1);
             assert_eq!(a.data_points[0].bounds, vec![1.0]);
             assert_eq!(a.data_points[0].bucket_counts, vec![0, 1]);

opentelemetry-sdk/src/metrics/internal/histogram.rs

@@ -2,6 +2,7 @@ use std::{collections::HashMap, sync::Mutex, time::SystemTime};
 
 use crate::metrics::data::{self, Aggregation, Temporality};
 use crate::{attributes::AttributeSet, metrics::data::HistogramDataPoint};
+use opentelemetry::KeyValue;
 use opentelemetry::{global, metrics::MetricsError};
 
 use super::{
@@ -165,7 +166,10 @@ impl<T: Number<T>> Histogram<T> {
 
         for (a, b) in values.drain() {
             h.data_points.push(HistogramDataPoint {
-                attributes: a,
+                attributes: a
+                    .iter()
+                    .map(|(k, v)| KeyValue::new(k.clone(), v.clone()))
+                    .collect(),
                 start_time: start,
                 time: t,
                 count: b.count,
@@ -236,7 +240,10 @@ impl<T: Number<T>> Histogram<T> {
         // overload the system.
         for (a, b) in values.iter() {
             h.data_points.push(HistogramDataPoint {
-                attributes: a.clone(),
+                attributes: a
+                    .iter()
+                    .map(|(k, v)| KeyValue::new(k.clone(), v.clone()))
+                    .collect(),
                 start_time: start,
                 time: t,
                 count: b.count,