Merge branch 'main' into add_attributes_itr

Author: lalitb

examples/metrics-basic/src/main.rs

@@ -5,7 +5,7 @@ use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
 use opentelemetry_sdk::{runtime, Resource};
 use std::error::Error;
 
-fn init_meter_provider() {
+fn init_meter_provider() -> opentelemetry_sdk::metrics::SdkMeterProvider {
     let exporter = opentelemetry_stdout::MetricsExporterBuilder::default()
         // uncomment the below lines to pretty print output.
         //  .with_encoder(|writer, data|
@@ -19,13 +19,14 @@ fn init_meter_provider() {
             "metrics-basic-example",
         )]))
         .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>> {
     // Initialize the MeterProvider with the stdout Exporter.
-    init_meter_provider();
+    let meter_provider = init_meter_provider();
 
     // Create a meter from the above MeterProvider.
     let meter = global::meter("mylibraryname");
@@ -137,6 +138,7 @@ 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();
+    // global::shutdown_meter_provider();
+    meter_provider.shutdown()?;
     Ok(())
 }

opentelemetry-sdk/CHANGELOG.md

@@ -28,6 +28,9 @@
   - After `shutdown`, `LogProcessor` will not process any new logs
 - Moving LogRecord implementation to the SDK. [1702](https://github.com/open-telemetry/opentelemetry-rust/pull/1702).
     - Relocated `LogRecord` struct to SDK, as an implementation for the trait in the API.
+- **Breaking** [#1729](https://github.com/open-telemetry/opentelemetry-rust/pull/1729)
+  - Update the return type of `TracerProvider.span_processors()` from `&Vec<Box<dyn SpanProcessor>>` to `&[Box<dyn SpanProcessor>]`.
+  - Update the return type of `LoggerProvider.log_processors()` from `&Vec<Box<dyn LogProcessor>>` to `&[Box<dyn LogProcessor>]`.
 
 ## v0.22.1
 

opentelemetry-sdk/src/logs/log_emitter.rs

@@ -92,7 +92,7 @@ impl LoggerProvider {
     }
 
     /// Log processors associated with this provider.
-    pub fn log_processors(&self) -> &Vec<Box<dyn LogProcessor>> {
+    pub fn log_processors(&self) -> &[Box<dyn LogProcessor>] {
         &self.inner.processors
     }
 

opentelemetry-sdk/src/trace/provider.rs

@@ -62,7 +62,7 @@ impl TracerProvider {
     }
 
     /// Span processors associated with this provider
-    pub fn span_processors(&self) -> &Vec<Box<dyn SpanProcessor>> {
+    pub fn span_processors(&self) -> &[Box<dyn SpanProcessor>] {
         &self.inner.processors
     }
 

opentelemetry-sdk/src/trace/span.rs

@@ -219,7 +219,7 @@ impl Span {
             data.end_time = opentelemetry::time::now();
         }
 
-        match provider.span_processors().as_slice() {
+        match provider.span_processors() {
             [] => {}
             [processor] => {
                 processor.on_end(build_export_data(

opentelemetry-stdout/CHANGELOG.md

@@ -9,6 +9,7 @@
 - Fix StatusCode in stdout exporter [#1454](https://github.com/open-telemetry/opentelemetry-rust/pull/1454)
 - Add missing event timestamps [#1391](https://github.com/open-telemetry/opentelemetry-rust/pull/1391)
 - Adjusted `chrono` features to reduce number of transitive dependencies. [#1569](https://github.com/open-telemetry/opentelemetry-rust/pull/1569)
+- The default feature now includes logs, metrics and trace.
 
 ## v0.2.0
 

opentelemetry-stdout/Cargo.toml

@@ -19,7 +19,7 @@ rust-version = "1.65"
 default = ["trace", "metrics", "logs"]
 trace = ["opentelemetry/trace", "opentelemetry_sdk/trace", "futures-util"]
 metrics = ["async-trait", "opentelemetry/metrics", "opentelemetry_sdk/metrics"]
-logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "async-trait", "thiserror"]
+logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "async-trait", "thiserror", "opentelemetry_sdk/logs_level_enabled"]
 
 [dependencies]
 async-trait = { workspace = true, optional = true }
@@ -35,4 +35,7 @@ ordered-float = { workspace = true }
 [dev-dependencies]
 opentelemetry = { path = "../opentelemetry", features = ["metrics"] }
 opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["rt-tokio", "metrics"] }
+opentelemetry-appender-tracing = { version = "0.3.0", path = "../opentelemetry-appender-tracing"}
+tracing = { workspace = true, features = ["std"]}
+tracing-subscriber = { workspace = true, features = ["registry", "std"] }
 tokio = { workspace = true, features = ["full"] }

opentelemetry-stdout/examples/basic.rs

@@ -31,6 +31,21 @@ fn init_metrics() {
     global::set_meter_provider(provider);
 }
 
+#[cfg(feature = "logs")]
+fn init_logs() -> opentelemetry_sdk::logs::LoggerProvider {
+    use opentelemetry_appender_tracing::layer;
+    use opentelemetry_sdk::logs::LoggerProvider;
+    use tracing_subscriber::prelude::*;
+
+    let exporter = opentelemetry_stdout::LogExporter::default();
+    let provider: LoggerProvider = LoggerProvider::builder()
+        .with_simple_exporter(exporter)
+        .build();
+    let layer = layer::OpenTelemetryTracingBridge::new(&provider);
+    tracing_subscriber::registry().with(layer).init();
+    provider
+}
+
 #[cfg(feature = "trace")]
 fn emit_span() {
     let tracer = global::tracer("stdout-test");
@@ -50,6 +65,12 @@ fn emit_metrics() {
     c.add(1, &[KeyValue::new("test_key", "test_value")]);
 }
 
+#[cfg(feature = "logs")]
+fn emit_log() {
+    use tracing::error;
+    error!(name: "my-event-name", target: "my-system", event_id = 20, user_name = "otel", user_email = "otel@opentelemetry.io");
+}
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     #[cfg(feature = "trace")]
@@ -58,9 +79,23 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     #[cfg(feature = "metrics")]
     init_metrics();
 
+    #[cfg(feature = "logs")]
+    let logger_provider = init_logs();
+
+    #[cfg(feature = "logs")]
+    emit_log();
+
+    println!(
+        "======================================================================================"
+    );
+
     #[cfg(feature = "trace")]
     emit_span();
 
+    println!(
+        "======================================================================================"
+    );
+
     #[cfg(feature = "metrics")]
     emit_metrics();
 
@@ -70,5 +105,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     #[cfg(feature = "metrics")]
     global::shutdown_meter_provider();
 
+    #[cfg(feature = "logs")]
+    drop(logger_provider);
+
     Ok(())
 }