From 2abdf1714602e23da9b942b11824d5a23de59cc7 Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 24 Jan 2025 09:50:47 -0800
Subject: [PATCH 1/2] Rename log emitter to provider

---
 .../src/logs/{log_emitter.rs => logger_provider.rs}           | 0
 opentelemetry-sdk/src/logs/mod.rs                             | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename opentelemetry-sdk/src/logs/{log_emitter.rs => logger_provider.rs} (100%)

diff --git a/opentelemetry-sdk/src/logs/log_emitter.rs b/opentelemetry-sdk/src/logs/logger_provider.rs
similarity index 100%
rename from opentelemetry-sdk/src/logs/log_emitter.rs
rename to opentelemetry-sdk/src/logs/logger_provider.rs
diff --git a/opentelemetry-sdk/src/logs/mod.rs b/opentelemetry-sdk/src/logs/mod.rs
index d6127c9a29..9244a794bc 100644
--- a/opentelemetry-sdk/src/logs/mod.rs
+++ b/opentelemetry-sdk/src/logs/mod.rs
@@ -1,8 +1,8 @@
 //! # OpenTelemetry Log SDK
 mod error;
 mod export;
-mod log_emitter;
 mod log_processor;
+mod logger_provider;
 pub(crate) mod record;
 
 /// In-Memory log exporter for testing purpose.
@@ -15,11 +15,11 @@ pub use in_memory_exporter::{InMemoryLogExporter, InMemoryLogExporterBuilder};
 
 pub use error::{LogError, LogResult};
 pub use export::{ExportResult, LogBatch, LogExporter};
-pub use log_emitter::{Builder, Logger, LoggerProvider};
 pub use log_processor::{
     BatchConfig, BatchConfigBuilder, BatchLogProcessor, BatchLogProcessorBuilder, LogProcessor,
     SimpleLogProcessor,
 };
+pub use logger_provider::{Builder, Logger, LoggerProvider};
 pub use record::{LogRecord, TraceContext};
 
 #[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]

From ab25cbaf0b3c91549e3d9532902930a9448f8474 Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 24 Jan 2025 10:58:00 -0800
Subject: [PATCH 2/2] Use opentelemetry:time::now instead of systemtime in
 LogEmitter (#2558)

---
 opentelemetry-sdk/src/logs/logger_provider.rs | 4 ++--
 opentelemetry/src/lib.rs                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opentelemetry-sdk/src/logs/logger_provider.rs b/opentelemetry-sdk/src/logs/logger_provider.rs
index a1e911bb28..35abae3630 100644
--- a/opentelemetry-sdk/src/logs/logger_provider.rs
+++ b/opentelemetry-sdk/src/logs/logger_provider.rs
@@ -6,7 +6,7 @@ use opentelemetry::{otel_debug, otel_info, trace::TraceContextExt, Context, Inst
 #[cfg(feature = "spec_unstable_logs_enabled")]
 use opentelemetry::logs::Severity;
 
-use std::time::SystemTime;
+use opentelemetry::time::now;
 use std::{
     borrow::Cow,
     sync::{
@@ -313,7 +313,7 @@ impl opentelemetry::logs::Logger for Logger {
             }
         }
         if record.observed_timestamp.is_none() {
-            record.observed_timestamp = Some(SystemTime::now());
+            record.observed_timestamp = Some(now());
         }
 
         for p in processors {
diff --git a/opentelemetry/src/lib.rs b/opentelemetry/src/lib.rs
index 10f8facef7..ad906171b2 100644
--- a/opentelemetry/src/lib.rs
+++ b/opentelemetry/src/lib.rs
@@ -277,7 +277,7 @@ pub mod trace;
 pub mod logs;
 
 #[doc(hidden)]
-#[cfg(any(feature = "metrics", feature = "trace"))]
+#[cfg(any(feature = "metrics", feature = "trace", feature = "logs"))]
 pub mod time {
     use std::time::SystemTime;