[SDK] BatchSpanProcessor: wait for a full batch instead of draining partial batches - #4466
[SDK] BatchSpanProcessor: wait for a full batch instead of draining partial batches#4466yswdqz wants to merge 9 commits into
Conversation
…artial batches - Change the worker wait predicate from '!buffer_.empty()' to 'buffer_.size() >= max_export_batch_size_'. - Export() now only drains the entire buffer when a force flush is pending or the processor is shutting down; on normal wakeups it exports at most one batch of max_export_batch_size spans. This prevents the processor from waking up and draining partial trailing batches every time a span arrives, reducing CPU usage and gRPC request count while preserving ForceFlush/Shutdown drain semantics.
c49d86c to
3d02bbf
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4466 +/- ##
==========================================
+ Coverage 82.62% 83.11% +0.50%
==========================================
Files 512 519 +7
Lines 20138 20254 +116
==========================================
+ Hits 16637 16833 +196
+ Misses 3501 3421 -80
🚀 New features to boost your workflow:
|
|
Thanks for the fix. Please see clang-format errors, either run clang-format or apply this manually: |
| bool should_drain = notify_force_flush != 0 || | ||
| synchronization_data_->is_shutdown.load(std::memory_order_acquire); |
There was a problem hiding this comment.
Export() now only drains the entire buffer when a force flush is pending
or the processor is shutting down; on normal wakeups it exports at most one
batch of max_export_batch_size spans.
notify_force_flush (i.e., synchronization_data_->force_flush_pending_sequence) is a monotonically increasing counter that increases on every call to ForceFlush. This would mean this condition would be permanently true after the first time one calls BatchSpanProcessor::ForceFlush.
Hence while (should_drain) below never becomes while (false), so Export() keeps draining to empty on every call which means the one-batch-per-wakeup behavior this PR adds never takes effect after the first call to BatchSpanProcessor::ForceFlush.
I think something like this would actually solve that problem.
| bool should_drain = notify_force_flush != 0 || | |
| synchronization_data_->is_shutdown.load(std::memory_order_acquire); | |
| bool should_drain = | |
| notify_force_flush > | |
| synchronization_data_->force_flush_notified_sequence.load(std::memory_order_acquire) || | |
| synchronization_data_->is_shutdown.load(std::memory_order_acquire); |
Maybe you could add some tests to confirm/check?
This issue could be tested with a test exporter that records how many spans each Export() call receives and pauses inside the first call, so the worker is held mid-export and you control what's in the buffer when it resumes. You could then add a couple spans while it's paused mid export to see that it will still drain less than the max batch size immediately instead of returning after exporting one batch as the PR suggests IF the BatchSpanProcessor::ForceFlush was ever called.
There was a problem hiding this comment.
Good catch, thank you for the review~ Updated the condition to compare against force_flush_notified_sequence and added a regression test covering the scenario you described.
| std::uint64_t notify_force_flush = | ||
| synchronization_data_->force_flush_pending_sequence.load(std::memory_order_acquire); | ||
| if (notify_force_flush) | ||
| if (should_drain) |
There was a problem hiding this comment.
should_drain is doing two orthogonal jobs here: how many records to take, and whether to keep looping. Because is_shutdown alone now sets it, it hands the entire buffer to a single Export() call, bypassing max_export_batch_size. Before this PR, a program that never called ForceFlush had notify_force_flush == 0, so DrainQueue() still chunked; now a backlog of 3000 with max_export_batch_size = 2048 goes out as one 3000-span request instead of 2048 + 952. If the receiver rejects the oversized message (max_receive_message_length defaults to 4 MiB), the spans are already consumed and the result is discarded at the line - and at process exit there is no retry.
Suggest keeping the cap unconditional and letting should_drain control only the loop.
There was a problem hiding this comment.
You're right, thank you for the review~ The cap is now unconditional and should_drain only controls the loop. Added a separate test for shutdown draining as well.
…export_batch_size
adb1e93 to
0e7cbe4
Compare
|
Apologies for my oversight and insufficient testing. Thanks for the reviews. I've addressed all the feedback: fixed the clang-format issue, corrected the ForceFlush condition, kept the batch size cap unconditional, and added regression tests for both issues. |
|
Some CI jobs failed because the new BlockingMockSpanExporter had a memory leak and a data race. Pushed a fix and verified locally with ASan and TSan — all batch_span_processor_test tests pass now. |
| @@ -285,7 +282,7 @@ void BatchSpanProcessor::Export() | |||
|
|
|||
| exporter_->Export(nostd::span<std::unique_ptr<Recordable>>(spans_arr.data(), spans_arr.size())); | |||
| NotifyCompletion(notify_force_flush, exporter_, synchronization_data_); | |||
There was a problem hiding this comment.
Looking a bit deeper I think we also have an issue here in regards to handling of ForceFlush.
When more than max_export_batch_size_ spans are queued at the time, ForceFlush will return after exporting the first batch, hence returning before all the spans are exported because the notify is called within the loop.
To be clear, main can also return from ForceFlush() with spans in the buffer, but that's only for ones that arrived during the export, which is fine IMO. What's new here is spans that were already buffered when ForceFlush() was called can be being left behind.
Because the spec only mentions handling tasks (i.e., spans) received prior to the call to the ForceFlush I think this calls for a "snapshot-then-export" like pattern.
Maybe something like below, WDYT?
Export():
notify_force_flush = pending_sequence.load()
should_drain = notify_force_flush > notified_sequence.load() || is_shutdown.load()
# snapshot the target ONCE, before exporting anything
remaining = should_drain ? buffer_.size()
: min(buffer_.size(), max_export_batch_size_)
while remaining > 0:
n = min(remaining, max_export_batch_size_) # cap still applies on every path
consume n from buffer_ into spans_arr
exporter_->Export(spans_arr)
remaining -= n # NOT re-reading buffer_.size()
NotifyCompletion(notify_force_flush, ...) # once, after the snapshot is out
The snapshot pattern would solve a couple problems:
- A clause that loops until empty where we keep checking the buffer size within the loop races against the producer so under high sustained load it may never get to finish exporting (like a livelock situation), eventually running into the timeout. Snapshotting at the call time matches both what the spec defines and prevents this potential livelock.
- Moving the notify to the end of the loop covers all cases without branching like we have today.
- And IMO it is easier to read in general.
Maybe we could also add some tests to ensure this doesn't regress later?
There was a problem hiding this comment.
@denizariyan You're right, that's a real issue — the in-loop notify lets ForceFlush return after the first batch when multiple batches are queued. Implemented your snapshot-then-export proposal exactly (snapshot once, remaining -= n, notify once after the loop), which also bounds the work per call. Added TestForceFlushExportsAllBufferedSpans (250 spans / batch 100): verified it fails on the old code (returns at 200 received) and passes with the fix. ASAN/TSAN/UBSAN green locally.
There was a problem hiding this comment.
@denizariyan Sorry for the back-and-forth. I can't run the full CI locally, so some issues only surface once CI runs and I can only fix them after seeing the failures. I'll run everything I can locally (format, ASAN/TSAN/UBSAN, relevant unit tests) before pushing from now on. Thanks for your patience!
denizariyan
left a comment
There was a problem hiding this comment.
LGTM, thanks.
We have a similar pattern in BatchLogRecordProcessor::Export() too which is now different compared to the trace path, would be nice to create an issue so we can close the deviation on it in a follow up
|
@denizariyan You are right, I confirmed locally that BatchLogRecordProcessor::Export() has the same tight-loop drain behavior, so it is now inconsistent with the trace path. I filed #4498 to track this. |
fix #4449
Problem
BatchSpanProcessorcurrently wakes up whenever the buffer is non-empty andthen drains the entire buffer in a tight loop. Under steady load this produces
exports that are much smaller than
max_export_batch_size, causing:Changes
!buffer_.empty()tobuffer_.size() >= max_export_batch_size_.Export()now only drains the entire buffer when a force flush is pendingor the processor is shutting down; on normal wakeups it exports at most one
batch of
max_export_batch_sizespans.This preserves
ForceFlush/Shutdownsemantics while making the normalexport path strictly batch-oriented.
Performance
I constructed a test where one span is finished every 50 µs, and the above metrics capture the performance difference between the two implementations under that steady load. In real-world scenarios, spans tend to be completed in batches, so the performance gap would be much less pronounced under typical conditions.
Checklist
CHANGELOG.mdupdated for non-trivial changesbatch_span_processor_testandbatch_span_processor_test_stressall pass)