Skip to content

Add discarded flag to digitiser aggregator spans #309

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
DanNixon merged 7 commits into from
Feb 4, 2025
Merged

Add discarded flag to digitiser aggregator spans #309

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f279e75
Added span
Modularius Feb 1, 2025
729b729
Changed name
Modularius Feb 1, 2025
690e895
Typo
Modularius Feb 1, 2025
935e0c3
Made requested changes
Modularius Feb 4, 2025
2b8902e
Updated tests
Modularius Feb 4, 2025
157eb6f
Updated tests
Modularius Feb 4, 2025
8c77af7
Formatting
Modularius Feb 4, 2025
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
24 changes: 13 additions & 11 deletions digitiser-aggregator/src/frame/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ where
digitiser_id: DigitizerId,
metadata: &FrameMetadata,
data: D,
) {
) -> Result<(), ()> {
if let Some(latest_timestamp_dispatched) = self.latest_timestamp_dispatched {
if metadata.timestamp <= latest_timestamp_dispatched {
warn!("Frame's timestamp earlier than or equal to the latest frame dispatched: {0} <= {1}", metadata.timestamp, latest_timestamp_dispatched);
return;
return Err(());
}
}
let frame = {
Expand Down Expand Up @@ -85,6 +85,8 @@ where
}) {
warn!("Frame span linking failed {e}")
}

Ok(())
}

pub(crate) fn poll(&mut self) -> Option<AggregatedFrame<D>> {
Expand Down Expand Up @@ -137,20 +139,20 @@ mod test {
assert!(cache.poll().is_none());

assert_eq!(cache.get_num_partial_frames(), 0);
cache.push(0, &frame_1, EventData::dummy_data(0, 5, &[0, 1, 2]));
let _ = cache.push(0, &frame_1, EventData::dummy_data(0, 5, &[0, 1, 2]));
assert_eq!(cache.get_num_partial_frames(), 1);

assert!(cache.poll().is_none());

cache.push(1, &frame_1, EventData::dummy_data(0, 5, &[3, 4, 5]));
let _ = cache.push(1, &frame_1, EventData::dummy_data(0, 5, &[3, 4, 5]));

assert!(cache.poll().is_none());

cache.push(4, &frame_1, EventData::dummy_data(0, 5, &[6, 7, 8]));
let _ = cache.push(4, &frame_1, EventData::dummy_data(0, 5, &[6, 7, 8]));

assert!(cache.poll().is_none());

cache.push(8, &frame_1, EventData::dummy_data(0, 5, &[9, 10, 11]));
let _ = cache.push(8, &frame_1, EventData::dummy_data(0, 5, &[9, 10, 11]));

{
let frame = cache.poll().unwrap();
Expand Down Expand Up @@ -198,15 +200,15 @@ mod test {

assert!(cache.poll().is_none());

cache.push(0, &frame_1, EventData::dummy_data(0, 5, &[0, 1, 2]));
let _ = cache.push(0, &frame_1, EventData::dummy_data(0, 5, &[0, 1, 2]));

assert!(cache.poll().is_none());

cache.push(1, &frame_1, EventData::dummy_data(0, 5, &[3, 4, 5]));
let _ = cache.push(1, &frame_1, EventData::dummy_data(0, 5, &[3, 4, 5]));

assert!(cache.poll().is_none());

cache.push(8, &frame_1, EventData::dummy_data(0, 5, &[9, 10, 11]));
let _ = cache.push(8, &frame_1, EventData::dummy_data(0, 5, &[9, 10, 11]));

assert!(cache.poll().is_none());

Expand Down Expand Up @@ -268,11 +270,11 @@ mod test {
assert_eq!(cache.frames.len(), 0);
assert!(cache.poll().is_none());

cache.push(1, &frame_1, EventData::dummy_data(0, 5, &[0, 1, 2]));
let _ = cache.push(1, &frame_1, EventData::dummy_data(0, 5, &[0, 1, 2]));
assert_eq!(cache.frames.len(), 1);
assert!(cache.poll().is_none());

cache.push(2, &frame_2, EventData::dummy_data(0, 5, &[0, 1, 2]));
let _ = cache.push(2, &frame_2, EventData::dummy_data(0, 5, &[0, 1, 2]));
assert_eq!(cache.frames.len(), 1);
assert!(cache.poll().is_some());
}
Expand Down
6 changes: 5 additions & 1 deletion digitiser-aggregator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ async fn process_kafka_message(
metadata_protons_per_pulse = tracing::field::Empty,
metadata_running = tracing::field::Empty,
num_cached_frames = cache.get_num_partial_frames(),
is_discarded,
))]
async fn process_digitiser_event_list_message(
channel_send: &AggregatedFrameToBufferSender,
Expand All @@ -269,9 +270,12 @@ async fn process_digitiser_event_list_message(
debug!("Event packet: metadata: {:?}", msg.metadata());

// Push the current digitiser message to the frame cache, possibly creating a new partial frame
cache.push(msg.digitizer_id(), &metadata, msg.into());
let is_discarded = cache
.push(msg.digitizer_id(), &metadata, msg.into())
.is_err();

record_metadata_fields_to_span!(&metadata, tracing::Span::current());
tracing::Span::current().record("is_discarded", is_discarded);

cache_poll(channel_send, cache).await?;
}
Expand Down