logging: Implement get_delay_queue_size()

Primarily for introspection given that re-delaying may exceed
queue sizes.
This commit is contained in:
Arne Welzel 2023-11-23 21:09:41 +01:00
parent f0e67022fd
commit 2dbb467ba2
8 changed files with 213 additions and 0 deletions

View file

@ -0,0 +1,83 @@
# @TEST-DOC: Delay queue testing.
# @TEST-EXEC: zeek -B logging,tm -b -r $TRACES/http/get.trace test.zeek %INPUT
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stdout
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
# @TEST-EXEC: zeek-cut -m -F'|' < test.log > test.cut
# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff test.cut
@TEST-START-FILE test.zeek
# Used by all tests below.
# Debug printing
global packet_count = 0;
redef enum Log::ID += {
LOG
};
type Info: record {
ts: time &log;
post_ts: time &log &optional;
write_ts: time &log &optional;
msg: string &log;
};
event new_packet(c: connection, p: pkt_hdr)
{
++packet_count;
print network_time(), "new_packet", packet_count, "queue size", Log::get_delay_queue_size(LOG);
local info = Info($ts=network_time(), $msg=fmt("packet number %s", packet_count));
Log::write(LOG, info);
print network_time(), "queue_size post write", Log::get_delay_queue_size(LOG);
}
hook log_policy(rec: Info, id: Log::ID, filter: Log::Filter)
{
print network_time(), "log_policy";
rec$write_ts = network_time();
}
event Pcap::file_done(p: string)
{
print network_time(), "Pcap::file_done", p;
}
@TEST-END-FILE test.zeek
event zeek_init()
{
print network_time(), "queue_size non-existing", Log::get_delay_queue_size(LOG);
Log::create_stream(LOG, [
$columns=Info,
$path="test",
$policy=log_policy,
$max_delay_interval=1msec,
]);
print network_time(), "queue_size existing", Log::get_delay_queue_size(LOG);
}
event zeek_done()
{
print network_time(), "queue_size done", Log::get_delay_queue_size(LOG);
}
hook Log::log_stream_policy(rec: Info, id: Log::ID)
{
if ( id != LOG )
return;
local now = network_time();
print now, "log_stream_policy", id, rec;
Log::delay(id, rec, function[now](rec2: Info, id2: Log::ID): bool {
local delayed_for = network_time() - now;
rec2$post_ts = network_time();
print network_time(), "post_delay_cb", rec2, delayed_for;
return T;
});
}