revert observedtime to optional

Author: lalitb

opentelemetry-proto/src/transform/logs.rs

@@ -83,7 +83,7 @@ pub mod tonic {
 
             LogRecord {
                 time_unix_nano: log_record.timestamp.map(to_nanos).unwrap_or_default(),
-                observed_time_unix_nano: to_nanos(log_record.observed_timestamp),
+                observed_time_unix_nano: to_nanos(log_record.observed_timestamp.unwrap()),
                 severity_number: severity_number.into(),
                 severity_text: log_record.severity_text.map(Into::into).unwrap_or_default(),
                 body: log_record.body.map(Into::into),

opentelemetry-sdk/src/logs/log_emitter.rs

@@ -13,8 +13,8 @@ use opentelemetry::{
 #[cfg(feature = "logs_level_enabled")]
 use opentelemetry::logs::Severity;
 
-use std::sync::atomic::AtomicBool;
 use std::{borrow::Cow, sync::Arc};
+use std::{sync::atomic::AtomicBool, time::SystemTime};
 
 use once_cell::sync::Lazy;
 
@@ -242,6 +242,9 @@ impl opentelemetry::logs::Logger for Logger {
             if let Some(ref trace_context) = trace_context {
                 cloned_record.trace_context = Some(trace_context.clone());
             }
+            if cloned_record.observed_timestamp.is_none() {
+                cloned_record.observed_timestamp = Some(SystemTime::now());
+            }
             let data = LogData {
                 record: cloned_record,
                 instrumentation: self.instrumentation_library().clone(),

opentelemetry-sdk/src/logs/record.rs

@@ -5,7 +5,7 @@ use opentelemetry::{
 };
 use std::{borrow::Cow, time::SystemTime};
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 #[non_exhaustive]
 /// LogRecord represents all data carried by a log record, and
 /// is provided to `LogExporter`s as input.
@@ -17,7 +17,7 @@ pub struct LogRecord {
     pub timestamp: Option<SystemTime>,
 
     /// Timestamp for when the record was observed by OpenTelemetry
-    pub observed_timestamp: SystemTime,
+    pub observed_timestamp: Option<SystemTime>,
 
     /// Trace context for logs associated with spans
     pub trace_context: Option<TraceContext>,
@@ -34,21 +34,6 @@ pub struct LogRecord {
     pub attributes: Option<Vec<(Key, AnyValue)>>,
 }
 
-impl Default for LogRecord {
-    fn default() -> Self {
-        LogRecord {
-            event_name: None,
-            timestamp: None,
-            observed_timestamp: SystemTime::now(),
-            trace_context: None,
-            severity_text: None,
-            severity_number: None,
-            body: None,
-            attributes: None,
-        }
-    }
-}
-
 impl opentelemetry::logs::LogRecord for LogRecord {
     fn set_event_name<T>(&mut self, name: T)
     where
@@ -62,7 +47,7 @@ impl opentelemetry::logs::LogRecord for LogRecord {
     }
 
     fn set_observed_timestamp(&mut self, timestamp: SystemTime) {
-        self.observed_timestamp = timestamp;
+        self.observed_timestamp = Some(timestamp);
     }
 
     fn set_severity_text(&mut self, severity_text: Cow<'static, str>) {
@@ -137,7 +122,7 @@ mod tests {
         let mut log_record = LogRecord::default();
         let now = SystemTime::now();
         log_record.set_observed_timestamp(now);
-        assert_eq!(log_record.observed_timestamp, now);
+        assert_eq!(log_record.observed_timestamp, Some(now));
     }
 
     #[test]

opentelemetry-stdout/src/logs/transform.rs

@@ -125,8 +125,8 @@ impl From<opentelemetry_sdk::export::logs::LogData> for LogRecord {
                 .unwrap_or_default(),
             time_unix_nano: value.record.timestamp,
             time: value.record.timestamp,
-            observed_time_unix_nano: value.record.observed_timestamp,
-            observed_time: value.record.observed_timestamp,
+            observed_time_unix_nano: value.record.observed_timestamp.unwrap(),
+            observed_time: value.record.observed_timestamp.unwrap(),
             severity_number: value
                 .record
                 .severity_number