Merge branch 'main' into cijothomas/release-may-2024

Author: cijothomas

examples/metrics-advanced/src/main.rs

@@ -8,7 +8,7 @@ use opentelemetry_sdk::metrics::{
 use opentelemetry_sdk::{runtime, Resource};
 use std::error::Error;
 
-fn init_meter_provider() {
+fn init_meter_provider() -> opentelemetry_sdk::metrics::SdkMeterProvider {
     // for example 1
     let my_view_rename_and_unit = |i: &Instrument| {
         if i.name == "my_histogram" {
@@ -61,12 +61,13 @@ fn init_meter_provider() {
         .with_view(my_view_drop_attributes)
         .with_view(my_view_change_aggregation)
         .build();
-    global::set_meter_provider(provider);
+    global::set_meter_provider(provider.clone());
+    provider
 }
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
-    init_meter_provider();
+    let meter_provider = init_meter_provider();
     let meter = global::meter("mylibraryname");
 
     // Example 1 - Rename metric using View.
@@ -153,6 +154,6 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     // Metrics are exported by default every 30 seconds when using stdout exporter,
     // however shutting down the MeterProvider here instantly flushes
     // the metrics, instead of waiting for the 30 sec interval.
-    global::shutdown_meter_provider();
+    meter_provider.shutdown()?;
     Ok(())
 }

examples/metrics-basic/src/main.rs

@@ -138,7 +138,6 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
     // Metrics are exported by default every 30 seconds when using stdout exporter,
     // however shutting down the MeterProvider here instantly flushes
     // the metrics, instead of waiting for the 30 sec interval.
-    // global::shutdown_meter_provider();
     meter_provider.shutdown()?;
     Ok(())
 }

opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

@@ -44,7 +44,7 @@ fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
         .install_batch(opentelemetry_sdk::runtime::Tokio)
 }
 
-fn init_metrics() -> Result<(), MetricsError> {
+fn init_metrics() -> Result<opentelemetry_sdk::metrics::SdkMeterProvider, MetricsError> {
     let export_config = opentelemetry_otlp::ExportConfig {
         endpoint: "http://localhost:4318/v1/metrics".to_string(),
         ..opentelemetry_otlp::ExportConfig::default()
@@ -57,7 +57,10 @@ fn init_metrics() -> Result<(), MetricsError> {
                 .with_export_config(export_config),
         )
         .build();
-    provider.map(|_| ())
+    match provider {
+        Ok(provider) => Ok(provider),
+        Err(err) => Err(err),
+    }
 }
 
 const LEMONS_KEY: Key = Key::from_static_str("ex.com/lemons");
@@ -88,6 +91,8 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
         result.err()
     );
 
+    let meter_provider = result.unwrap();
+
     // Opentelemetry will not provide a global API to manage the logger provider. Application users must manage the lifecycle of the logger provider on their own. Dropping logger providers will disable log emitting.
     let logger_provider = init_logs().unwrap();
 
@@ -120,7 +125,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
 
     global::shutdown_tracer_provider();
     logger_provider.shutdown();
-    global::shutdown_meter_provider();
+    meter_provider.shutdown()?;
 
     Ok(())
 }

opentelemetry-otlp/examples/basic-otlp/src/main.rs

@@ -31,7 +31,7 @@ fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
         .install_batch(runtime::Tokio)
 }
 
-fn init_metrics() -> Result<(), MetricsError> {
+fn init_metrics() -> Result<opentelemetry_sdk::metrics::SdkMeterProvider, MetricsError> {
     let export_config = ExportConfig {
         endpoint: "http://localhost:4317".to_string(),
         ..ExportConfig::default()
@@ -49,7 +49,7 @@ fn init_metrics() -> Result<(), MetricsError> {
         )]))
         .build();
     match provider {
-        Ok(_provider) => Ok(()),
+        Ok(provider) => Ok(provider),
         Err(err) => Err(err),
     }
 }
@@ -103,8 +103,9 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
         "Init metrics failed with error: {:?}",
         result.err()
     );
+    let meter_provider = result.unwrap();
 
-    // Initialize logs, which sets the global loggerprovider.
+    // Initialize logs and save the logger_provider.
     let logger_provider = init_logs().unwrap();
 
     // Create a new OpenTelemetryLogBridge using the above LoggerProvider.
@@ -148,7 +149,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
 
     global::shutdown_tracer_provider();
     logger_provider.shutdown();
-    global::shutdown_meter_provider();
+    meter_provider.shutdown()?;
 
     Ok(())
 }

opentelemetry-sdk/src/logs/mod.rs

