Merge pull request #1 from rd-lumi/fix-build-mipsel-with-atomic-fail

Fix build mipsel with atomic fail

Author: TGLuong

Cargo.toml

@@ -48,3 +48,4 @@ tracing = { version = "0.1", default-features = false }
 tracing-core = { version = "0.1", default-features = false }
 tracing-subscriber = { version = "0.3", default-features = false }
 url = { version = "2.5.2", default-features = false } #https://github.com/servo/rust-url/issues/992
+portable-atomic = "1.9.0"

opentelemetry-sdk/Cargo.toml

@@ -30,6 +30,9 @@ tokio-stream = { workspace = true, optional = true }
 http = { workspace = true, optional = true }
 tracing = {workspace = true, optional = true}
 
+[target.'cfg(any(target_arch = "powerpc", target_arch = "mips"))'.dependencies]
+portable-atomic = {workspace = true}
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]

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

@@ -9,7 +9,7 @@ use core::fmt;
 use std::collections::{HashMap, HashSet};
 use std::mem::take;
 use std::ops::{Add, AddAssign, DerefMut, Sub};
-use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU64, AtomicUsize, Ordering};
+use std::sync::atomic::Ordering;
 use std::sync::{Arc, RwLock};
 
 use aggregate::is_under_cardinality_limit;
@@ -18,6 +18,12 @@ pub(crate) use exponential_histogram::{EXPO_MAX_SCALE, EXPO_MIN_SCALE};
 use once_cell::sync::Lazy;
 use opentelemetry::{otel_warn, KeyValue};
 
+#[cfg(any(target_arch = "mips", target_arch = "powerpc"))]
+use portable_atomic::{AtomicBool, AtomicI64, AtomicU64, AtomicUsize};
+
+#[cfg(not(any(target_arch = "mips", target_arch = "powerpc")))]
+use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU64, AtomicUsize};
+
 use crate::metrics::AttributeSet;
 
 pub(crate) static STREAM_OVERFLOW_ATTRIBUTES: Lazy<Vec<KeyValue>> =
@@ -410,8 +416,8 @@ mod tests {
     #[test]
     fn can_add_and_get_u64_atomic_value() {
         let atomic = u64::new_atomic_tracker(0);
-        atomic.add(15);
-        atomic.add(10);
+        AtomicTracker::add(&atomic, 15);
+        AtomicTracker::add(&atomic, 10);
 
         let value = atomic.get_value();
         assert_eq!(value, 25);
@@ -420,7 +426,7 @@ mod tests {
     #[test]
     fn can_reset_u64_atomic_value() {
         let atomic = u64::new_atomic_tracker(0);
-        atomic.add(15);
+        AtomicTracker::add(&atomic, 15);
 
         let value = atomic.get_and_reset_value();
         let value2 = atomic.get_value();
@@ -449,8 +455,8 @@ mod tests {
     #[test]
     fn can_add_and_get_i64_atomic_value() {
         let atomic = i64::new_atomic_tracker(0);
-        atomic.add(15);
-        atomic.add(-10);
+        AtomicTracker::add(&atomic, 15);
+        AtomicTracker::add(&atomic, -10);
 
         let value = atomic.get_value();
         assert_eq!(value, 5);
@@ -459,7 +465,7 @@ mod tests {
     #[test]
     fn can_reset_i64_atomic_value() {
         let atomic = i64::new_atomic_tracker(0);
-        atomic.add(15);
+        AtomicTracker::add(&atomic, 15);
 
         let value = atomic.get_and_reset_value();
         let value2 = atomic.get_value();