Merge branch 'main' into preallocate-attribute-mem

opentelemetry-sdk/CHANGELOG.md

@@ -16,7 +16,10 @@
   The custom exporters and processors can't directly access the `LogData::LogRecord::attributes`, as
   these are private to opentelemetry-sdk. Instead, they would now use LogRecord::attributes_iter()
   method to access them.
-
+- Fixed various Metric aggregation bug related to
+  ObservableCounter,UpDownCounter including
+  [#1517](https://github.com/open-telemetry/opentelemetry-rust/issues/1517).
+  [#2004](https://github.com/open-telemetry/opentelemetry-rust/pull/2004)
 
 ## v0.24.1
 

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

@@ -15,6 +15,7 @@ pub(crate) use exponential_histogram::{EXPO_MAX_SCALE, EXPO_MIN_SCALE};
 /// Marks a type that can have a value added and retrieved atomically. Required since
 /// different types have different backing atomic mechanisms
 pub(crate) trait AtomicTracker<T>: Sync + Send + 'static {
+    fn store(&self, value: T);
     fn add(&self, value: T);
     fn get_value(&self) -> T;
     fn get_and_reset_value(&self) -> T;
@@ -90,6 +91,10 @@ impl Number<f64> for f64 {
 }
 
 impl AtomicTracker<u64> for AtomicU64 {
+    fn store(&self, value: u64) {
+        self.store(value, Ordering::Relaxed);
+    }
+
     fn add(&self, value: u64) {
         self.fetch_add(value, Ordering::Relaxed);
     }
@@ -112,6 +117,10 @@ impl AtomicallyUpdate<u64> for u64 {
 }
 
 impl AtomicTracker<i64> for AtomicI64 {
+    fn store(&self, value: i64) {
+        self.store(value, Ordering::Relaxed);
+    }
+
     fn add(&self, value: i64) {
         self.fetch_add(value, Ordering::Relaxed);
     }
@@ -146,6 +155,11 @@ impl F64AtomicTracker {
 }
 
 impl AtomicTracker<f64> for F64AtomicTracker {
+    fn store(&self, value: f64) {
+        let mut guard = self.inner.lock().expect("F64 mutex was poisoned");
+        *guard = value;
+    }
+
     fn add(&self, value: f64) {
         let mut guard = self.inner.lock().expect("F64 mutex was poisoned");
         *guard += value;