Merge branch 'global-error-handler-cleanup-metrics-sdk' of github.com:lalitb/opentelemetry-rust into global-error-handler-cleanup-metrics-sdk

Author: lalitb

opentelemetry-sdk/src/metrics/instrument.rs

@@ -1,4 +1,4 @@
-use std::{any::Any, borrow::Cow, collections::HashSet, hash::Hash, sync::Arc};
+use std::{borrow::Cow, collections::HashSet, sync::Arc};
 
 use opentelemetry::{
     metrics::{AsyncInstrument, SyncCounter, SyncGauge, SyncHistogram, SyncUpDownCounter},
@@ -301,8 +301,4 @@ impl<T: Copy + Send + Sync + 'static> AsyncInstrument<T> for Observable<T> {
             measure.call(measurement, attrs)
         }
     }
-
-    fn as_any(&self) -> Arc<dyn Any> {
-        Arc::new(self.clone())
-    }
 }

opentelemetry-sdk/src/metrics/meter.rs

@@ -280,7 +280,7 @@ impl SdkMeter {
 
     fn create_histogram<T>(
         &self,
-        builder: HistogramBuilder<'_, T>,
+        builder: HistogramBuilder<'_, Histogram<T>>,
         resolver: &InstrumentResolver<'_, T>,
     ) -> Result<Histogram<T>>
     where
@@ -410,12 +410,18 @@ impl InstrumentProvider for SdkMeter {
         self.create_observable_gauge(builder, &resolver)
     }
 
-    fn f64_histogram(&self, builder: HistogramBuilder<'_, f64>) -> Result<Histogram<f64>> {
+    fn f64_histogram(
+        &self,
+        builder: HistogramBuilder<'_, Histogram<f64>>,
+    ) -> Result<Histogram<f64>> {
         let resolver = InstrumentResolver::new(self, &self.f64_resolver);
         self.create_histogram(builder, &resolver)
     }
 
-    fn u64_histogram(&self, builder: HistogramBuilder<'_, u64>) -> Result<Histogram<u64>> {
+    fn u64_histogram(
+        &self,
+        builder: HistogramBuilder<'_, Histogram<u64>>,
+    ) -> Result<Histogram<u64>> {
         let resolver = InstrumentResolver::new(self, &self.u64_resolver);
         self.create_histogram(builder, &resolver)
     }

opentelemetry/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179)
 - Add `LogRecord::set_trace_context`; an optional method conditional on the `trace` feature for setting trace context on a log record.
+- Remove unnecessary public methods named `as_any` from `AsyncInstrument` trait and the implementing instruments: `ObservableCounter`, `ObservableGauge`, and `ObservableUpDownCounter` [#2187](https://github.com/open-telemetry/opentelemetry-rust/issues/2187)
 
 ## v0.26.0
 Released 2024-Sep-30

opentelemetry/src/metrics/instruments/counter.rs

@@ -1,6 +1,5 @@
 use crate::{metrics::AsyncInstrument, KeyValue};
 use core::fmt;
-use std::any::Any;
 use std::sync::Arc;
 
 /// An SDK implemented instrument that records increasing values.
@@ -63,19 +62,10 @@ impl<T> ObservableCounter<T> {
     pub fn observe(&self, value: T, attributes: &[KeyValue]) {
         self.0.observe(value, attributes)
     }
-
-    /// Used for SDKs to downcast instruments in callbacks.
-    pub fn as_any(&self) -> Arc<dyn Any> {
-        self.0.as_any()
-    }
 }
 
 impl<T> AsyncInstrument<T> for ObservableCounter<T> {
     fn observe(&self, measurement: T, attributes: &[KeyValue]) {
         self.0.observe(measurement, attributes)
     }
-
-    fn as_any(&self) -> Arc<dyn Any> {
-        self.0.as_any()
-    }
 }

opentelemetry/src/metrics/instruments/gauge.rs

@@ -1,6 +1,5 @@
 use crate::{metrics::AsyncInstrument, KeyValue};
 use core::fmt;
-use std::any::Any;
 use std::sync::Arc;
 
 /// An SDK implemented instrument that records independent values
@@ -59,21 +58,12 @@ impl<T> ObservableGauge<T> {
     pub fn observe(&self, measurement: T, attributes: &[KeyValue]) {
         self.0.observe(measurement, attributes)
     }
-
-    /// Used by SDKs to downcast instruments in callbacks.
-    pub fn as_any(&self) -> Arc<dyn Any> {
-        self.0.as_any()
-    }
 }
 
 impl<M> AsyncInstrument<M> for ObservableGauge<M> {
     fn observe(&self, measurement: M, attributes: &[KeyValue]) {
         self.observe(measurement, attributes)
     }
-
-    fn as_any(&self) -> Arc<dyn Any> {
-        self.0.as_any()
-    }
 }
 
 impl<T> ObservableGauge<T> {

opentelemetry/src/metrics/instruments/mod.rs

@@ -3,10 +3,8 @@ use gauge::{Gauge, ObservableGauge};
 use crate::metrics::{Meter, Result};
 use crate::KeyValue;
 use core::fmt;
-use std::any::Any;
 use std::borrow::Cow;
 use std::marker;
-use std::sync::Arc;
 
 use super::{
     Counter, Histogram, InstrumentProvider, ObservableCounter, ObservableUpDownCounter,
@@ -24,9 +22,6 @@ pub trait AsyncInstrument<T>: Send + Sync {
     ///
     /// It is only valid to call this within a callback.
     fn observe(&self, measurement: T, attributes: &[KeyValue]);
-
-    /// Used for SDKs to downcast instruments in callbacks.
-    fn as_any(&self) -> Arc<dyn Any>;
 }
 
 /// Configuration for building a Histogram.
@@ -93,7 +88,7 @@ impl<'a, T> HistogramBuilder<'a, T> {
     }
 }
 
-impl<'a> HistogramBuilder<'a, f64> {
+impl<'a> HistogramBuilder<'a, Histogram<f64>> {
     /// Validate the instrument configuration and creates a new instrument.
     pub fn try_init(self) -> Result<Histogram<f64>> {
         self.instrument_provider.f64_histogram(self)
@@ -109,7 +104,7 @@ impl<'a> HistogramBuilder<'a, f64> {
     }
 }
 
-impl<'a> HistogramBuilder<'a, u64> {
+impl<'a> HistogramBuilder<'a, Histogram<u64>> {
     /// Validate the instrument configuration and creates a new instrument.
     pub fn try_init(self) -> Result<Histogram<u64>> {
         self.instrument_provider.u64_histogram(self)

opentelemetry/src/metrics/instruments/up_down_counter.rs

@@ -1,6 +1,5 @@
 use crate::KeyValue;
 use core::fmt;
-use std::any::Any;
 use std::sync::Arc;
 
 use super::AsyncInstrument;
@@ -69,19 +68,10 @@ impl<T> ObservableUpDownCounter<T> {
     pub fn observe(&self, value: T, attributes: &[KeyValue]) {
         self.0.observe(value, attributes)
     }
-
-    /// Used for SDKs to downcast instruments in callbacks.
-    pub fn as_any(&self) -> Arc<dyn Any> {
-        self.0.as_any()
-    }
 }
 
 impl<T> AsyncInstrument<T> for ObservableUpDownCounter<T> {
     fn observe(&self, measurement: T, attributes: &[KeyValue]) {
         self.0.observe(measurement, attributes)
     }
-
-    fn as_any(&self) -> Arc<dyn std::any::Any> {
-        self.0.as_any()
-    }
 }

opentelemetry/src/metrics/meter.rs

@@ -8,7 +8,7 @@ use crate::metrics::{
 };
 use crate::KeyValue;
 
-use super::{Counter, HistogramBuilder};
+use super::{Counter, Histogram, HistogramBuilder};
 
 /// Provides access to named [Meter] instances, for instrumenting an application
 /// or crate.
@@ -416,12 +416,18 @@ impl Meter {
     }
 
     /// creates an instrument builder for recording a distribution of values.
-    pub fn f64_histogram(&self, name: impl Into<Cow<'static, str>>) -> HistogramBuilder<'_, f64> {
+    pub fn f64_histogram(
+        &self,
+        name: impl Into<Cow<'static, str>>,
+    ) -> HistogramBuilder<'_, Histogram<f64>> {
         HistogramBuilder::new(self, name.into())
     }
 
     /// creates an instrument builder for recording a distribution of values.
-    pub fn u64_histogram(&self, name: impl Into<Cow<'static, str>>) -> HistogramBuilder<'_, u64> {
+    pub fn u64_histogram(
+        &self,
+        name: impl Into<Cow<'static, str>>,
+    ) -> HistogramBuilder<'_, Histogram<u64>> {
         HistogramBuilder::new(self, name.into())
     }
 }

opentelemetry/src/metrics/mod.rs

@@ -223,12 +223,18 @@ pub trait InstrumentProvider {
     }
 
     /// creates an instrument for recording a distribution of values.
-    fn f64_histogram(&self, _builder: HistogramBuilder<'_, f64>) -> Result<Histogram<f64>> {
+    fn f64_histogram(
+        &self,
+        _builder: HistogramBuilder<'_, Histogram<f64>>,
+    ) -> Result<Histogram<f64>> {
         Ok(Histogram::new(Arc::new(noop::NoopSyncInstrument::new())))
     }
 
     /// creates an instrument for recording a distribution of values.
-    fn u64_histogram(&self, _builder: HistogramBuilder<'_, u64>) -> Result<Histogram<u64>> {
+    fn u64_histogram(
+        &self,
+        _builder: HistogramBuilder<'_, Histogram<u64>>,
+    ) -> Result<Histogram<u64>> {
         Ok(Histogram::new(Arc::new(noop::NoopSyncInstrument::new())))
     }
 }

opentelemetry/src/metrics/noop.rs

@@ -10,7 +10,7 @@ use crate::{
     },
     KeyValue,
 };
-use std::{any::Any, sync::Arc};
+use std::sync::Arc;
 
 /// A no-op instance of a `MetricProvider`
 #[derive(Debug, Default)]
@@ -106,8 +106,4 @@ impl<T> AsyncInstrument<T> for NoopAsyncInstrument {
     fn observe(&self, _value: T, _attributes: &[KeyValue]) {
         // Ignored
     }
-
-    fn as_any(&self) -> Arc<dyn Any> {
-        Arc::new(())
-    }
 }