Merge branch 'main' into cijothomas/metric-api-instrument-builder-sync

Author: cijothomas

opentelemetry-sdk/src/metrics/meter_provider.rs

@@ -253,6 +253,7 @@ mod tests {
     use crate::testing::metrics::metric_reader::TestMetricReader;
     use crate::Resource;
     use opentelemetry::global;
+    use opentelemetry::metrics::MeterProvider;
     use opentelemetry::{Key, KeyValue, Value};
     use std::env;
 
@@ -433,4 +434,28 @@ mod tests {
         // Now the shutdown should be invoked
         assert!(reader.is_shutdown());
     }
+
+    #[test]
+    fn same_meter_reused_same_scope() {
+        let provider = super::SdkMeterProvider::builder().build();
+        let _meter1 = provider.meter("test");
+        let _meter2 = provider.meter("test");
+        assert_eq!(provider.inner.meters.lock().unwrap().len(), 1);
+        let _meter3 =
+            provider.versioned_meter("test", Some("1.0.0"), Some("http://example.com"), None);
+        let _meter4 =
+            provider.versioned_meter("test", Some("1.0.0"), Some("http://example.com"), None);
+        let _meter5 =
+            provider.versioned_meter("test", Some("1.0.0"), Some("http://example.com"), None);
+        assert_eq!(provider.inner.meters.lock().unwrap().len(), 2);
+
+        // the below are different meters, as meter names are case sensitive
+        let _meter6 =
+            provider.versioned_meter("ABC", Some("1.0.0"), Some("http://example.com"), None);
+        let _meter7 =
+            provider.versioned_meter("Abc", Some("1.0.0"), Some("http://example.com"), None);
+        let _meter8 =
+            provider.versioned_meter("abc", Some("1.0.0"), Some("http://example.com"), None);
+        assert_eq!(provider.inner.meters.lock().unwrap().len(), 5);
+    }
 }