Remove as_any from ProvideMeter trait

And some small changes to support that. Mostly moving the Arc wrapping
of the ProvideMeter object outside of the constructor so the user can
clone the Arc before the TelemetryProvider takes ownership of it

Author: landonxjames

rust-runtime/aws-smithy-observability-otel/src/lib.rs

@@ -25,6 +25,8 @@ pub mod meter;
 #[cfg(test)]
 mod tests {
 
+    use std::sync::Arc;
+
     use crate::meter::OtelMeterProvider;
     use aws_smithy_observability::{
         global::{get_telemetry_provider, set_telemetry_provider},
@@ -43,7 +45,8 @@ mod tests {
         let otel_mp = SdkMeterProvider::builder().with_reader(reader).build();
 
         // Create the SDK metrics types from the OTel objects
-        let sdk_mp = OtelMeterProvider::new(otel_mp);
+        let sdk_mp = Arc::new(OtelMeterProvider::new(otel_mp));
+        let sdk_ref = sdk_mp.clone();
         let sdk_tp = TelemetryProvider::builder().meter_provider(sdk_mp).build();
 
         // Set the global TelemetryProvider and then get it back out
@@ -60,14 +63,7 @@ mod tests {
             .build();
         mono_counter.add(4, None, None);
 
-        // Flush metric pipeline and extract metrics from exporter
-        global_tp
-            .meter_provider()
-            .as_any()
-            .downcast_ref::<OtelMeterProvider>()
-            .unwrap()
-            .shutdown()
-            .unwrap();
+        sdk_ref.flush().unwrap();
         let finished_metrics = exporter.get_finished_metrics().unwrap();
 
         let extracted_mono_counter_data = &finished_metrics[0].scope_metrics[0].metrics[0]
@@ -78,13 +74,5 @@ mod tests {
             .data_points[0]
             .value;
         assert_eq!(extracted_mono_counter_data, &4);
-
-        // Get the OTel TP out and shut it down
-        let foo = global_tp
-            .meter_provider()
-            .as_any()
-            .downcast_ref::<OtelMeterProvider>()
-            .unwrap();
-        foo.shutdown().unwrap();
     }
 }

rust-runtime/aws-smithy-observability-otel/src/meter.rs

@@ -280,24 +280,12 @@ impl OtelMeterProvider {
             Err(err) => Err(ObservabilityError::new(ErrorKind::MetricsFlush, err)),
         }
     }
-
-    /// Gracefully shutdown the metric pipeline.
-    pub fn shutdown(&self) -> Result<(), ObservabilityError> {
-        match self.meter_provider.force_flush() {
-            Ok(_) => Ok(()),
-            Err(err) => Err(ObservabilityError::new(ErrorKind::MetricsShutdown, err)),
-        }
-    }
 }
 
 impl ProvideMeter for OtelMeterProvider {
     fn get_meter(&self, scope: &'static str, _attributes: Option<&Attributes>) -> Meter {
         Meter::new(Arc::new(MeterWrap(self.meter_provider.meter(scope))))
     }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
 }
 
 #[cfg(test)]
@@ -325,7 +313,8 @@ mod tests {
         let otel_mp = SdkMeterProvider::builder().with_reader(reader).build();
 
         // Create the SDK metrics types from the OTel objects
-        let sdk_mp = OtelMeterProvider::new(otel_mp);
+        let sdk_mp = Arc::new(OtelMeterProvider::new(otel_mp));
+        let sdk_ref = sdk_mp.clone();
         let sdk_tp = TelemetryProvider::builder().meter_provider(sdk_mp).build();
 
         // Get the dyn versions of the SDK metrics objects
@@ -345,12 +334,7 @@ mod tests {
         histogram.record(1.234, None, None);
 
         // Gracefully shutdown the metrics provider so all metrics are flushed through the pipeline
-        dyn_sdk_mp
-            .as_any()
-            .downcast_ref::<OtelMeterProvider>()
-            .unwrap()
-            .shutdown()
-            .unwrap();
+        sdk_ref.flush().unwrap();
 
         // Extract the metrics from the exporter and assert that they are what we expect
         let finished_metrics = exporter.get_finished_metrics().unwrap();
@@ -390,7 +374,8 @@ mod tests {
         let otel_mp = SdkMeterProvider::builder().with_reader(reader).build();
 
         // Create the SDK metrics types from the OTel objects
-        let sdk_mp = OtelMeterProvider::new(otel_mp);
+        let sdk_mp = Arc::new(OtelMeterProvider::new(otel_mp));
+        let sdk_ref = sdk_mp.clone();
         let sdk_tp = TelemetryProvider::builder().meter_provider(sdk_mp).build();
 
         // Get the dyn versions of the SDK metrics objects
@@ -445,12 +430,7 @@ mod tests {
         async_mono_counter.record(4, None, None);
 
         // Gracefully shutdown the metrics provider so all metrics are flushed through the pipeline
-        dyn_sdk_mp
-            .as_any()
-            .downcast_ref::<OtelMeterProvider>()
-            .unwrap()
-            .shutdown()
-            .unwrap();
+        sdk_ref.flush().unwrap();
 
         // Extract the metrics from the exporter
         let finished_metrics = exporter.get_finished_metrics().unwrap();

rust-runtime/aws-smithy-observability/src/instruments.rs

@@ -144,6 +144,7 @@ impl<'a, T, M> AsyncInstrumentBuilder<'a, T, M> {
 
 /// Takes in the name of function from [ProvideInstrument] and the type of instrument being created
 /// (ex: [AsyncMeasure]) and adds a `build` function for it.
+//TODO(observability): Can I derive the measurement from the Value of the instrument type or vice versa?
 macro_rules! build_async_instrument {
     ($name:ident, $instrument:ty, $measurement:ty) => {
         impl<'a> AsyncInstrumentBuilder<'a, $instrument, $measurement> {

rust-runtime/aws-smithy-observability/src/meter.rs

@@ -17,9 +17,6 @@ use std::{borrow::Cow, fmt::Debug, sync::Arc};
 pub trait ProvideMeter: Send + Sync + Debug {
     /// Get or create a named [Meter].
     fn get_meter(&self, scope: &'static str, attributes: Option<&Attributes>) -> Meter;
-
-    /// Cast to [std::any::Any]
-    fn as_any(&self) -> &dyn std::any::Any;
 }
 
 /// The entry point to creating instruments. A grouping of related metrics.
@@ -86,8 +83,6 @@ impl Meter {
     pub fn create_histogram(
         &self,
         name: impl Into<Cow<'static, str>>,
-        // units: Option<impl Into<Cow<'static, str>>>,
-        // description: Option<impl Into<Cow<'static, str>>>,
     ) -> InstrumentBuilder<'_, Arc<dyn Histogram>> {
         InstrumentBuilder::new(self, name.into())
     }

rust-runtime/aws-smithy-observability/src/noop.rs

@@ -24,10 +24,6 @@ impl ProvideMeter for NoopMeterProvider {
     fn get_meter(&self, _scope: &'static str, _attributes: Option<&Attributes>) -> Meter {
         Meter::new(Arc::new(NoopMeter))
     }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
 }
 
 #[derive(Debug)]

rust-runtime/aws-smithy-observability/src/provider.rs

@@ -12,21 +12,21 @@ use crate::{meter::ProvideMeter, noop::NoopMeterProvider};
 /// A struct to hold the various types of telemetry providers.
 #[non_exhaustive]
 pub struct TelemetryProvider {
-    meter_provider: Box<dyn ProvideMeter + Send + Sync>,
+    meter_provider: Arc<dyn ProvideMeter + Send + Sync>,
 }
 
 impl TelemetryProvider {
     /// Returns a builder struct for [TelemetryProvider]
     pub fn builder() -> TelemetryProviderBuilder {
         TelemetryProviderBuilder {
-            meter_provider: Box::new(NoopMeterProvider),
+            meter_provider: Arc::new(NoopMeterProvider),
         }
     }
 
     /// Returns a noop [TelemetryProvider]
     pub fn noop() -> TelemetryProvider {
         Self {
-            meter_provider: Box::new(NoopMeterProvider),
+            meter_provider: Arc::new(NoopMeterProvider),
         }
     }
 
@@ -43,21 +43,21 @@ impl TelemetryProvider {
 impl Default for TelemetryProvider {
     fn default() -> Self {
         Self {
-            meter_provider: Box::new(NoopMeterProvider),
+            meter_provider: Arc::new(NoopMeterProvider),
         }
     }
 }
 
 /// A builder for [TelemetryProvider].
 #[non_exhaustive]
 pub struct TelemetryProviderBuilder {
-    meter_provider: Box<dyn ProvideMeter + Send + Sync>,
+    meter_provider: Arc<dyn ProvideMeter + Send + Sync>,
 }
 
 impl TelemetryProviderBuilder {
     /// Set the [ProvideMeter].
-    pub fn meter_provider(mut self, meter_provider: impl ProvideMeter + 'static) -> Self {
-        self.meter_provider = Box::new(meter_provider);
+    pub fn meter_provider(mut self, meter_provider: Arc<impl ProvideMeter + 'static>) -> Self {
+        self.meter_provider = meter_provider;
         self
     }