Fix post rebase

scottgerring · scottgerring · commit 1ef8a0274606 · 2025-02-05T08:38:37.000-05:00
diff --git a/examples/metrics-basic/src/main.rs b/examples/metrics-basic/src/main.rs
@@ -152,19 +152,19 @@ async fn main() -> Result<(), Box<dyn Error>> {
     //     Ok(_) => println!("MeterProvider shutdown successfully"),
     //     Err(e) => {
     //         match e {
-    //             opentelemetry_sdk::error::ShutdownError::InternalFailure(message) => {
+    //             opentelemetry_sdk::error::OTelSdkError::InternalFailure(message) => {
     //                 // This indicates some internal failure during shutdown. The
     //                 // error message is intended for logging purposes only and
     //                 // should not be used to make programmatic decisions.
     //                 println!("MeterProvider shutdown failed: {}", message)
     //             }
-    //             opentelemetry_sdk::error::ShutdownError::AlreadyShutdown => {
+    //             opentelemetry_sdk::error::OTelSdkError::AlreadyShutdown => {
     //                 // This indicates some user code tried to shutdown
     //                 // elsewhere. user need to review their code to ensure
     //                 // shutdown is called only once.
     //                 println!("MeterProvider already shutdown")
     //             }
-    //             opentelemetry_sdk::error::ShutdownError::Timeout(e) => {
+    //             opentelemetry_sdk::error::OTelSdkError::Timeout(e) => {
     //                 // This indicates the shutdown timed out, and a good hint to
     //                 // user to increase the timeout. (Shutdown method does not
     //                 // allow custom timeout today, but that is temporary)
diff --git a/opentelemetry-otlp/src/exporter/http/logs.rs b/opentelemetry-otlp/src/exporter/http/logs.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use http::{header::CONTENT_TYPE, Method};
 use opentelemetry::otel_debug;
-use opentelemetry_sdk::error::{ShutdownError, ShutdownResult};
+use opentelemetry_sdk::error::{OTelSdkError, OTelSdkResult};
 use opentelemetry_sdk::logs::{LogBatch, LogExporter};
 use opentelemetry_sdk::logs::{LogError, LogResult};
 
@@ -54,10 +54,10 @@ impl LogExporter for OtlpHttpClient {
         }
     }
 
-    fn shutdown(&mut self) -> ShutdownResult {
+    fn shutdown(&mut self) -> OTelSdkResult {
         self.client
             .lock()
-            .map_err(|e| ShutdownError::InternalFailure(format!("Failed to acquire lock: {}", e)))?
+            .map_err(|e| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {}", e)))?
             .take();
         Ok(())
     }
diff --git a/opentelemetry-otlp/src/exporter/tonic/logs.rs b/opentelemetry-otlp/src/exporter/tonic/logs.rs
@@ -3,7 +3,7 @@ use opentelemetry::otel_debug;
 use opentelemetry_proto::tonic::collector::logs::v1::{
     logs_service_client::LogsServiceClient, ExportLogsServiceRequest,
 };
-use opentelemetry_sdk::error::ShutdownError;
+use opentelemetry_sdk::error::OTelSdkResult;
 use opentelemetry_sdk::logs::{LogBatch, LogExporter};
 use opentelemetry_sdk::logs::{LogError, LogResult};
 use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Channel, Request};
@@ -93,7 +93,7 @@ impl LogExporter for TonicLogsClient {
         }
     }
 
