[Metrics API] Update HistogramBuilder (open-telemetry#2186)

Author: utpilla

opentelemetry-sdk/src/metrics/meter.rs

@@ -277,7 +277,7 @@ impl SdkMeter {
 
     fn create_histogram<T>(
         &self,
-        builder: HistogramBuilder<'_, T>,
+        builder: HistogramBuilder<'_, Histogram<T>>,
         resolver: &InstrumentResolver<'_, T>,
     ) -> Result<Histogram<T>>
     where
@@ -407,12 +407,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/src/metrics/instruments/mod.rs

@@ -93,7 +93,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 +109,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/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())))
     }
 }