add shutdown with timeout for log exporter

Author: mohammadVatandoost

opentelemetry-otlp/src/exporter/http/logs.rs

@@ -1,3 +1,4 @@
+use std::time;
 use super::OtlpHttpClient;
 use http::{header::CONTENT_TYPE, Method};
 use opentelemetry::otel_debug;
@@ -46,7 +47,7 @@ impl LogExporter for OtlpHttpClient {
         Ok(())
     }
 
-    fn shutdown(&self) -> OTelSdkResult {
+    fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
         let mut client_guard = self.client.lock().map_err(|e| {
             OTelSdkError::InternalFailure(format!("Failed to acquire client lock: {}", e))
         })?;
@@ -58,6 +59,10 @@ impl LogExporter for OtlpHttpClient {
         Ok(())
     }
 
+    fn shutdown(&self) -> OTelSdkResult {
+        self.shutdown_with_timeout(time::Duration::from_secs(5))
+    }
+
     fn set_resource(&mut self, resource: &opentelemetry_sdk::Resource) {
         self.resource = resource.into();
     }

opentelemetry-otlp/src/exporter/tonic/logs.rs

@@ -1,4 +1,5 @@
 use core::fmt;
+use std::time;
 use opentelemetry::otel_debug;
 use opentelemetry_proto::tonic::collector::logs::v1::{
     logs_service_client::LogsServiceClient, ExportLogsServiceRequest,
@@ -84,7 +85,7 @@ impl LogExporter for TonicLogsClient {
         Ok(())
     }
 
-    fn shutdown(&self) -> OTelSdkResult {
+    fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
         // TODO: Implement actual shutdown
         // Due to the use of tokio::sync::Mutex to guard
         // the inner client, we need to await the call to lock the mutex

opentelemetry-otlp/src/logs.rs

@@ -5,7 +5,7 @@
 #[cfg(feature = "grpc-tonic")]
 use opentelemetry::otel_debug;
 use std::fmt::Debug;
-
+use std::time;
 use opentelemetry_sdk::{error::OTelSdkResult, logs::LogBatch};
 
 use crate::{ExporterBuildError, HasExportConfig, NoExporterBuilderSet};
@@ -157,7 +157,7 @@ impl opentelemetry_sdk::logs::LogExporter for LogExporter {
         }
     }
 
-    fn shutdown(&self) -> OTelSdkResult {
+    fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
         match &self.client {
             #[cfg(feature = "grpc-tonic")]
             SupportedTransportClient::Tonic(client) => client.shutdown(),

opentelemetry-sdk/CHANGELOG.md

@@ -24,7 +24,8 @@ also modified to suppress telemetry before invoking exporters.
 - *Breaking* change for custom `MetricReader` authors.
   The `shutdown_with_timeout` method is added to `MetricReader` trait.
   `collect` method on `MetricReader` modified to return `OTelSdkResult`.
-
+- *Breaking* The `shutdown_with_timeout` method is added to LogExporter trait. This is breaking change for custom `LogExporter` authors.
+- 
 ## 0.29.0
 
 Released 2025-Mar-21

opentelemetry-sdk/benches/log_enabled.rs

@@ -11,6 +11,7 @@
 
 // cargo bench --bench log_enabled --features="spec_unstable_logs_enabled,experimental_logs_concurrent_log_processor"
 
+use std::time;
 use criterion::{criterion_group, criterion_main, Criterion};
 use opentelemetry::logs::{Logger, LoggerProvider};
 use opentelemetry_sdk::error::OTelSdkResult;
@@ -29,7 +30,7 @@ impl LogExporter for NoopExporter {
         Ok(())
     }
 
-    fn shutdown(&self) -> OTelSdkResult {
+    fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
         Ok(())
     }
 

opentelemetry-sdk/src/logs/export.rs

@@ -6,6 +6,7 @@ use crate::Resource;
 use opentelemetry::logs::Severity;
 use opentelemetry::InstrumentationScope;
 use std::fmt::Debug;
+use std::time;
 
 /// A batch of log records to be exported by a `LogExporter`.
 ///
@@ -134,10 +135,11 @@ pub trait LogExporter: Send + Sync + Debug {
         &self,
         batch: LogBatch<'_>,
     ) -> impl std::future::Future<Output = OTelSdkResult> + Send;
-
     /// Shuts down the exporter.
+    fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult;
+    /// Shuts down the exporter with a default timeout.
     fn shutdown(&self) -> OTelSdkResult {
-        Ok(())
+        self.shutdown_with_timeout(time::Duration::from_secs(5))
     }
     #[cfg(feature = "spec_unstable_logs_enabled")]
     /// Check if logs are enabled.

opentelemetry-sdk/src/logs/in_memory_exporter.rs

@@ -7,6 +7,7 @@ use opentelemetry::InstrumentationScope;
 use std::borrow::Cow;
 use std::sync::atomic::AtomicBool;
 use std::sync::{Arc, Mutex};
+use std::time;
 
 /// An in-memory logs exporter that stores logs data in memory..
 ///
@@ -205,7 +206,7 @@ impl LogExporter for InMemoryLogExporter {
         Ok(())
     }
 
-    fn shutdown(&self) -> OTelSdkResult {
+    fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
         self.shutdown_called
             .store(true, std::sync::atomic::Ordering::Relaxed);
         if self.should_reset_on_shutdown {
@@ -214,6 +215,11 @@ impl LogExporter for InMemoryLogExporter {
         Ok(())
     }
 
+    fn shutdown(&self) -> OTelSdkResult {
+        self.shutdown_with_timeout(time::Duration::from_secs(5))
+    }
+
+
     fn set_resource(&mut self, resource: &Resource) {
         let mut res_guard = self.resource.lock().expect("Resource lock poisoned");
         *res_guard = resource.clone();

opentelemetry-sdk/src/logs/log_processor.rs

@@ -81,6 +81,7 @@ pub(crate) mod tests {
     use opentelemetry::logs::{Logger, LoggerProvider};
     use opentelemetry::{InstrumentationScope, Key};
     use std::sync::{Arc, Mutex};
+    use std::time;
 
     #[derive(Debug, Clone)]
     pub(crate) struct MockLogExporter {
@@ -92,7 +93,7 @@ pub(crate) mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> OTelSdkResult {
+        fn shutdown_with_timeout(&self, _timeout: time::Duration)-> OTelSdkResult {
             Ok(())
         }
 

opentelemetry-sdk/src/logs/log_processor_with_async_runtime.rs

@@ -309,6 +309,7 @@ mod tests {
     use opentelemetry::KeyValue;
     use opentelemetry::{InstrumentationScope, Key};
     use std::sync::{Arc, Mutex};
+    use std::time;
     use std::time::Duration;
 
     #[derive(Debug, Clone)]
@@ -321,10 +322,14 @@ mod tests {
             Ok(())
         }
 
-        fn shutdown(&self) -> OTelSdkResult {
+        fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
             Ok(())
         }
 
+        fn shutdown(&self) -> OTelSdkResult {
+            self.shutdown_with_timeout(time::Duration::from_secs(5))
+        }
+
         fn set_resource(&mut self, resource: &Resource) {
             self.resource
                 .lock()

opentelemetry-sdk/src/logs/logger_provider.rs

@@ -291,7 +291,7 @@ mod tests {
     use std::fmt::{Debug, Formatter};
     use std::sync::atomic::AtomicU64;
     use std::sync::Mutex;
-    use std::thread;
+    use std::{thread, time};
 
     struct ShutdownTestLogProcessor {
         is_shutdown: Arc<Mutex<bool>>,
@@ -364,7 +364,7 @@ mod tests {
             *res = resource.clone();
         }
 
-        fn shutdown(&self) -> OTelSdkResult {
+        fn shutdown_with_timeout(&self, _timeout: time::Duration)-> OTelSdkResult {
             Ok(())
         }
     }