temp: log_path_options_init followup in tests

Signed-off-by: Szilard Parrag <[email protected]>
axoflow · Oct 14, 2024 · 16f7479 · 16f7479
1 parent c11d49f
commit 16f7479
Show file tree

Hide file tree

Showing 29 changed files with 156 additions and 52 deletions.
diff --git a/lib/ack-tracker/tests/test_batched_ack_tracker.c b/lib/ack-tracker/tests/test_batched_ack_tracker.c
@@ -201,7 +201,9 @@ Test(batched_ack_tracker, bookmark_saving)
   log_source_post(src, msg1);
   cr_expect_eq(window_size_counter_get(&src->window_size, NULL), 9);
   cr_assert_eq(msg1->ack_record->tracker, ack_tracker);
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   log_msg_ack(msg1, &path_options, AT_PROCESSED);
   cr_expect_eq(saved_ctr, 0);
   cr_expect_eq(destroy_ctr, 0);
@@ -260,7 +262,9 @@ Test(batched_ack_tracker, batch_timeout)
   log_source_post(src, msg1);
   cr_expect_eq(window_size_counter_get(&src->window_size, NULL), 9);
   cr_assert_eq(msg1->ack_record->tracker, ack_tracker);
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   log_msg_ack(msg1, &path_options, AT_PROCESSED);
   cr_expect_eq(saved_ctr, 0);
   cr_expect_eq(destroy_ctr, 0);
@@ -300,7 +304,9 @@ Test(batched_ack_tracker, deinit_acks_partial_batch)
   log_source_post(src, msg1);
   cr_expect_eq(window_size_counter_get(&src->window_size, NULL), 9);
   cr_assert_eq(msg1->ack_record->tracker, ack_tracker);
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   log_msg_ack(msg1, &path_options, AT_PROCESSED);
   cr_expect_eq(saved_ctr, 0);
   cr_expect_eq(destroy_ctr, 0);

diff --git a/lib/ack-tracker/tests/test_instant_ack_tracker.c b/lib/ack-tracker/tests/test_instant_ack_tracker.c
@@ -157,7 +157,9 @@ Test(instant_ack_tracker_bookmarkless, bookmark_save_not_called_when_acked)
   // this is why we need a dummy 'destination' : keep back ACK
   cr_expect_eq(window_size_counter_get(&src->window_size, NULL), 9);
   cr_assert_eq(msg->ack_record->tracker, ack_tracker);
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   log_msg_ack(msg, &path_options, AT_PROCESSED);
   // okay, ACK is done, but save counter is 0 -> so Bookmark::save not called
   cr_expect_eq(saved_ctr, 0);
@@ -221,7 +223,9 @@ Test(instant_ack_tracker, bookmark_saving)
   // this is why we need a dummy 'destination' : keep back ACK
   cr_expect_eq(window_size_counter_get(&src->window_size, NULL), 9);
   cr_assert_eq(msg->ack_record->tracker, ack_tracker);
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   log_msg_ack(msg, &path_options, AT_PROCESSED);
   // okay, ACK is done, save counter is 1
   cr_expect_eq(saved_ctr, 1);

diff --git a/lib/filter/tests/test_filters_statistics.c b/lib/filter/tests/test_filters_statistics.c
@@ -55,7 +55,9 @@ create_log_filter_pipe(void)
 static void
 queue_and_assert_statistics(LogFilterPipe *pipe, gchar *msg, guint32 matched_expected, guint32 not_matched_expected)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   LogMessage *logmsg = msg_format_parse(&parse_options, (const guchar *) msg, strlen(msg));
   LogPipe *p = (LogPipe *)pipe;
   p->queue(p, logmsg, &path_options);

