address comments

Author: TommyCpp

opentelemetry-sdk/src/logs/log_emitter.rs

@@ -78,20 +78,6 @@ impl opentelemetry::logs::LoggerProvider for LoggerProvider {
         }
         Logger::new(library, self.clone())
     }
-
-    /// Shuts down this `LoggerProvider`
-    fn shutdown(&self) -> Vec<LogResult<()>> {
-        // mark itself as already shutdown
-        self.is_shutdown
-            .store(true, std::sync::atomic::Ordering::Relaxed);
-        // propagate the shutdown signal to processors
-        // it's up to the processor to properly block new logs after shutdown
-        self.inner
-            .processors
-            .iter()
-            .map(|processor| processor.shutdown())
-            .collect()
-    }
 }
 
 impl LoggerProvider {
@@ -117,6 +103,20 @@ impl LoggerProvider {
             .map(|processor| processor.force_flush())
             .collect()
     }
+
+    /// Shuts down this `LoggerProvider`
+    pub fn shutdown(&self) -> Vec<LogResult<()>> {
+        // mark itself as already shutdown
+        self.is_shutdown
+            .store(true, std::sync::atomic::Ordering::Relaxed);
+        // propagate the shutdown signal to processors
+        // it's up to the processor to properly block new logs after shutdown
+        self.inner
+            .processors
+            .iter()
+            .map(|processor| processor.shutdown())
+            .collect()
+    }
 }
 
 #[derive(Debug)]

opentelemetry-sdk/src/testing/logs/in_memory_exporter.rs

@@ -91,13 +91,6 @@ impl InMemoryLogsExporterBuilder {
         }
     }
 
-    /// If set, the records will not be [`InMemoryLogsExporter::reset`] on shutdown.
-    pub fn keep_records_on_shutdown(self) -> Self {
-        Self {
-            reset_on_shutdown: false,
-        }
-    }
-
     /// Creates a new instance of `InMemoryLogsExporter`.
     ///
     pub fn build(&self) -> InMemoryLogsExporter {
@@ -106,6 +99,14 @@ impl InMemoryLogsExporterBuilder {
             should_reset_on_shutdown: self.reset_on_shutdown,
         }
     }
+
+    /// If set, the records will not be [`InMemoryLogsExporter::reset`] on shutdown.
+    #[cfg(test)]
+    pub(crate) fn keep_records_on_shutdown(self) -> Self {
+        Self {
+            reset_on_shutdown: false,
+        }
+    }
 }
 
 impl InMemoryLogsExporter {

opentelemetry/src/global/logs.rs

@@ -6,7 +6,6 @@ use std::{
 
 use once_cell::sync::Lazy;
 
-use crate::logs::LogResult;
 use crate::{
     logs::{Logger, LoggerProvider, NoopLoggerProvider},
     InstrumentationLibrary,
@@ -26,9 +25,6 @@ pub trait ObjectSafeLoggerProvider {
         &self,
         library: Arc<InstrumentationLibrary>,
     ) -> Box<dyn Logger + Send + Sync + 'static>;
-
-    /// shutdown the logger provider, logs emitted after this will not be processed.
-    fn shutdown(&self) -> Vec<LogResult<()>>;
 }
 
 impl<L, P> ObjectSafeLoggerProvider for P
@@ -42,10 +38,6 @@ where
     ) -> Box<dyn Logger + Send + Sync + 'static> {
         Box::new(self.library_logger(library))
     }
-
-    fn shutdown(&self) -> Vec<LogResult<()>> {
-        self.shutdown()
-    }
 }
 
 pub struct BoxedLogger(Box<dyn Logger + Send + Sync + 'static>);
@@ -98,10 +90,6 @@ impl LoggerProvider for GlobalLoggerProvider {
     fn library_logger(&self, library: Arc<InstrumentationLibrary>) -> Self::Logger {
         BoxedLogger(self.provider.boxed_logger(library))
     }
-
-    fn shutdown(&self) -> Vec<LogResult<()>> {
-        self.provider.shutdown()
-    }
 }
 
 static GLOBAL_LOGGER_PROVIDER: Lazy<RwLock<GlobalLoggerProvider>> =
@@ -144,6 +132,5 @@ where
 
 /// Shut down the current global [`LoggerProvider`].
 pub fn shutdown_logger_provider() {
-    let logger_provider = set_logger_provider(NoopLoggerProvider::new());
-    let _ = ObjectSafeLoggerProvider::shutdown(&logger_provider);
+    let _ = set_logger_provider(NoopLoggerProvider::new());
 }

opentelemetry/src/logs/logger.rs

@@ -1,9 +1,6 @@
 use std::{borrow::Cow, sync::Arc};
 
-use crate::{
-    logs::{LogRecord, LogResult},
-    InstrumentationLibrary, InstrumentationLibraryBuilder, KeyValue,
-};
+use crate::{logs::LogRecord, InstrumentationLibrary, InstrumentationLibraryBuilder, KeyValue};
 
 #[cfg(feature = "logs_level_enabled")]
 use super::Severity;
@@ -117,15 +114,6 @@ pub trait LoggerProvider {
     fn logger(&self, name: impl Into<Cow<'static, str>>) -> Self::Logger {
         self.logger_builder(name).build()
     }
-
-    /// Shuts down this `LoggerProvider`
-    /// After shutdown the logger provider cannot be used to create new loggers.
-    /// The implementation should propagate the shutdown signal down to ensure no new logs are emitted.
-    /// Shutdown the logger provider. Noop logger will be returned after shutdown.
-    ///
-    /// Note that `shutdown` doesn't mean `Drop`(though `Drop` can call `shutdown`).
-    /// It simply means the provider will emit anything in the buffer(if applicable) and stop processing
-    fn shutdown(&self) -> Vec<LogResult<()>>;
 }
 
 #[derive(Debug)]

opentelemetry/src/logs/noop.rs

@@ -1,6 +1,5 @@
 use std::{borrow::Cow, sync::Arc};
 
-use crate::logs::LogResult;
 use crate::{
     logs::{LogRecord, Logger, LoggerProvider},
     InstrumentationLibrary, KeyValue,
@@ -33,10 +32,6 @@ impl LoggerProvider for NoopLoggerProvider {
     ) -> Self::Logger {
         NoopLogger(())
     }
-
-    fn shutdown(&self) -> Vec<LogResult<()>> {
-        vec![]
-    }
 }
 
 /// A no-op implementation of a [`Logger`]