fix: rebase new version of opentelemetry

Author: TGLuong

Cargo.toml

@@ -53,11 +53,10 @@ tracing = { version = ">=0.1.40", default-features = false }
 tracing-core = { version = ">=0.1.33", default-features = false } 
 tracing-subscriber = { version = "0.3", default-features = false }
 url = { version = "2.5", default-features = false }
+portable-atomic = "1.9.0"
 
 # Aviod use of crates.io version of these crates through the tracing-opentelemetry dependencies
 [patch.crates-io]
 opentelemetry = { path = "opentelemetry" }
 opentelemetry_sdk = { path = "opentelemetry-sdk" }
 opentelemetry-stdout = { path = "opentelemetry-stdout" }
-url = { version = "2.5.2", default-features = false } #https://github.com/servo/rust-url/issues/992
-portable-atomic = "1.9.0"

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

@@ -9,23 +9,23 @@ use core::fmt;
 use std::collections::{HashMap, HashSet};
 use std::mem::swap;
 use std::ops::{Add, AddAssign, DerefMut, Sub};
-use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU64, AtomicUsize, Ordering};
+use std::sync::atomic::Ordering;
+
+#[cfg(not(any(target_arch = "mips", target_arch = "powerpc")))]
+use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU64, AtomicUsize};
+
+#[cfg(any(target_arch = "mips", target_arch = "powerpc"))]
+use portable_atomic::{AtomicBool, AtomicI64, AtomicU64, AtomicUsize};
+
 use std::sync::{Arc, OnceLock, RwLock};
 
 use aggregate::{is_under_cardinality_limit, STREAM_CARDINALITY_LIMIT};
 pub(crate) use aggregate::{AggregateBuilder, AggregateFns, ComputeAggregation, Measure};
 pub(crate) use exponential_histogram::{EXPO_MAX_SCALE, EXPO_MIN_SCALE};
 use opentelemetry::{otel_warn, KeyValue};
 
-#[cfg(any(target_arch = "mips", target_arch = "powerpc"))]
-use portable_atomic::{AtomicBool, AtomicI64, AtomicU64, AtomicUsize};
-
 // TODO Replace it with LazyLock once it is stable
 pub(crate) static STREAM_OVERFLOW_ATTRIBUTES: OnceLock<Vec<KeyValue>> = OnceLock::new();
-#[cfg(not(any(target_arch = "mips", target_arch = "powerpc")))]
-use std::sync::atomic::{AtomicBool, AtomicI64, AtomicU64, AtomicUsize};
-
-use crate::metrics::AttributeSet;
 
 #[inline]
 fn stream_overflow_attributes() -> &'static Vec<KeyValue> {