Skip to content

Avoid vec allocation during each export for BatchLogProcessor #2483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 28, 2024
Merged

Avoid vec allocation during each export for BatchLogProcessor #2483

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2057dec
Avoid vec allocation during export
utpilla Dec 27, 2024
263abcd
Merge branch 'main' into utpilla/Optimize-BatchLogExporter
cijothomas Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions opentelemetry-sdk/src/logs/log_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
let _ = export_with_timeout_sync(
config.max_export_timeout,
&mut exporter,
logs.split_off(0),
&mut logs,

Check warning on line 422 in opentelemetry-sdk/src/logs/log_processor.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/logs/log_processor.rs#L422 

Added line #L422 was not covered by tests
&mut last_export_time,
);
}
Expand All @@ -429,7 +429,7 @@
let result = export_with_timeout_sync(
config.max_export_timeout,
&mut exporter,
logs.split_off(0),
&mut logs,
&mut last_export_time,
);
let _ = sender.send(result);
Expand All @@ -439,7 +439,7 @@
let result = export_with_timeout_sync(
config.max_export_timeout,
&mut exporter,
logs.split_off(0),
&mut logs,
&mut last_export_time,
);
let _ = sender.send(result);
Expand All @@ -463,7 +463,7 @@
let _ = export_with_timeout_sync(
config.max_export_timeout,
&mut exporter,
logs.split_off(0),
&mut logs,

Check warning on line 466 in opentelemetry-sdk/src/logs/log_processor.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/logs/log_processor.rs#L466 

Added line #L466 was not covered by tests
&mut last_export_time,
);
}
Expand Down Expand Up @@ -512,7 +512,7 @@
fn export_with_timeout_sync<E>(
_: Duration, // TODO, enforcing timeout in exporter.
exporter: &mut E,
batch: Vec<Box<(LogRecord, InstrumentationScope)>>,
batch: &mut Vec<Box<(LogRecord, InstrumentationScope)>>,
last_export_time: &mut Instant,
) -> ExportResult
where
Expand All @@ -528,9 +528,13 @@
.iter()
.map(|log_data| (&log_data.0, &log_data.1))
.collect();

let export = exporter.export(LogBatch::new(log_vec.as_slice()));
let export_result = futures_executor::block_on(export);

// Clear the batch vec after exporting
batch.clear();

match export_result {
Ok(_) => LogResult::Ok(()),
Err(err) => {
Expand Down
Loading