Rename Logger to Sdk Logger

Author: cijothomas

opentelemetry-proto/src/transform/logs.rs

@@ -222,7 +222,7 @@ mod tests {
     use crate::transform::common::tonic::ResourceAttributesWithSchema;
     use opentelemetry::logs::LogRecord as _;
     use opentelemetry::logs::Logger as _;
-    use opentelemetry::logs::LoggerProvider as _;
+    use opentelemetry::logs::LoggerProvider;
     use opentelemetry::time::now;
     use opentelemetry::InstrumentationScope;
     use opentelemetry_sdk::logs::LogProcessor;

opentelemetry-sdk/benches/log.rs

@@ -20,11 +20,11 @@ use std::collections::HashMap;
 
 use criterion::{criterion_group, criterion_main, Criterion};
 
-use opentelemetry::logs::{AnyValue, LogRecord as _, Logger as _, LoggerProvider as _, Severity};
+use opentelemetry::logs::{AnyValue, LogRecord as _, Logger as _, LoggerProvider, Severity};
 use opentelemetry::trace::Tracer;
 use opentelemetry::trace::TracerProvider as _;
 use opentelemetry::{InstrumentationScope, Key};
-use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, Logger, SdkLoggerProvider};
+use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, SdkLogger, SdkLoggerProvider};
 use opentelemetry_sdk::trace::{Sampler, TracerProvider};
 
 #[derive(Debug)]
@@ -42,7 +42,7 @@ impl LogProcessor for NoopProcessor {
     }
 }
 
