log: increase precision in log's timestamp to nanoseconds

Signed-off-by: lecaros <[email protected]>

Author: lecaros

src/flb_log.c

@@ -32,6 +32,7 @@
 #include <fluent-bit/flb_config.h>
 #include <fluent-bit/flb_worker.h>
 #include <fluent-bit/flb_mem.h>
+#include <fluent-bit/flb_time.h>
 #include <cmetrics/cmetrics.h>
 #include <cmetrics/cmt_counter.h>
 
@@ -673,13 +674,13 @@ int flb_log_construct(struct log_message *msg, int *ret_len,
     int ret;
     int len;
     int total;
-    time_t now;
     const char *header_color = NULL;
     const char *header_title;
     const char *bold_color = ANSI_BOLD;
     const char *reset_color = ANSI_RESET;
     struct tm result;
     struct tm *current;
+    struct flb_time now;
 
     switch (type) {
     case FLB_LOG_HELP:
@@ -718,16 +719,16 @@ 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);
+    flb_time_get(&now);
+    current = localtime_r(&now.tm.tv_sec, &result);
 
     if (current == NULL) {
         return -1;
     }
 
     header_title = flb_log_message_type_str(type);
     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 */
@@ -738,6 +739,7 @@ int flb_log_construct(struct log_message *msg, int *ret_len,
                    current->tm_hour,
                    current->tm_min,
                    current->tm_sec,
+                   now.tm.tv_nsec,
                    bold_color, reset_color,
 
                    /* type format */
@@ -800,11 +802,8 @@ void flb_log_print(int type, const char *file, int line, const char *fmt, ...)
     int ret;
     struct log_message msg = {0};
     va_list args;
-    const char *msg_type_str;
-    uint64_t ts;
 
     struct flb_worker *w;
-    struct flb_config *config;
 
     va_start(args, fmt);
     ret = flb_log_construct(&msg, &len, type, file, line, fmt, &args);
@@ -816,25 +815,6 @@ void flb_log_print(int type, const char *file, int line, const char *fmt, ...)
 
     w = flb_worker_get();
     if (w) {
-        config = w->config;
-        if (config != NULL && config->log != NULL) {
-            msg_type_str = flb_log_message_type_str(type);
-            if (msg_type_str == NULL) {
-                msg_type_str = "unknown";
-            }
-
-            ts = cfl_time_now();
-            ret = cmt_counter_inc(config->log->metrics->logs_total_counter,
-                                  ts,
-                                  1, (char *[]) {msg_type_str});
-            if (ret == -1) {
-                /* Not using flb_log_debug to avoid recursing into this same function. */
-                fprintf(stderr,
-                        "[log] failed to increment log total counter for message type '%s' (error=%d)\n",
-                        msg_type_str, ret);
-            }
-        }
-
         n = flb_pipe_write_all(w->log[1], &msg, sizeof(msg));
 
         if (n == -1) {
@@ -894,7 +874,6 @@ int flb_log_destroy(struct flb_log *log, struct flb_config *config)
     }
     flb_log_worker_destroy(log->worker);
     flb_free(log->worker);
-    flb_log_metrics_destroy(log->metrics);
     flb_free(log);
 
     return 0;