@@ -20,6 +20,7 @@ mod tests {
     use opentelemetry::logs::LogRecord;
     use opentelemetry::logs::{Logger, LoggerProvider as _, Severity};
     use opentelemetry::{logs::AnyValue, Key, KeyValue};
+    use std::collections::HashMap;
 
     #[test]
     fn logging_sdk_test() {
@@ -34,10 +35,32 @@ mod tests {
         let mut log_record = logger.create_log_record();
         log_record.set_severity_number(Severity::Error);
         log_record.set_severity_text("Error".into());
+
+        // Adding attributes using a vector with explicitly constructed Key and AnyValue objects.
         log_record.add_attributes(vec![
-            (Key::new("key1"), "value1".into()),
-            (Key::new("key2"), "value2".into()),
+            (Key::new("key1"), AnyValue::from("value1")),
+            (Key::new("key2"), AnyValue::from("value2")),
+        ]);
+
+        // Adding attributes using an array with explicitly constructed Key and AnyValue objects.
+        log_record.add_attributes([
+            (Key::new("key3"), AnyValue::from("value3")),
+            (Key::new("key4"), AnyValue::from("value4")),
         ]);
+
+        // Adding attributes using a vector with tuple auto-conversion to Key and AnyValue.
+        log_record.add_attributes(vec![("key5", "value5"), ("key6", "value6")]);
+
+        // Adding attributes using an array with tuple auto-conversion to Key and AnyValue.
+        log_record.add_attributes([("key7", "value7"), ("key8", "value8")]);
+
+        // Adding Attributes from a HashMap
+        let mut attributes_map = HashMap::new();
+        attributes_map.insert("key9", "value9");
+        attributes_map.insert("key10", "value10");
+
+        log_record.add_attributes(attributes_map);
+
         logger.emit(log_record);
 
         // Assert
@@ -55,7 +78,13 @@ mod tests {
             .attributes
             .clone()
             .expect("Attributes are expected");
-        assert_eq!(attributes.len(), 2);
+        assert_eq!(attributes.len(), 10);
+        for i in 1..=10 {
+            assert!(log.record.attributes.clone().unwrap().contains(&(
+                Key::new(format!("key{}", i)),
+                AnyValue::String(format!("value{}", i).into())
+            )));
+        }
     }
 
     #[test]

opentelemetry-sdk/src/logs/record.rs

@@ -62,8 +62,15 @@ impl opentelemetry::logs::LogRecord for LogRecord {
         self.body = Some(body);
     }
 
-    fn add_attributes(&mut self, attributes: Vec<(Key, AnyValue)>) {
-        self.attributes = Some(attributes);
+    fn add_attributes<I, K, V>(&mut self, attributes: I)
+    where
+        I: IntoIterator<Item = (K, V)>,
+        K: Into<Key>,
+        V: Into<AnyValue>,
+    {
+        for (key, value) in attributes.into_iter() {
+            self.add_attribute(key, value);
+        }
     }
 
     fn add_attribute<K, V>(&mut self, key: K, value: V)

opentelemetry-sdk/src/metrics/meter_provider.rs

@@ -397,13 +397,13 @@ mod tests {
         let provider = super::SdkMeterProvider::builder()
             .with_reader(reader.clone())
             .build();
-        global::set_meter_provider(provider);
+        global::set_meter_provider(provider.clone());
         assert!(!reader.is_shutdown());
         // create a meter and an instrument
         let meter = global::meter("test");
         let counter = meter.u64_counter("test_counter").init();
         // no need to drop a meter for meter_provider shutdown
-        global::shutdown_meter_provider();
+        provider.shutdown().unwrap();
         assert!(reader.is_shutdown());
         // TODO Fix: the instrument is still available, and can be used.
         // While the reader is shutdown, and no collect is happening

opentelemetry-stdout/examples/basic.rs

@@ -24,11 +24,12 @@ fn init_trace() {
 }
 
 #[cfg(feature = "metrics")]
-fn init_metrics() {
+fn init_metrics() -> opentelemetry_sdk::metrics::SdkMeterProvider {
     let exporter = opentelemetry_stdout::MetricsExporter::default();
     let reader = PeriodicReader::builder(exporter, runtime::Tokio).build();
     let provider = SdkMeterProvider::builder().with_reader(reader).build();
-    global::set_meter_provider(provider);
+    global::set_meter_provider(provider.clone());
+    provider
 }
 
 #[cfg(feature = "logs")]
@@ -77,7 +78,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     init_trace();
 
     #[cfg(feature = "metrics")]
-    init_metrics();
+    let meter_provider = init_metrics();
 
     #[cfg(feature = "logs")]
     let logger_provider = init_logs();
@@ -103,7 +104,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     global::shutdown_tracer_provider();
 
     #[cfg(feature = "metrics")]
-    global::shutdown_meter_provider();
+    meter_provider.shutdown()?;
 
     #[cfg(feature = "logs")]
     drop(logger_provider);

opentelemetry/src/logs/noop.rs

@@ -57,7 +57,13 @@ impl LogRecord for NoopLogRecord {
     #[inline]
     fn set_body(&mut self, _body: AnyValue) {}
     #[inline]
-    fn add_attributes(&mut self, _attributes: Vec<(Key, AnyValue)>) {}
+    fn add_attributes<I, K, V>(&mut self, _attributes: I)
+    where
+        I: IntoIterator<Item = (K, V)>,
+        K: Into<Key>,
+        V: Into<AnyValue>,
+    {
+    }
     #[inline]
     fn add_attribute<K, V>(&mut self, _key: K, _value: V)
     where

opentelemetry/src/logs/record.rs

@@ -26,7 +26,11 @@ pub trait LogRecord {
     fn set_body(&mut self, body: AnyValue);
 
     /// Adds multiple attributes.
-    fn add_attributes(&mut self, attributes: Vec<(Key, AnyValue)>);
+    fn add_attributes<I, K, V>(&mut self, attributes: I)
+    where
+        I: IntoIterator<Item = (K, V)>,
+        K: Into<Key>,
+        V: Into<AnyValue>;
 
     /// Adds a single attribute.
     fn add_attribute<K, V>(&mut self, key: K, value: V)