Merge branch 'main' into switch_batch_log_to_background_thread

Author: ThomsonTan

examples/logs-basic/src/main.rs

@@ -7,11 +7,7 @@ use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
 
 fn main() {
     // Setup LoggerProvider with a stdout exporter
-    let exporter = opentelemetry_stdout::LogExporterBuilder::default()
-        // uncomment the below lines to pretty print output.
-        // .with_encoder(|writer, data|
-        //    Ok(serde_json::to_writer_pretty(writer, &data).unwrap()))
-        .build();
+    let exporter = opentelemetry_stdout::LogExporter::default();
     let logger_provider = LoggerProvider::builder()
         .with_resource(Resource::new([KeyValue::new(
             SERVICE_NAME,

examples/self-diagnostics/src/main.rs

@@ -12,7 +12,6 @@ use once_cell::sync::Lazy;
 use std::collections::HashSet;
 use std::sync::{Arc, Mutex};
 
-use ctrlc;
 use std::sync::mpsc::channel;
 
 struct ErrorState {

examples/tracing-grpc/src/client.rs

@@ -4,7 +4,7 @@ use opentelemetry::{global, propagation::Injector};
 use opentelemetry_sdk::{
     propagation::TraceContextPropagator, runtime::Tokio, trace::TracerProvider,
 };
-use opentelemetry_stdout::SpanExporterBuilder;
+use opentelemetry_stdout::SpanExporter;
 
 use opentelemetry::{
     trace::{SpanKind, TraceContextExt, Tracer},
@@ -15,15 +15,7 @@ fn init_tracer() {
     global::set_text_map_propagator(TraceContextPropagator::new());
     // Install stdout exporter pipeline to be able to retrieve the collected spans.
     let provider = TracerProvider::builder()
-        .with_batch_exporter(
-            SpanExporterBuilder::default()
-                .with_encoder(|writer, data| {
-                    serde_json::to_writer_pretty(writer, &data).unwrap();
-                    Ok(())
-                })
-                .build(),
-            Tokio,
-        )
+        .with_batch_exporter(SpanExporter::default(), Tokio)
         .build();
 
     global::set_tracer_provider(provider);

examples/tracing-grpc/src/server.rs

@@ -8,22 +8,14 @@ use opentelemetry::{
 use opentelemetry_sdk::{
     propagation::TraceContextPropagator, runtime::Tokio, trace::TracerProvider,
 };
-use opentelemetry_stdout::SpanExporterBuilder;
+use opentelemetry_stdout::SpanExporter;
 use tonic::{transport::Server, Request, Response, Status};
 
 fn init_tracer() {
     global::set_text_map_propagator(TraceContextPropagator::new());
     // Install stdout exporter pipeline to be able to retrieve the collected spans.
     let provider = TracerProvider::builder()
-        .with_batch_exporter(
-            SpanExporterBuilder::default()
-                .with_encoder(|writer, data| {
-                    serde_json::to_writer_pretty(writer, &data).unwrap();
-                    Ok(())
-                })
-                .build(),
-            Tokio,
-        )
+        .with_batch_exporter(SpanExporter::default(), Tokio)
         .build();
 
     global::set_tracer_provider(provider);

opentelemetry-appender-log/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## vNext
 
+## v0.25.0
+
+- Update `opentelemetry` dependency version to 0.25
+- Starting with this version, this crate will align with `opentelemetry` crate
+  on major,minor versions.
+
 ## v0.5.0
 
 - [1869](https://github.com/open-telemetry/opentelemetry-rust/pull/1869) Utilize the `LogRecord::set_target()` method to pass the log target to the SDK.

opentelemetry-appender-log/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "opentelemetry-appender-log"
-version = "0.5.0"
+version = "0.25.0"
 description = "An OpenTelemetry appender for the log crate"
 homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-log"
 repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-log"
@@ -11,7 +11,7 @@ rust-version = "1.65"
 edition = "2021"
 
 [dependencies]
-opentelemetry = { version = "0.24", path = "../opentelemetry", features = ["logs"]}
+opentelemetry = { version = "0.25", path = "../opentelemetry", features = ["logs"]}
 log = { workspace = true, features = ["kv", "std"]}
 serde = { workspace = true, optional = true, features = ["std"] }
 

opentelemetry-appender-log/src/lib.rs

@@ -12,7 +12,7 @@
 //! # #[tokio::main] async fn main() {
 //! # use opentelemetry_sdk::logs::{BatchLogProcessor, LoggerProvider};
 //! # use opentelemetry_sdk::runtime;
-//! let exporter = opentelemetry_stdout::LogExporterBuilder::default().build();
+//! let exporter = opentelemetry_stdout::LogExporter::default();
 //!
 //! let logger_provider = LoggerProvider::builder()
 //!     .with_log_processor(BatchLogProcessor::builder(exporter, runtime::Tokio).build())
@@ -27,7 +27,7 @@
 //! # use opentelemetry_sdk::logs::{BatchLogProcessor, LoggerProvider};
 //! # use opentelemetry_sdk::runtime;
 //! # use opentelemetry_appender_log::OpenTelemetryLogBridge;
-//! # let exporter = opentelemetry_stdout::LogExporterBuilder::default().build();
+//! # let exporter = opentelemetry_stdout::LogExporter::default();
 //! # let logger_provider = LoggerProvider::builder()
 //! #     .with_log_processor(BatchLogProcessor::builder(exporter, runtime::Tokio).build())
 //! #     .build();

opentelemetry-appender-tracing/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## vNext
 
+## v0.25.0
+
+- Update `opentelemetry` dependency version to 0.25
+- Starting with this version, this crate will align with `opentelemetry` crate
+  on major,minor versions.
 - Reduce heap allocation by using `&'static str` for `SeverityText`.
 
 ## v0.5.0

opentelemetry-appender-tracing/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "opentelemetry-appender-tracing"
-version = "0.5.0"
+version = "0.25.0"
 edition = "2021"
 description = "An OpenTelemetry log appender for the tracing crate"
 homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-tracing"
@@ -12,7 +12,7 @@ rust-version = "1.65"
 
 [dependencies]
 log = { workspace = true, optional = true }
-opentelemetry = { version = "0.24", path = "../opentelemetry", features = ["logs"] }
+opentelemetry = { version = "0.25", path = "../opentelemetry", features = ["logs"] }
 tracing = { workspace = true, features = ["std"]}
 tracing-core = { workspace = true }
 tracing-log = { version = "0.2", optional = true }

opentelemetry-appender-tracing/benches/logs.rs

@@ -10,16 +10,16 @@
     | noop_layer_disabled         | 12 ns       |
     | noop_layer_enabled          | 25 ns       |
     | ot_layer_disabled           | 19 ns       |
-    | ot_layer_enabled            | 250 ns      |
+    | ot_layer_enabled            | 196 ns      |
 */
 
 use async_trait::async_trait;
 use criterion::{criterion_group, criterion_main, Criterion};
 use opentelemetry::logs::LogResult;
-use opentelemetry::KeyValue;
+use opentelemetry::{InstrumentationLibrary, KeyValue};
 use opentelemetry_appender_tracing::layer as tracing_layer;
-use opentelemetry_sdk::export::logs::{LogData, LogExporter};
-use opentelemetry_sdk::logs::{LogProcessor, LoggerProvider};
+use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
+use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LoggerProvider};
 use opentelemetry_sdk::Resource;
 use pprof::criterion::{Output, PProfProfiler};
 use tracing::error;
@@ -34,7 +34,7 @@ struct NoopExporter {
 
 #[async_trait]
 impl LogExporter for NoopExporter {
-    async fn export<'a>(&mut self, _: Vec<std::borrow::Cow<'a, LogData>>) -> LogResult<()> {
+    async fn export(&mut self, _: LogBatch<'_>) -> LogResult<()> {
         LogResult::Ok(())
     }
 
@@ -55,7 +55,7 @@ impl NoopProcessor {
 }
 
 impl LogProcessor for NoopProcessor {
-    fn emit(&self, _: &mut LogData) {
+    fn emit(&self, _: &mut LogRecord, _: &InstrumentationLibrary) {
         // no-op
     }