-    fn shutdown(&mut self) -> Result<(), ShutdownError> {
+    fn shutdown(&mut self) -> OTelSdkResult {
         let _ = self.inner.take();
         Ok(())
     }
diff --git a/opentelemetry-sdk/src/logs/export.rs b/opentelemetry-sdk/src/logs/export.rs
@@ -1,5 +1,5 @@
 //! Log exporters
-use crate::error::ShutdownResult;
+use crate::error::OTelSdkResult;
 use crate::logs::LogRecord;
 use crate::logs::{LogError, LogResult};
 use crate::Resource;
@@ -137,7 +137,7 @@ pub trait LogExporter: Send + Sync + Debug {
     ) -> impl std::future::Future<Output = LogResult<()>> + Send;
 
     /// Shuts down the exporter.
-    fn shutdown(&mut self) -> ShutdownResult {
+    fn shutdown(&mut self) -> OTelSdkResult {
         Ok(())
     }
     #[cfg(feature = "spec_unstable_logs_enabled")]
diff --git a/opentelemetry-sdk/src/logs/in_memory_exporter.rs b/opentelemetry-sdk/src/logs/in_memory_exporter.rs
@@ -1,4 +1,4 @@
-use crate::error::ShutdownResult;
+use crate::error::OTelSdkResult;
 use crate::logs::LogRecord;
 use crate::logs::{LogBatch, LogError, LogExporter, LogResult};
 use crate::Resource;
@@ -199,7 +199,7 @@ impl LogExporter for InMemoryLogExporter {
         }
     }
 
-    fn shutdown(&mut self) -> ShutdownResult {
+    fn shutdown(&mut self) -> OTelSdkResult {
         if self.should_reset_on_shutdown {
             self.reset();
         }
diff --git a/opentelemetry-sdk/src/logs/log_processor.rs b/opentelemetry-sdk/src/logs/log_processor.rs
@@ -32,7 +32,7 @@
 //! ```
 
 use crate::{
-    error::{ShutdownError, ShutdownResult},
+    error::{OTelSdkError, OTelSdkResult},
     logs::{ExportResult, LogBatch, LogError, LogExporter, LogRecord, LogResult},
     Resource,
 };
@@ -93,7 +93,7 @@ pub trait LogProcessor: Send + Sync + Debug {
     /// Shuts down the processor.
     /// After shutdown returns the log processor should stop processing any logs.
     /// It's up to the implementation on when to drop the LogProcessor.
-    fn shutdown(&self) -> ShutdownResult;
+    fn shutdown(&self) -> OTelSdkResult;
 
     #[cfg(feature = "spec_unstable_logs_enabled")]
     /// Check if logging is enabled
@@ -190,12 +190,12 @@ impl<T: LogExporter> LogProcessor for SimpleLogProcessor<T> {
         Ok(())
     }
 
-    fn shutdown(&self) -> ShutdownResult {
+    fn shutdown(&self) -> OTelSdkResult {
         self.is_shutdown
             .store(true, std::sync::atomic::Ordering::Relaxed);
         self.exporter
             .lock()
-            .map_err(|e| ShutdownError::InternalFailure(format!("Failed to acquire lock: {}", e)))?
+            .map_err(|e| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {}", e)))?
             .shutdown()?;
         Ok(())
     }
@@ -411,7 +411,7 @@ impl LogProcessor for BatchLogProcessor {
         }
     }
 
-    fn shutdown(&self) -> ShutdownResult {
+    fn shutdown(&self) -> OTelSdkResult {
         let dropped_logs = self.dropped_logs_count.load(Ordering::Relaxed);
         let max_queue_size = self.max_queue_size;
         if dropped_logs > 0 {
@@ -442,14 +442,14 @@ impl LogProcessor for BatchLogProcessor {
                                 name: "BatchLogProcessor.Shutdown.Timeout",
                                 message = "BatchLogProcessor shutdown timing out."
                             );
-                            ShutdownError::Timeout(self.shutdown_timeout)
+                            OTelSdkError::Timeout(self.shutdown_timeout)
                         }
                         _ => {
                             otel_error!(
                                 name: "BatchLogProcessor.Shutdown.Error",
                                 error = format!("{}", err)
                             );
-                            ShutdownError::InternalFailure(err.to_string())
+                            OTelSdkError::InternalFailure(err.to_string())
                         }
                     })?
             }
@@ -459,7 +459,7 @@ impl LogProcessor for BatchLogProcessor {
                     name: "BatchLogProcessor.Shutdown.ControlChannelFull",
                     message = "Control message to shutdown the worker thread could not be sent as the control channel is full. This can occur if user repeatedily calls force_flush/shutdown without finishing the previous call."
                 );
-                Err(ShutdownError::InternalFailure("Shutdown cannot be performed as Control channel is full. This can occur if user repeatedily calls force_flush/shutdown without finishing the previous call.".into()))
+                Err(OTelSdkError::InternalFailure("Shutdown cannot be performed as Control channel is full. This can occur if user repeatedily calls force_flush/shutdown without finishing the previous call.".into()))
             }
             Err(mpsc::TrySendError::Disconnected(_)) => {
                 // Given background thread is the only receiver, and it's
@@ -469,7 +469,7 @@ impl LogProcessor for BatchLogProcessor {
                     message = "Shutdown is being invoked more than once. This is noop, but indicates a potential issue in the application's lifecycle management."
                 );
 
-                Err(ShutdownError::InternalFailure(
+                Err(OTelSdkError::InternalFailure(
                     "BatchLogProcessor is already shutdown".into(),
                 ))
             }
@@ -875,7 +875,7 @@ mod tests {
         BatchLogProcessor, OTEL_BLRP_EXPORT_TIMEOUT, OTEL_BLRP_MAX_EXPORT_BATCH_SIZE,
         OTEL_BLRP_MAX_QUEUE_SIZE, OTEL_BLRP_SCHEDULE_DELAY,
     };
-    use crate::error::ShutdownResult;
+    use crate::error::OTelSdkResult;
     use crate::logs::LogResult;
     use crate::logs::{LogBatch, LogExporter, LogRecord};
     use crate::{
@@ -912,7 +912,7 @@ mod tests {
             async { Ok(()) }
         }
 
-        fn shutdown(&mut self) -> ShutdownResult {
+        fn shutdown(&mut self) -> OTelSdkResult {
             Ok(())
         }
 
@@ -1236,7 +1236,7 @@ mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> ShutdownResult {
+        fn shutdown(&self) -> OTelSdkResult {
             Ok(())
         }
     }
@@ -1266,7 +1266,7 @@ mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> ShutdownResult {
+        fn shutdown(&self) -> OTelSdkResult {
             Ok(())
         }
     }
diff --git a/opentelemetry-sdk/src/logs/log_processor_with_async_runtime.rs b/opentelemetry-sdk/src/logs/log_processor_with_async_runtime.rs
@@ -1,5 +1,5 @@
 use crate::{
-    error::{ShutdownError, ShutdownResult},
+    error::{OTelSdkError, OTelSdkResult},
     logs::{ExportResult, LogBatch, LogError, LogExporter, LogRecord, LogResult},
     Resource,
 };
@@ -87,7 +87,7 @@ impl<R: RuntimeChannel> LogProcessor for BatchLogProcessor<R> {
             .and_then(std::convert::identity)
     }
 
-    fn shutdown(&self) -> ShutdownResult {
+    fn shutdown(&self) -> OTelSdkResult {
         let dropped_logs = self.dropped_logs_count.load(Ordering::Relaxed);
         let max_queue_size = self.max_queue_size;
         if dropped_logs > 0 {
@@ -101,10 +101,10 @@ impl<R: RuntimeChannel> LogProcessor for BatchLogProcessor<R> {
         let (res_sender, res_receiver) = oneshot::channel();
         self.message_sender
             .try_send(BatchMessage::Shutdown(res_sender))
-            .map_err(|err| ShutdownError::InternalFailure(err.to_string()))?;
+            .map_err(|err| OTelSdkError::InternalFailure(err.to_string()))?;
 
         futures_executor::block_on(res_receiver)
-            .map_err(|err| ShutdownError::InternalFailure(err.to_string()))
+            .map_err(|err| OTelSdkError::InternalFailure(err.to_string()))
             .and_then(std::convert::identity)
     }
 
@@ -287,7 +287,7 @@ where
 
 #[cfg(all(test, feature = "testing", feature = "logs"))]
 mod tests {
-    use crate::error::ShutdownResult;
+    use crate::error::OTelSdkResult;
     use crate::logs::log_processor::{
         OTEL_BLRP_EXPORT_TIMEOUT, OTEL_BLRP_MAX_EXPORT_BATCH_SIZE, OTEL_BLRP_MAX_QUEUE_SIZE,
         OTEL_BLRP_SCHEDULE_DELAY,
@@ -331,7 +331,7 @@ mod tests {
             async { Ok(()) }
         }
 
-        fn shutdown(&mut self) -> ShutdownResult {
+        fn shutdown(&mut self) -> OTelSdkResult {
             Ok(())
         }
 
@@ -656,7 +656,7 @@ mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> ShutdownResult {
+        fn shutdown(&self) -> OTelSdkResult {
             Ok(())
         }
     }
@@ -686,7 +686,7 @@ mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> ShutdownResult {
+        fn shutdown(&self) -> OTelSdkResult {
             Ok(())
         }
     }
diff --git a/opentelemetry-sdk/src/logs/logger_provider.rs b/opentelemetry-sdk/src/logs/logger_provider.rs
@@ -1,5 +1,5 @@
 use super::{BatchLogProcessor, LogProcessor, LogRecord, SimpleLogProcessor, TraceContext};
-use crate::error::ShutdownError;
+use crate::error::OTelSdkError;
 use crate::logs::{LogError, LogExporter, LogResult};
 use crate::Resource;
 use opentelemetry::{otel_debug, otel_info, trace::TraceContextExt, Context, InstrumentationScope};
@@ -132,7 +132,7 @@ struct LoggerProviderInner {
 
 impl LoggerProviderInner {
     /// Shuts down the `LoggerProviderInner` and returns any errors.
-    pub(crate) fn shutdown(&self) -> Vec<ShutdownError> {
+    pub(crate) fn shutdown(&self) -> Vec<OTelSdkError> {
         let mut errs = vec![];
         for processor in &self.processors {
             if let Err(err) = processor.shutdown() {
@@ -142,12 +142,12 @@ impl LoggerProviderInner {
                 //    which is non-actionable by the user
                 match err {
                     // specific handling for mutex poisoning
-                    ShutdownError::AlreadyShutdown => {
+                    OTelSdkError::AlreadyShutdown => {
                         otel_debug!(
                             name: "LoggerProvider.Drop.AlreadyShutdown",
                         );
                     }
-                    ShutdownError::Timeout(t) => {
+                    OTelSdkError::Timeout(t) => {
                         otel_debug!(
                             name: "LoggerProvider.Drop.ExportTimedOut",
                             error = format!("timed out shutting down; t={:?}", t)
@@ -340,7 +340,7 @@ impl opentelemetry::logs::Logger for Logger {
 #[cfg(test)]
 mod tests {
     use crate::{
-        error::ShutdownResult,
+        error::OTelSdkResult,
         logs::InMemoryLogExporter,
         resource::{
             SERVICE_NAME, TELEMETRY_SDK_LANGUAGE, TELEMETRY_SDK_NAME, TELEMETRY_SDK_VERSION,
@@ -395,7 +395,7 @@ mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> ShutdownResult {
+        fn shutdown(&self) -> OTelSdkResult {
             self.is_shutdown
                 .lock()
                 .map(|mut is_shutdown| *is_shutdown = true)
@@ -808,7 +808,7 @@ mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> ShutdownResult {
+        fn shutdown(&self) -> OTelSdkResult {
             *self.shutdown_called.lock().unwrap() = true;
             Ok(())
         }
@@ -839,7 +839,7 @@ mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> ShutdownResult {
+        fn shutdown(&self) -> OTelSdkResult {
             let mut count = self.shutdown_count.lock().unwrap();
             *count += 1;
             Ok(())
diff --git a/opentelemetry-stdout/src/logs/exporter.rs b/opentelemetry-stdout/src/logs/exporter.rs
@@ -1,6 +1,6 @@
 use chrono::{DateTime, Utc};
 use core::fmt;
-use opentelemetry_sdk::error::ShutdownResult;
+use opentelemetry_sdk::error::OTelSdkResult;
 use opentelemetry_sdk::logs::LogBatch;
 use opentelemetry_sdk::logs::LogResult;
 use opentelemetry_sdk::Resource;
@@ -64,7 +64,7 @@ impl opentelemetry_sdk::logs::LogExporter for LogExporter {
         }
     }
 
-    fn shutdown(&mut self) -> ShutdownResult {
+    fn shutdown(&mut self) -> OTelSdkResult {
         self.is_shutdown.store(true, atomic::Ordering::SeqCst);
         Ok(())
     }
diff --git a/stress/src/logs.rs b/stress/src/logs.rs
@@ -13,7 +13,7 @@ use std::ascii::AsciiExt;
 
 use opentelemetry::InstrumentationScope;
 use opentelemetry_appender_tracing::layer;
-use opentelemetry_sdk::error::ShutdownResult;
+use opentelemetry_sdk::error::OTelSdkResult;
 use opentelemetry_sdk::logs::{LogBatch, LogExporter};
 use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, LoggerProvider};
 
@@ -49,7 +49,7 @@ impl LogProcessor for MockLogProcessor {
         Ok(())
     }
 
-    fn shutdown(&self) -> ShutdownResult {
+    fn shutdown(&self) -> OTelSdkResult {
         Ok(())
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ use std::sync::Arc;`
`2`	`2`
`3`	`3`	`use http::{header::CONTENT_TYPE, Method};`
`4`	`4`	`use opentelemetry::otel_debug;`
`5`		`-use opentelemetry_sdk::error::{ShutdownError, ShutdownResult};`
	`5`	`+use opentelemetry_sdk::error::{OTelSdkError, OTelSdkResult};`
`6`	`6`	`use opentelemetry_sdk::logs::{LogBatch, LogExporter};`
`7`	`7`	`use opentelemetry_sdk::logs::{LogError, LogResult};`
`8`	`8`
`@@ -54,10 +54,10 @@ impl LogExporter for OtlpHttpClient {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`- fn shutdown(&mut self) -> ShutdownResult {`
	`57`	`+ fn shutdown(&mut self) -> OTelSdkResult {`
`58`	`58`	`self.client`
`59`	`59`	`.lock()`
`60`		`- .map_err(\|e\| ShutdownError::InternalFailure(format!("Failed to acquire lock: {}", e)))?`
	`60`	`+ .map_err(\|e\| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {}", e)))?`
`61`	`61`	`.take();`
`62`	`62`	`Ok(())`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use opentelemetry::otel_debug;`
`3`	`3`	`use opentelemetry_proto::tonic::collector::logs::v1::{`
`4`	`4`	`logs_service_client::LogsServiceClient, ExportLogsServiceRequest,`
`5`	`5`	`};`
`6`		`-use opentelemetry_sdk::error::ShutdownError;`
	`6`	`+use opentelemetry_sdk::error::OTelSdkResult;`
`7`	`7`	`use opentelemetry_sdk::logs::{LogBatch, LogExporter};`
`8`	`8`	`use opentelemetry_sdk::logs::{LogError, LogResult};`
`9`	`9`	`use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Channel, Request};`
`@@ -93,7 +93,7 @@ impl LogExporter for TonicLogsClient {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- fn shutdown(&mut self) -> Result<(), ShutdownError> {`
	`96`	`+ fn shutdown(&mut self) -> OTelSdkResult {`
`97`	`97`	`let _ = self.inner.take();`
`98`	`98`	`Ok(())`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use crate::error::ShutdownResult;`
	`1`	`+use crate::error::OTelSdkResult;`
`2`	`2`	`use crate::logs::LogRecord;`
`3`	`3`	`use crate::logs::{LogBatch, LogError, LogExporter, LogResult};`
`4`	`4`	`use crate::Resource;`
`@@ -199,7 +199,7 @@ impl LogExporter for InMemoryLogExporter {`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`202`		`- fn shutdown(&mut self) -> ShutdownResult {`
	`202`	`+ fn shutdown(&mut self) -> OTelSdkResult {`
`203`	`203`	`if self.should_reset_on_shutdown {`
`204`	`204`	`self.reset();`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`use crate::{`
`2`		`- error::{ShutdownError, ShutdownResult},`
	`2`	`+ error::{OTelSdkError, OTelSdkResult},`
`3`	`3`	`logs::{ExportResult, LogBatch, LogError, LogExporter, LogRecord, LogResult},`
`4`	`4`	`Resource,`
`5`	`5`	`};`
`@@ -87,7 +87,7 @@ impl<R: RuntimeChannel> LogProcessor for BatchLogProcessor<R> {`
`87`	`87`	`.and_then(std::convert::identity)`
`88`	`88`	`}`
`89`	`89`
`90`		`- fn shutdown(&self) -> ShutdownResult {`
	`90`	`+ fn shutdown(&self) -> OTelSdkResult {`
`91`	`91`	`let dropped_logs = self.dropped_logs_count.load(Ordering::Relaxed);`
`92`	`92`	`let max_queue_size = self.max_queue_size;`
`93`	`93`	`if dropped_logs > 0 {`
`@@ -101,10 +101,10 @@ impl<R: RuntimeChannel> LogProcessor for BatchLogProcessor<R> {`
`101`	`101`	`let (res_sender, res_receiver) = oneshot::channel();`
`102`	`102`	`self.message_sender`
`103`	`103`	`.try_send(BatchMessage::Shutdown(res_sender))`
`104`		`- .map_err(\|err\| ShutdownError::InternalFailure(err.to_string()))?;`
	`104`	`+ .map_err(\|err\| OTelSdkError::InternalFailure(err.to_string()))?;`
`105`	`105`
`106`	`106`	`futures_executor::block_on(res_receiver)`
`107`		`- .map_err(\|err\| ShutdownError::InternalFailure(err.to_string()))`
	`107`	`+ .map_err(\|err\| OTelSdkError::InternalFailure(err.to_string()))`
`108`	`108`	`.and_then(std::convert::identity)`
`109`	`109`	`}`
`110`	`110`
`@@ -287,7 +287,7 @@ where`
`287`	`287`
`288`	`288`	`#[cfg(all(test, feature = "testing", feature = "logs"))]`
`289`	`289`	`mod tests {`
`290`		`- use crate::error::ShutdownResult;`
	`290`	`+ use crate::error::OTelSdkResult;`
`291`	`291`	`use crate::logs::log_processor::{`
`292`	`292`	`OTEL_BLRP_EXPORT_TIMEOUT, OTEL_BLRP_MAX_EXPORT_BATCH_SIZE, OTEL_BLRP_MAX_QUEUE_SIZE,`
`293`	`293`	`OTEL_BLRP_SCHEDULE_DELAY,`
`@@ -331,7 +331,7 @@ mod tests {`
`331`	`331`	`async { Ok(()) }`
`332`	`332`	`}`
`333`	`333`
`334`		`- fn shutdown(&mut self) -> ShutdownResult {`
	`334`	`+ fn shutdown(&mut self) -> OTelSdkResult {`
`335`	`335`	`Ok(())`
`336`	`336`	`}`
`337`	`337`
`@@ -656,7 +656,7 @@ mod tests {`
`656`	`656`	`Ok(())`
`657`	`657`	`}`
`658`	`658`
`659`		`- fn shutdown(&self) -> ShutdownResult {`
	`659`	`+ fn shutdown(&self) -> OTelSdkResult {`
`660`	`660`	`Ok(())`
`661`	`661`	`}`
`662`	`662`	`}`
`@@ -686,7 +686,7 @@ mod tests {`
`686`	`686`	`Ok(())`
`687`	`687`	`}`
`688`	`688`
`689`		`- fn shutdown(&self) -> ShutdownResult {`
	`689`	`+ fn shutdown(&self) -> OTelSdkResult {`
`690`	`690`	`Ok(())`
`691`	`691`	`}`
`692`	`692`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`use chrono::{DateTime, Utc};`
`2`	`2`	`use core::fmt;`
`3`		`-use opentelemetry_sdk::error::ShutdownResult;`
	`3`	`+use opentelemetry_sdk::error::OTelSdkResult;`
`4`	`4`	`use opentelemetry_sdk::logs::LogBatch;`
`5`	`5`	`use opentelemetry_sdk::logs::LogResult;`
`6`	`6`	`use opentelemetry_sdk::Resource;`
`@@ -64,7 +64,7 @@ impl opentelemetry_sdk::logs::LogExporter for LogExporter {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- fn shutdown(&mut self) -> ShutdownResult {`
	`67`	`+ fn shutdown(&mut self) -> OTelSdkResult {`
`68`	`68`	`self.is_shutdown.store(true, atomic::Ordering::SeqCst);`
`69`	`69`	`Ok(())`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ use std::ascii::AsciiExt;`
`13`	`13`
`14`	`14`	`use opentelemetry::InstrumentationScope;`
`15`	`15`	`use opentelemetry_appender_tracing::layer;`
`16`		`-use opentelemetry_sdk::error::ShutdownResult;`
	`16`	`+use opentelemetry_sdk::error::OTelSdkResult;`
`17`	`17`	`use opentelemetry_sdk::logs::{LogBatch, LogExporter};`
`18`	`18`	`use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, LoggerProvider};`
`19`	`19`
`@@ -49,7 +49,7 @@ impl LogProcessor for MockLogProcessor {`
`49`	`49`	`Ok(())`
`50`	`50`	`}`
`51`	`51`
`52`		`- fn shutdown(&self) -> ShutdownResult {`
	`52`	`+ fn shutdown(&self) -> OTelSdkResult {`
`53`	`53`	`Ok(())`
`54`	`54`	`}`
`55`	`55`	`}`