-fn log_benchmark_group<F: Fn(&Logger)>(c: &mut Criterion, name: &str, f: F) {
+fn log_benchmark_group<F: Fn(&SdkLogger)>(c: &mut Criterion, name: &str, f: F) {
     let mut group = c.benchmark_group(name);
 
     group.bench_function("no-context", |b| {

opentelemetry-sdk/benches/log_exporter.rs

@@ -16,7 +16,7 @@ use std::sync::Mutex;
 use async_trait::async_trait;
 use criterion::{criterion_group, criterion_main, Criterion};
 
-use opentelemetry::logs::{LogRecord as _, Logger as _, LoggerProvider as _, Severity};
+use opentelemetry::logs::{LogRecord as _, Logger as _, LoggerProvider, Severity};
 use opentelemetry_sdk::logs::LogResult;
 
 use opentelemetry::InstrumentationScope;

opentelemetry-sdk/benches/log_processor.rs

@@ -19,15 +19,15 @@ use std::{
 
 use criterion::{criterion_group, criterion_main, Criterion};
 use opentelemetry::{
-    logs::{LogRecord as _, Logger as _, LoggerProvider as _, Severity},
+    logs::{LogRecord as _, Logger as _, LoggerProvider, Severity},
     InstrumentationScope,
 };
-use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, Logger, SdkLoggerProvider};
+use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, SdkLogger, SdkLoggerProvider};
 
 // Run this benchmark with:
 // cargo bench --bench log_processor
 
-fn create_log_record(logger: &Logger) -> LogRecord {
+fn create_log_record(logger: &SdkLogger) -> LogRecord {
     let mut log_record = logger.create_log_record();
     let now = now();
     log_record.set_observed_timestamp(now);

opentelemetry-sdk/src/logs/log_processor.rs

@@ -71,9 +71,9 @@ pub(crate) const OTEL_BLRP_MAX_EXPORT_BATCH_SIZE: &str = "OTEL_BLRP_MAX_EXPORT_B
 /// Default maximum batch size.
 pub(crate) const OTEL_BLRP_MAX_EXPORT_BATCH_SIZE_DEFAULT: usize = 512;
 
-/// The interface for plugging into a [`Logger`].
+/// The interface for plugging into a [`SdkLogger`].
 ///
-/// [`Logger`]: crate::logs::Logger
+/// [`SdkLogger`]: crate::logs::SdkLogger
 pub trait LogProcessor: Send + Sync + Debug {
     /// Called when a log record is ready to processed and exported.
     ///
@@ -889,7 +889,7 @@ mod tests {
     };
     use opentelemetry::logs::AnyValue;
     use opentelemetry::logs::LogRecord as _;
-    use opentelemetry::logs::{Logger, LoggerProvider as _};
+    use opentelemetry::logs::{Logger, LoggerProvider};
     use opentelemetry::KeyValue;
     use opentelemetry::{InstrumentationScope, Key};
     use std::sync::atomic::{AtomicUsize, Ordering};

opentelemetry-sdk/src/logs/log_processor_with_async_runtime.rs

@@ -304,7 +304,7 @@ mod tests {
     };
     use opentelemetry::logs::AnyValue;
     use opentelemetry::logs::LogRecord as _;
-    use opentelemetry::logs::{Logger, LoggerProvider as _};
+    use opentelemetry::logs::{Logger, LoggerProvider};
     use opentelemetry::KeyValue;
     use opentelemetry::{InstrumentationScope, Key};
     use std::sync::{Arc, Mutex};
@@ -499,7 +499,7 @@ mod tests {
             resource: Arc::new(Mutex::new(None)),
         };
         let processor = SimpleLogProcessor::new(exporter.clone());
-        let _ = LoggerProvider::builder()
+        let _ = SdkLoggerProvider::builder()
             .with_log_processor(processor)
             .with_resource(
                 Resource::builder_empty()
@@ -523,7 +523,7 @@ mod tests {
         };
         let processor =
             BatchLogProcessor::new(exporter.clone(), BatchConfig::default(), runtime::Tokio);
-        let provider = LoggerProvider::builder()
+        let provider = SdkLoggerProvider::builder()
             .with_log_processor(processor)
             .with_resource(
                 Resource::builder_empty()
@@ -693,7 +693,7 @@ mod tests {
             logs: Arc::clone(&second_processor_logs),
         };
 
-        let logger_provider = LoggerProvider::builder()
+        let logger_provider = SdkLoggerProvider::builder()
             .with_log_processor(first_processor)
             .with_log_processor(second_processor)
             .build();
@@ -791,7 +791,7 @@ mod tests {
         };
         let processor =
             BatchLogProcessor::new(exporter.clone(), BatchConfig::default(), runtime::Tokio);
-        let provider = LoggerProvider::builder()
+        let provider = SdkLoggerProvider::builder()
             .with_log_processor(processor)
             .with_resource(Resource::new(vec![
                 KeyValue::new("k1", "v1"),

opentelemetry-sdk/src/logs/logger_provider.rs

@@ -49,7 +49,7 @@ pub struct SdkLoggerProvider {
 }
 
 impl opentelemetry::logs::LoggerProvider for SdkLoggerProvider {
-    type Logger = Logger;
+    type Logger = SdkLogger;
 
     fn logger(&self, name: impl Into<Cow<'static, str>>) -> Self::Logger {
         let scope = InstrumentationScope::builder(name).build();
@@ -63,7 +63,7 @@ impl opentelemetry::logs::LoggerProvider for SdkLoggerProvider {
                 name: "LoggerProvider.NoOpLoggerReturned",
                 logger_name = scope.name(),
             );
-            return Logger::new(scope, noop_logger_provider().clone());
+            return SdkLogger::new(scope, noop_logger_provider().clone());
         }
         if scope.name().is_empty() {
             otel_info!(name: "LoggerNameEmpty",  message = "Logger name is empty; consider providing a meaningful name. Logger will function normally and the provided name will be used as-is.");
@@ -72,7 +72,7 @@ impl opentelemetry::logs::LoggerProvider for SdkLoggerProvider {
             name: "LoggerProvider.NewLoggerReturned",
             logger_name = scope.name(),
         );
-        Logger::new(scope, self.clone())
+        SdkLogger::new(scope, self.clone())
     }
 }
 
@@ -273,14 +273,14 @@ impl LoggerProviderBuilder {
 /// The object for emitting [`LogRecord`]s.
 ///
 /// [`LogRecord`]: opentelemetry::logs::LogRecord
-pub struct Logger {
+pub struct SdkLogger {
     scope: InstrumentationScope,
     provider: SdkLoggerProvider,
 }
 
-impl Logger {
+impl SdkLogger {
     pub(crate) fn new(scope: InstrumentationScope, provider: SdkLoggerProvider) -> Self {
-        Logger { scope, provider }
+        SdkLogger { scope, provider }
     }
 
     #[cfg(test)]
@@ -289,7 +289,7 @@ impl Logger {
     }
 }
 
-impl opentelemetry::logs::Logger for Logger {
+impl opentelemetry::logs::Logger for SdkLogger {
     type LogRecord = LogRecord;
 
     fn create_log_record(&self) -> Self::LogRecord {
@@ -342,7 +342,7 @@ mod tests {
     };
 
     use super::*;
-    use opentelemetry::logs::{AnyValue, LogRecord as _, Logger as _, LoggerProvider as _};
+    use opentelemetry::logs::{AnyValue, LogRecord as _, Logger as _, LoggerProvider};
     use opentelemetry::trace::{SpanId, TraceId, Tracer as _, TracerProvider as _};
     use opentelemetry::{Key, KeyValue, Value};
     use std::fmt::{Debug, Formatter};

opentelemetry-sdk/src/logs/mod.rs

@@ -19,7 +19,7 @@ pub use log_processor::{
     BatchConfig, BatchConfigBuilder, BatchLogProcessor, BatchLogProcessorBuilder, LogProcessor,
     SimpleLogProcessor,
 };
-pub use logger_provider::{Logger, LoggerProviderBuilder, SdkLoggerProvider};
+pub use logger_provider::{LoggerProviderBuilder, SdkLogger, SdkLoggerProvider};
 pub use record::{LogRecord, TraceContext};
 
 #[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
@@ -31,7 +31,7 @@ mod tests {
     use super::*;
     use crate::Resource;
     use opentelemetry::logs::LogRecord;
-    use opentelemetry::logs::{Logger, LoggerProvider as _, Severity};
+    use opentelemetry::logs::{Logger, LoggerProvider, Severity};
     use opentelemetry::InstrumentationScope;
     use opentelemetry::{logs::AnyValue, Key, KeyValue};
     use std::borrow::Borrow;