Skip to content

Commit 506bfb0

Browse files
committed
review commentS
1 parent 49944e0 commit 506bfb0

File tree

1 file changed

+12
-36
lines changed

1 file changed

+12
-36
lines changed

opentelemetry-sdk/src/logs/log_processor.rs

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -996,31 +996,11 @@ mod tests {
996996
);
997997
}
998998

999-
#[derive(Debug, Clone)]
1000-
struct SyncLogExporter {
1001-
logs: Arc<Mutex<Vec<(LogRecord, InstrumentationLibrary)>>>,
1002-
}
1003-
1004-
#[async_trait::async_trait]
1005-
impl LogExporter for SyncLogExporter {
1006-
async fn export(&mut self, batch: LogBatch<'_>) -> LogResult<()> {
1007-
let mut logs = self.logs.lock().unwrap();
1008-
for (log_record, instrumentation) in batch.iter() {
1009-
logs.push((log_record.clone(), instrumentation.clone()));
1010-
}
1011-
Ok(())
1012-
}
1013-
1014-
fn shutdown(&mut self) {}
1015-
1016-
fn set_resource(&mut self, _resource: &Resource) {}
1017-
}
1018-
1019999
#[test]
10201000
fn test_simple_processor_sync_exporter_without_runtime() {
1021-
let exporter = SyncLogExporter {
1022-
logs: Arc::new(Mutex::new(Vec::new())),
1023-
};
1001+
let exporter = InMemoryLogsExporterBuilder::default()
1002+
.keep_records_on_shutdown()
1003+
.build();
10241004
let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
10251005

10261006
let mut record: LogRecord = Default::default();
@@ -1030,14 +1010,14 @@ mod tests {
10301010
processor.force_flush().unwrap();
10311011
processor.shutdown().unwrap();
10321012

1033-
assert_eq!(exporter.logs.lock().unwrap().len(), 1);
1013+
assert_eq!(exporter.get_emitted_logs().unwrap().len(), 1);
10341014
}
10351015

10361016
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
10371017
async fn test_simple_processor_sync_exporter_with_runtime() {
1038-
let exporter = SyncLogExporter {
1039-
logs: Arc::new(Mutex::new(Vec::new())),
1040-
};
1018+
let exporter = InMemoryLogsExporterBuilder::default()
1019+
.keep_records_on_shutdown()
1020+
.build();
10411021
let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
10421022

10431023
let mut record: LogRecord = Default::default();
@@ -1047,14 +1027,14 @@ mod tests {
10471027
processor.force_flush().unwrap();
10481028
processor.shutdown().unwrap();
10491029

1050-
assert_eq!(exporter.logs.lock().unwrap().len(), 1);
1030+
assert_eq!(exporter.get_emitted_logs().unwrap().len(), 1);
10511031
}
10521032

10531033
#[tokio::test(flavor = "current_thread")]
10541034
async fn test_simple_processor_sync_exporter_with_current_thread_runtime() {
1055-
let exporter = SyncLogExporter {
1056-
logs: Arc::new(Mutex::new(Vec::new())),
1057-
};
1035+
let exporter = InMemoryLogsExporterBuilder::default()
1036+
.keep_records_on_shutdown()
1037+
.build();
10581038
let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
10591039

10601040
let mut record: LogRecord = Default::default();
@@ -1064,7 +1044,7 @@ mod tests {
10641044
processor.force_flush().unwrap();
10651045
processor.shutdown().unwrap();
10661046

1067-
assert_eq!(exporter.logs.lock().unwrap().len(), 1);
1047+
assert_eq!(exporter.get_emitted_logs().unwrap().len(), 1);
10681048
}
10691049

10701050
#[derive(Debug, Clone)]
@@ -1095,10 +1075,6 @@ mod tests {
10951075

10961076
Ok(())
10971077
}
1098-
1099-
fn shutdown(&mut self) {}
1100-
1101-
fn set_resource(&mut self, _resource: &Resource) {}
11021078
}
11031079

11041080
#[test]

0 commit comments

Comments
 (0)