merge conflicts

Author: lalitb

opentelemetry-sdk/src/logs/log_processor.rs

@@ -174,22 +174,22 @@ pub(crate) mod tests {
                 .push((record.clone(), instrumentation.clone()));
         }
 
-        fn force_flush(&self) -> LogResult<()> {
+        fn force_flush(&self) -> OTelSdkResult {
             Ok(())
         }
 
-        fn shutdown(&self) -> LogResult<()> {
+        fn shutdown(&self) -> OTelSdkResult {
             Ok(())
         }
     }
 
     #[derive(Debug)]
     struct ThirdProcessor {
-        pub(crate) logs: Arc<Mutex<Vec<(LogRecord, InstrumentationScope)>>>,
+        pub(crate) logs: Arc<Mutex<Vec<(SdkLogRecord, InstrumentationScope)>>>,
     }
 
     impl LogProcessor for ThirdProcessor {
-        fn emit(&self, record: &mut LogRecord, instrumentation: &InstrumentationScope) {
+        fn emit(&self, record: &mut SdkLogRecord, instrumentation: &InstrumentationScope) {
             assert!(record.attributes_contains(
                 &Key::from_static_str("processed_by"),
                 &AnyValue::String("SecondProcessor".into())

opentelemetry-sdk/src/logs/record.rs

@@ -297,7 +297,7 @@ impl From<&SpanContext> for TraceContext {
 #[cfg(all(test, feature = "testing"))]
 mod tests {
     use super::*;
-    use opentelemetry::logs::{AnyValue, LogRecord as _, Severity};
+    use opentelemetry::logs::{AnyValue, Severity};
     use opentelemetry::time::now;
     use std::borrow::Cow;
 
@@ -440,7 +440,7 @@ mod tests {
 
     #[test]
     fn test_update_attribute() {
-        let mut log_record = LogRecord::default();
+        let mut log_record = SdkLogRecord::new();
         let key = Key::new("key1");
         let value = AnyValue::String("value1".into());
         let updated_value = AnyValue::String("updated_value".into());
@@ -459,7 +459,7 @@ mod tests {
 
     #[test]
     fn test_delete_attribute() {
-        let mut log_record = LogRecord::default();
+        let mut log_record = SdkLogRecord::new();
         let key = Key::new("key1");
         let value = AnyValue::String("value1".into());