diff --git a/lib/logmsg/tests/test_log_message.c b/lib/logmsg/tests/test_log_message.c
@@ -77,7 +77,9 @@ assert_log_msg_clear_clears_all_properties(LogMessage *message, NVHandle nv_hand
                                            NVHandle sd_handle, const gchar *tag_name)
 {
   message->flags |= LF_LOCAL + LF_UTF8 + LF_INTERNAL + LF_MARK;
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   log_msg_make_writable(&message, &path_options);
   log_msg_clear(message);
@@ -146,7 +148,9 @@ log_message_test_params_free(LogMessageTestParams *params)
 LogMessage *
 log_message_test_params_clone_message(LogMessageTestParams *params)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   params->cloned_message = log_msg_clone_cow(params->message, &path_options);
 
   return params->cloned_message;
@@ -214,7 +218,9 @@ Test(log_message, test_log_msg_clear_handles_cloned_noninline_tags_properly)
       log_msg_set_tag_by_name(msg, tag_name);
     }
 
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   LogMessage *cloned = log_msg_clone_cow(msg, &path_options);
 
   log_msg_clear(cloned);
@@ -882,7 +888,9 @@ Test(log_message, test_cow_writing_cloned_message)
   LogMessage *msg = _construct_log_message();
   log_msg_set_value_by_name(msg, "orig_name", "orig_value", -1);
 
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   LogMessage *cloned = log_msg_clone_cow(msg, &path_options);
 
   log_msg_set_value_by_name(cloned, "cloned_name", "cloned_value", -1);
@@ -912,7 +920,9 @@ Test(log_message, test_cow_make_writable)
 
   LogMessage *orig_msg = log_msg_ref(msg);
 
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   log_msg_make_writable(&msg, &path_options);
 
   log_msg_set_value_by_name(msg, "orig_name2", "orig_value2", -1);
@@ -934,7 +944,9 @@ Test(log_message, test_cow_unset_value)
 
   LogMessage *orig_msg = log_msg_ref(msg);
 
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   log_msg_make_writable(&msg, &path_options);
 
   log_msg_unset_value_by_name(msg, "orig_name");

diff --git a/lib/rewrite/tests/test_rename.c b/lib/rewrite/tests/test_rename.c
@@ -37,7 +37,9 @@ LogMessage *msg;
 static void
 _perform_rewrite(LogRewrite *rewrite, LogMessage *msg_)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   cr_assert(log_pipe_init(&rewrite->super));
   log_pipe_queue(&rewrite->super, log_msg_ref(msg_), &path_options);

diff --git a/lib/rewrite/tests/test_set_facility.c b/lib/rewrite/tests/test_set_facility.c
@@ -47,7 +47,9 @@ _create_template(const gchar *str)
 static void
 _perform_rewrite(LogRewrite *rewrite, LogMessage *msg_)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   log_pipe_init(&rewrite->super);
   log_pipe_queue(&rewrite->super, log_msg_ref(msg_), &path_options);

diff --git a/lib/rewrite/tests/test_set_matches.c b/lib/rewrite/tests/test_set_matches.c
@@ -38,7 +38,9 @@ LogMessage *msg;
 static void
 _perform_rewrite(LogRewrite *rewrite, LogMessage *msg_)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   log_pipe_init(&rewrite->super);
   log_pipe_queue(&rewrite->super, log_msg_ref(msg_), &path_options);

diff --git a/lib/rewrite/tests/test_set_pri.c b/lib/rewrite/tests/test_set_pri.c
@@ -49,7 +49,9 @@ _create_template(const gchar *str)
 static void
 _perform_rewrite(LogRewrite *rewrite, LogMessage *msg_)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   log_pipe_init(&rewrite->super);
   log_pipe_queue(&rewrite->super, log_msg_ref(msg_), &path_options);

diff --git a/lib/rewrite/tests/test_set_severity.c b/lib/rewrite/tests/test_set_severity.c
@@ -48,7 +48,9 @@ _create_template(const gchar *str)
 static void
 _perform_rewrite(LogRewrite *rewrite, LogMessage *msg_)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   log_pipe_init(&rewrite->super);
   log_pipe_queue(&rewrite->super, log_msg_ref(msg_), &path_options);

