Skip to content

in_tail: skip_empty_line supports CRLF line #8474

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
edsiper merged 2 commits into from
Mar 25, 2024
Merged

in_tail: skip_empty_line supports CRLF line #8474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c572c2c
tests: runtime: in_tail: add test for skip_empty_line_crlf
nokute78 Feb 10, 2024
6068bc1
in_tail: skip_empty_line supports CRLF line
nokute78 Feb 10, 2024
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
16 changes: 11 additions & 5 deletions plugins/in_tail/tail_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,11 +477,17 @@ static int process_content(struct flb_tail_file *file, size_t *bytes)
* property to revert this behavior if some user is affected by
* this change.
*/

if (len == 0 && ctx->skip_empty_lines) {
data++;
processed_bytes++;
continue;
if (ctx->skip_empty_lines) {
if (len == 0) { /* LF */
data++;
processed_bytes++;
continue;
}
else if (len == 1 && data[0] == '\r') { /* CR LF */
data += 2;
processed_bytes += 2;
continue;
}
}

/* Process '\r\n' */
Expand Down
70 changes: 70 additions & 0 deletions tests/runtime/in_tail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,6 +1144,75 @@ void flb_test_skip_empty_lines()
test_tail_ctx_destroy(ctx);
}

void flb_test_skip_empty_lines_crlf()
{
struct flb_lib_out_cb cb_data;
struct test_tail_ctx *ctx;
char *file[] = {"skip_empty_lines_crlf.log"};
char *empty_lines[] = {"\r\n", "\r\n"};
char *msg = "lalala";
int ret;
int num;
int i;

char *expected_strs[] = {msg};
struct str_list expected = {
.size = sizeof(expected_strs)/sizeof(char*),
.lists = &expected_strs[0],
};

clear_output_num();

cb_data.cb = cb_check_json_str_list;
cb_data.data = &expected;

ctx = test_tail_ctx_create(&cb_data, &file[0], sizeof(file)/sizeof(char *), FLB_TRUE);
if (!TEST_CHECK(ctx != NULL)) {
TEST_MSG("test_ctx_create failed");
exit(EXIT_FAILURE);
}

ret = flb_input_set(ctx->flb, ctx->o_ffd,
"path", file[0],
"skip_empty_lines", "true",
"Read_From_Head", "true",
NULL);
TEST_CHECK(ret == 0);

ret = flb_output_set(ctx->flb, ctx->o_ffd,
"format", "json",
NULL);
TEST_CHECK(ret == 0);

ret = write_msg(ctx, msg, strlen(msg));
if (!TEST_CHECK(ret > 0)) {
test_tail_ctx_destroy(ctx);
exit(EXIT_FAILURE);
}

for (i=0; i<sizeof(empty_lines)/sizeof(char*); i++) {
ret = write_msg(ctx, empty_lines[i], strlen(empty_lines[i]));
if (!TEST_CHECK(ret > 0)) {
test_tail_ctx_destroy(ctx);
exit(EXIT_FAILURE);
}
}

/* Start the engine */
ret = flb_start(ctx->flb);
TEST_CHECK(ret == 0);

/* waiting to flush */
flb_time_msleep(500);

num = get_output_num();
if (!TEST_CHECK(num == 1)) {
TEST_MSG("output error: expect=1 got=%d", num);
}

test_tail_ctx_destroy(ctx);
}

static int ignore_older(int expected, char *ignore_older)
{
struct flb_lib_out_cb cb_data;
Expand Down Expand Up @@ -1557,6 +1626,7 @@ TEST_LIST = {
{"exclude_path", flb_test_exclude_path},
{"offset_key", flb_test_offset_key},
{"skip_empty_lines", flb_test_skip_empty_lines},
{"skip_empty_lines_crlf", flb_test_skip_empty_lines_crlf},
{"ignore_older", flb_test_ignore_older},
#ifdef FLB_HAVE_INOTIFY
{"inotify_watcher_false", flb_test_inotify_watcher_false},
Expand Down