Skip to content
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

log: increase precision in log's timestamp to nanoseconds #9985

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

log: increase precision in log's timestamp to nanoseconds #9985

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65ba70f
log: increase precision in log's timestamp to nanoseconds
lecaros Feb 21, 2025
a23cfdd
log: create function get_current_time to include windows support
lecaros Feb 21, 2025
4d0149b
log: use cfl_time_now to get current time
lecaros Feb 22, 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
19 changes: 15 additions & 4 deletions src/flb_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <fluent-bit/flb_config.h>
#include <fluent-bit/flb_worker.h>
#include <fluent-bit/flb_mem.h>
#include "cfl/cfl_time.h"

#ifdef FLB_HAVE_AWS_ERROR_REPORTER
#include <fluent-bit/aws/flb_aws_error_reporter.h>
Expand All @@ -41,6 +42,8 @@ extern struct flb_aws_error_reporter *error_reporter;

FLB_TLS_DEFINE(struct flb_log, flb_log_ctx)

#define NANOSECONDS_IN_SECOND 1000000000

/* Simple structure to dispatch messages to the log collector */
struct log_message {
size_t size;
Expand Down Expand Up @@ -561,20 +564,27 @@ struct flb_log *flb_log_create(struct flb_config *config, int type,
return log;
}

void get_current_time(struct timespec *ts)
{
uint64_t now = cfl_time_now();
ts->tv_sec = now / NANOSECONDS_IN_SECOND;
ts->tv_nsec = now % NANOSECONDS_IN_SECOND;
}

int flb_log_construct(struct log_message *msg, int *ret_len,
int type, const char *file, int line, const char *fmt, va_list *args)
{
int body_size;
int ret;
int len;
int total;
time_t now;
const char *header_color = NULL;
const char *header_title = NULL;
const char *bold_color = ANSI_BOLD;
const char *reset_color = ANSI_RESET;
struct tm result;
struct tm *current;
struct timespec ts;

switch (type) {
case FLB_LOG_HELP:
Expand Down Expand Up @@ -620,15 +630,15 @@ int flb_log_construct(struct log_message *msg, int *ret_len,
}
#endif // FLB_LOG_NO_CONTROL_CHARS

now = time(NULL);
current = localtime_r(&now, &result);
get_current_time(&ts);
current = localtime_r(&ts.tv_sec, &result);

if (current == NULL) {
return -1;
}

len = snprintf(msg->msg, sizeof(msg->msg) - 1,
"%s[%s%i/%02i/%02i %02i:%02i:%02i%s]%s [%s%5s%s] ",
"%s[%s%i/%02i/%02i %02i:%02i:%02i.%03ld%s]%s [%s%5s%s] ",
/* time */ /* type */

/* time variables */
Expand All @@ -639,6 +649,7 @@ int flb_log_construct(struct log_message *msg, int *ret_len,
current->tm_hour,
current->tm_min,
current->tm_sec,
ts.tv_nsec,
bold_color, reset_color,

/* type format */
Expand Down
Loading