diff --git a/lib/rewrite/tests/test_set_tag.c b/lib/rewrite/tests/test_set_tag.c
@@ -47,7 +47,9 @@ _create_template(const gchar *str)
 static void
 _perform_rewrite(LogRewrite *rewrite, LogMessage *msg_)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   log_pipe_init(&rewrite->super);
   log_pipe_queue(&rewrite->super, log_msg_ref(msg_), &path_options);

diff --git a/lib/tests/test_clone_logmsg.c b/lib/tests/test_clone_logmsg.c
@@ -98,7 +98,9 @@ ParameterizedTest(const gchar *msg, clone_logmsg, test_cloning_with_log_message)
   LogMessage *original_log_message, *log_message, *cloned_log_message;
   regex_t bad_hostname;
   GSockAddr *addr = g_sockaddr_inet_new("10.10.10.10", 1010);
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   parse_options.flags = LP_SYSLOG_PROTOCOL;
   parse_options.bad_hostname = &bad_hostname;

diff --git a/lib/tests/test_logqueue.c b/lib/tests/test_logqueue.c
@@ -56,7 +56,9 @@ _threaded_feed(gpointer args)
 {
   LogQueue *q = args;
   gint i;
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   LogMessage *msg, *tmpl;
   struct timespec start, end;
   glong diff;
@@ -96,7 +98,9 @@ _threaded_consume(gpointer st)
 {
   LogQueue *q = (LogQueue *) st;
   LogMessage *msg;
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   gint msg_count = 0;
 
   iv_init();

diff --git a/lib/tests/test_logscheduler.c b/lib/tests/test_logscheduler.c
@@ -95,7 +95,9 @@ Test(logscheduler, test_log_scheduler_can_be_constructed)
   s = log_scheduler_new(&options, &test_pipe->super);
 
   LogMessage *msg = create_sample_message();
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   log_scheduler_push(s, msg, &path_options);
 
   msg = create_sample_message();

diff --git a/modules/affile/tests/test_wildcard_file_reader.c b/modules/affile/tests/test_wildcard_file_reader.c
@@ -57,7 +57,9 @@ test_deleted_file_state_event_new(void)
 
 TestFileStateEvent *test_event;
 WildcardFileReader *reader;
-LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+LogPathOptions path_options;
+FilterXEvalContext filterx_eval_context;
+log_path_options_init(&path_options, &filterx_eval_context);
 
 /* MOCKS */
 

diff --git a/modules/afsnmp/tests/test_snmptrapd_parser.c b/modules/afsnmp/tests/test_snmptrapd_parser.c
@@ -75,7 +75,9 @@ copy_str_into_log_message(const gchar *message)
 static gboolean
 _process_log_message(LogParser *parser, LogMessage *msg)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   return log_parser_process_message(parser, &msg, &path_options);
 }
 

diff --git a/modules/correlation/tests/test_grouping_by.c b/modules/correlation/tests/test_grouping_by.c
@@ -54,7 +54,9 @@ _create_input_msg(const gchar *prog)
 void
 _process_msg(LogParser *parser, const gchar *prog)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   LogMessage *msg = _create_input_msg(prog);
   /* NOTE: log_pipe_queue() consumes a reference */

diff --git a/modules/csvparser/tests/test_csvparser_statistics.c b/modules/csvparser/tests/test_csvparser_statistics.c
@@ -30,7 +30,9 @@
 #include "apphook.h"
 #include "cfg.h"
 
-LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+LogPathOptions path_options;
+FilterXEvalContext filterx_eval_context;
+log_path_options_init(&path_options, &filterx_eval_context);
 
 static LogParser *
 _create_parser(GlobalConfig *cfg)

diff --git a/modules/diskq/tests/test_diskq.c b/modules/diskq/tests/test_diskq.c
@@ -185,7 +185,9 @@ threaded_feed(gpointer args)
 {
   LogQueue *q = (LogQueue *)args;
   gint i;
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   LogMessage *msg, *tmpl;
   struct timespec start, end;
   glong diff;
@@ -225,7 +227,9 @@ static gpointer
 threaded_consume(gpointer st)
 {
   LogQueue *q = (LogQueue *) st;
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   gint i;
 
   iv_init();

diff --git a/modules/diskq/tests/test_diskq_counters.c b/modules/diskq/tests/test_diskq_counters.c
@@ -80,7 +80,9 @@ _serialize_func(SerializeArchive *sa, gpointer user_data)
 static void
 _push_one_message(LogQueue *q, gssize *memory_size, gssize *serialized_size)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   path_options.ack_needed = FALSE;
   path_options.flow_control_requested = TRUE;
 

diff --git a/modules/diskq/tests/test_diskq_truncate.c b/modules/diskq/tests/test_diskq_truncate.c
@@ -463,7 +463,9 @@ Test(diskq_truncate, test_diskq_truncate_size_ratio_1)
 static void
 _feed_one_large_message(LogQueue *q)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   path_options.ack_needed = FALSE;
   path_options.flow_control_requested = TRUE;
 

diff --git a/modules/diskq/tests/test_logqueue_disk.c b/modules/diskq/tests/test_logqueue_disk.c
@@ -56,7 +56,9 @@ _push_corrupted_msg(LogQueue *queue)
 static void
 _pop_msg(LogQueue *queue)
 {
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   LogMessage *msg = log_queue_pop_head(queue, &path_options);
 
   // If the message was stored in front_cache in addition to qdisk, it can be popped successfully.
@@ -291,7 +293,9 @@ Test(logqueue_disk, restart_corrupted_non_reliable_with_front_cache)
   _assert_file_exists(filename);
   _assert_log_queue_disk_non_reliable_is_empty(queue);
 
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
   LogMessage *msg = log_msg_new_empty();
   log_queue_push_tail(queue, msg, &path_options);
 
@@ -354,7 +358,9 @@ Test(logqueue_disk, restart_corrupted_with_multiple_queues)
   cr_assert(log_queue_disk_start(queue_1));
   cr_assert(log_queue_disk_start(queue_2));
 
-  LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+  LogPathOptions path_options;
+  FilterXEvalContext filterx_eval_context;
+  log_path_options_init(&path_options, &filterx_eval_context);
 
   log_queue_push_tail(queue_1, log_msg_new_empty(), &path_options);
   cr_assert_eq(stats_counter_get(queue_1->metrics.shared.queued_messages), 1);

diff --git a/modules/diskq/tests/test_reliable_backlog.c b/modules/diskq/tests/test_reliable_backlog.c
@@ -250,7 +250,9 @@ _prepare_rewind_backlog_test(LogQueueDiskReliable *dq, gint64 *start_pos)
 
   for (i = 0; i < 8; i++)
     {
-      LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+      LogPathOptions path_options;
+      FilterXEvalContext filterx_eval_context;
+      log_path_options_init(&path_options, &filterx_eval_context);
       LogMessage *mark_message;
       mark_message = log_msg_new_mark();
       mark_message->ack_func = _dummy_ack;
@@ -261,7 +263,9 @@ _prepare_rewind_backlog_test(LogQueueDiskReliable *dq, gint64 *start_pos)
   for (i = 0; i < 8; i++)
     {
       LogMessage *msg;
-      LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+      LogPathOptions path_options;
+      FilterXEvalContext filterx_eval_context;
+      log_path_options_init(&path_options, &filterx_eval_context);
       msg = log_queue_pop_head(&dq->super.super, &path_options);
       log_msg_unref(msg);
     }
@@ -281,7 +285,9 @@ _prepare_rewind_backlog_test(LogQueueDiskReliable *dq, gint64 *start_pos)
    */
   for (i = 0; i < 3; i++)
     {
-      LogPathOptions path_options = LOG_PATH_OPTIONS_INIT;
+      LogPathOptions path_options;
+      FilterXEvalContext filterx_eval_context;
+      log_path_options_init(&path_options, &filterx_eval_context);
       LogMessage *mark_message;
       mark_message = log_msg_new_mark();
       mark_message->ack_func = _dummy_ack;