Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions changelog.d/24281_blackhole_sink_acknowledgements.fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fixed the blackhole sink to properly implement end-to-end acknowledgements. Previously, the sink consumed events without updating finalizer status, causing sources that depend on acknowledgements (like `aws_s3` with SQS) to never delete processed messages from the queue.

authors: sanjams2
5 changes: 3 additions & 2 deletions src/sinks/blackhole/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ mod tests {
blackhole::{config::BlackholeConfig, sink::BlackholeSink},
},
test_util::{
components::run_and_assert_nonsending_sink_compliance, random_events_with_stream,
components::{SINK_TAGS, run_and_assert_sink_compliance},
random_events_with_stream,
},
};

Expand All @@ -29,6 +30,6 @@ mod tests {
let sink = VectorSink::Stream(Box::new(sink));

let (_input_lines, events) = random_events_with_stream(100, 10, None);
run_and_assert_nonsending_sink_compliance(sink, events, &[]).await;
run_and_assert_sink_compliance(sink, events, &SINK_TAGS).await;
}
}
7 changes: 5 additions & 2 deletions src/sinks/blackhole/sink.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use vector_lib::{
};

use crate::{
event::{EventArray, EventContainer},
event::{EventArray, EventContainer, EventStatus, Finalizable},
sinks::{blackhole::config::BlackholeConfig, util::StreamSink},
};

Expand Down Expand Up @@ -82,7 +82,7 @@ impl StreamSink<EventArray> for BlackholeSink {
});
}

while let Some(events) = input.next().await {
while let Some(mut events) = input.next().await {
if let Some(rate) = self.config.rate {
let factor: f32 = 1.0 / rate as f32;
let secs: f32 = factor * (events.len() as f32);
Expand All @@ -98,6 +98,9 @@ impl StreamSink<EventArray> for BlackholeSink {
.total_raw_bytes
.fetch_add(message_len.get(), Ordering::AcqRel);

let finalizers = events.take_finalizers();
finalizers.update_status(EventStatus::Delivered);

events_sent.emit(CountByteSize(events.len(), message_len));
bytes_sent.emit(ByteSize(message_len.get()));
}
Expand Down
Loading