out_logrotate: update fluent auto CR comments

SagiROosto · SagiROosto · commit b4160195e386 · 2025-11-05T17:42:05.000+02:00
Signed-off-by: SagiROosto &lt;sagi.rosenthal@oosto.com&gt;
diff --git a/conf/fluent-bit-logrotate.conf b/conf/fluent-bit-logrotate.conf
@@ -15,7 +15,7 @@
     Path        /tmp/logs
     File        test.log
     Format      json
-    Max_Size    10
+    Max_Size    10M
     Max_Files   5
     Gzip        On
     Mkdir       On
diff --git a/plugins/out_logrotate/CMakeLists.txt b/plugins/out_logrotate/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(src
   logrotate.c)
 
-FLB_PLUGIN(out_logrotate "${src}" "")
+find_package(ZLIB REQUIRED)
+FLB_PLUGIN(out_logrotate "${src}" "${ZLIB_LIBRARIES}")
diff --git a/plugins/out_logrotate/logrotate.c b/plugins/out_logrotate/logrotate.c
@@ -36,6 +36,11 @@
 #include <string.h>
 #include <time.h>
 #include <miniz/miniz.h>
+#include <limits.h>     /* PATH_MAX */
+#include <inttypes.h>   /* PRIu64 */
+#ifndef FLB_SYSTEM_WINDOWS
+#include <libgen.h>     /* dirname */
+#endif
 
 #ifdef FLB_SYSTEM_WINDOWS
 #include <Shlobj.h>
@@ -465,7 +470,7 @@ static int mkpath(struct flb_output_instance *ins, const char *dir)
 
     return 0;
 #elif FLB_SYSTEM_MACOS
-    dup_dir = strdup(dir);
+    dup_dir = flb_strdup(dir);
     if (!dup_dir) {
         return -1;
     }
@@ -479,27 +484,27 @@ static int mkpath(struct flb_output_instance *ins, const char *dir)
         if (S_ISDIR (st.st_mode)) {
             flb_plg_debug(ins, "creating directory %s", dup_dir);
             ret = mkdir(dup_dir, 0755);
-            free(dup_dir);
+            flb_free(dup_dir);
             return ret;
         }
     }
 
     ret = mkpath(ins, dirname(dup_dir));
     if (ret != 0) {
-        free(dup_dir);
+        flb_free(dup_dir);
         return ret;
     }
     flb_plg_debug(ins, "creating directory %s", dup_dir);
     ret = mkdir(dup_dir, 0755);
-    free(dup_dir);
+    flb_free(dup_dir);
     return ret;
 #else
-    dup_dir = strdup(dir);
+    dup_dir = flb_strdup(dir);
     if (!dup_dir) {
         return -1;
     }
     ret = mkpath(ins, dirname(dup_dir));
-    free(dup_dir);
+    flb_free(dup_dir);
     if (ret != 0) {
         return ret;
     }
@@ -517,18 +522,23 @@ static int should_rotate_file(struct flb_logrotate_conf *ctx)
 /* Function to update file size counter using current file position */
 static void update_file_size_counter(struct flb_logrotate_conf *ctx, FILE *fp)
 {
-    long current_pos = ftell(fp);
-    if (current_pos >= 0) {
-        ctx->current_file_size = (size_t)current_pos;
+    struct stat st;
+    if (fstat(fileno(fp), &st) == 0 && st.st_size >= 0) {
+        ctx->current_file_size = (size_t) st.st_size;
     }
 }
 
 /* Function to generate timestamp for rotated file */
 static void generate_timestamp(char *timestamp, size_t size)
 {
     time_t now = time(NULL);
-    struct tm *tm_info = localtime(&now);
-    strftime(timestamp, size, "%Y%m%d_%H%M%S", tm_info);
+    struct tm tm_info;
+#ifdef FLB_SYSTEM_WINDOWS
+    localtime_s(&tm_info, &now);
+#else
+    localtime_r(&now, &tm_info);
+#endif
+    strftime(timestamp, size, "%Y%m%d_%H%M%S", &tm_info);
 }
 
 /* Helper function to write gzip header (based on flb_gzip.c) */
@@ -619,7 +629,7 @@ static int gzip_compress_file(const char *input_filename, const char *output_fil
         goto cleanup;
     }
 
-    /* Process file in chunks */
+    /* Process file in chunks (ensure Z_FINISH is always issued) */
     do {
         bytes_read = fread(input_buffer, 1, GZIP_CHUNK_SIZE, src_fp);
         if (bytes_read > 0) {
@@ -631,7 +641,7 @@ static int gzip_compress_file(const char *input_filename, const char *output_fil
             strm.next_in = (Bytef *)input_buffer;
             strm.avail_in = bytes_read;
             
-            /* Determine flush mode */
+            /* Determine flush mode based on EOF after this read */
             flush = feof(src_fp) ? Z_FINISH : Z_NO_FLUSH;
 
             /* Compress chunk */
@@ -869,7 +879,7 @@ static void cb_logrotate_flush(struct flb_event_chunk *event_chunk,
     /* Check if file needs rotation based on current size counter */
     if (should_rotate_file(ctx)) {
         /* Extract directory and base filename for cleanup */
-        out_file_copy = strdup(out_file);
+        out_file_copy = flb_strdup(out_file);
         if (out_file_copy) {
 #ifdef FLB_SYSTEM_WINDOWS
             PathRemoveFileSpecA(out_file_copy);
@@ -879,7 +889,7 @@ static void cb_logrotate_flush(struct flb_event_chunk *event_chunk,
             strncpy(directory, dirname(out_file_copy), PATH_MAX - 1);
             directory[PATH_MAX - 1] = '\0';
 #endif
-            free(out_file_copy);
+            flb_free(out_file_copy);
         }
 
         /* Get base filename for cleanup */
@@ -903,15 +913,15 @@ static void cb_logrotate_flush(struct flb_event_chunk *event_chunk,
     /* Open output file with default name as the Tag */
     fp = fopen(out_file, "ab+");
     if (ctx->mkdir == FLB_TRUE && fp == NULL && errno == ENOENT) {
-        out_file_copy = strdup(out_file);
+        out_file_copy = flb_strdup(out_file);
         if (out_file_copy) {
 #ifdef FLB_SYSTEM_WINDOWS
             PathRemoveFileSpecA(out_file_copy);
             ret = mkpath(ctx->ins, out_file_copy);
 #else
             ret = mkpath(ctx->ins, dirname(out_file_copy));
 #endif
-            free(out_file_copy);
+            flb_free(out_file_copy);
             if (ret == 0) {
                 fp = fopen(out_file, "ab+");
             }
diff --git a/tests/runtime/out_logrotate.c b/tests/runtime/out_logrotate.c
@@ -115,7 +115,7 @@ void flb_test_logrotate_basic_rotation(void)
     TEST_CHECK(out_ffd >= 0);
     flb_output_set(ctx, out_ffd, "match", "test", NULL);
     flb_output_set(ctx, out_ffd, "file", TEST_LOGFILE, NULL);
-    flb_output_set(ctx, out_ffd, "max_size", "1", NULL); /* 1 MB */
+    flb_output_set(ctx, out_ffd, "max_size", "1M", NULL); /* 1 MB */
     flb_output_set(ctx, out_ffd, "max_files", "3", NULL);
     flb_output_set(ctx, out_ffd, "gzip", "false", NULL);
 
@@ -142,13 +142,8 @@ void flb_test_logrotate_basic_rotation(void)
         fclose(fp);
     }
 
-    /* Check that a rotated file was created */
-    fp = fopen(rotated_file, "r");
-    TEST_CHECK(fp != NULL);
-    if (fp != NULL) {
-        fclose(fp);
-        remove(rotated_file);
-    }
+    /* Check that at least one rotated file exists: "flb_test_logrotate.log.*" */
+    TEST_CHECK(count_files_in_directory(".", "flb_test_logrotate.log.") >= 1);
 
     remove(TEST_LOGFILE);
 }
@@ -187,7 +182,7 @@ void flb_test_logrotate_gzip_compression(void)
     TEST_CHECK(out_ffd >= 0);
     flb_output_set(ctx, out_ffd, "match", "test", NULL);
     flb_output_set(ctx, out_ffd, "file", TEST_LOGFILE, NULL);
-    flb_output_set(ctx, out_ffd, "max_size", "1", NULL);  /* 1 MB */
+    flb_output_set(ctx, out_ffd, "max_size", "1M", NULL);  /* 1 MB */
     flb_output_set(ctx, out_ffd, "max_files", "3", NULL);
     flb_output_set(ctx, out_ffd, "gzip", "true", NULL);
 
@@ -206,10 +201,23 @@ void flb_test_logrotate_gzip_compression(void)
     flb_stop(ctx);
     flb_destroy(ctx);
 
-    /* Check that a gzipped rotated file was created */
-    snprintf(rotated_file, sizeof(rotated_file), "%s.%s", TEST_LOGFILE, timestamp);
-    ret = check_gzip_file_exists(rotated_file);
-    TEST_CHECK(ret == 1);
+    /* Check that a gzipped rotated file exists: "flb_test_logrotate.log.*.gz" */
+     ret = 0;
+     {
+         DIR *dir = opendir(".");
+         struct dirent *entry;
+         if (dir) {
+             while ((entry = readdir(dir)) != NULL) {
+                 if (strstr(entry->d_name, "flb_test_logrotate.log.") == entry->d_name &&
+                     strstr(entry->d_name, ".gz") != NULL) {
+                     ret = 1;
+                     break;
+                 }
+             }
+             closedir(dir);
+         }
+     }
+     TEST_CHECK(ret == 1);
 
     /* Clean up */
     remove(rotated_file);
@@ -241,7 +249,7 @@ void flb_test_logrotate_max_files_cleanup(void)
     TEST_CHECK(out_ffd >= 0);
     flb_output_set(ctx, out_ffd, "match", "test", NULL);
     flb_output_set(ctx, out_ffd, "file", TEST_LOGFILE, NULL);
-    flb_output_set(ctx, out_ffd, "max_size", "1", NULL);  /* 1 MB */
+    flb_output_set(ctx, out_ffd, "max_size", "1M", NULL);  /* 1 MB */
     flb_output_set(ctx, out_ffd, "max_files", "2", NULL); /* Only keep 2 files */
     flb_output_set(ctx, out_ffd, "gzip", "false", NULL);
 
@@ -293,7 +301,7 @@ void flb_test_logrotate_counter_based_size(void)
     TEST_CHECK(out_ffd >= 0);
     flb_output_set(ctx, out_ffd, "match", "test", NULL);
     flb_output_set(ctx, out_ffd, "file", TEST_LOGFILE, NULL);
-    flb_output_set(ctx, out_ffd, "max_size", "1", NULL);  /* 1 MB */
+    flb_output_set(ctx, out_ffd, "max_size", "1M", NULL);  /* 1 MB */
     flb_output_set(ctx, out_ffd, "max_files", "3", NULL);
     flb_output_set(ctx, out_ffd, "gzip", "false", NULL);
 
@@ -352,7 +360,8 @@ void flb_test_logrotate_different_formats(void)
     flb_output_set(ctx, out_ffd, "match", "test", NULL);
     flb_output_set(ctx, out_ffd, "file", TEST_LOGFILE, NULL);
     flb_output_set(ctx, out_ffd, "format", "csv", NULL);
-    flb_output_set(ctx, out_ffd, "max_size", "10", NULL);  /* 10 MB */
+    flb_output_set(ctx, out_ffd, "csv_column_names", "true", NULL);
+    flb_output_set(ctx, out_ffd, "max_size", "10M", NULL);  /* 10 MB */
     flb_output_set(ctx, out_ffd, "max_files", "3", NULL);
     flb_output_set(ctx, out_ffd, "gzip", "false", NULL);
 
@@ -420,7 +429,7 @@ void flb_test_logrotate_mkdir_support(void)
     flb_output_set(ctx, out_ffd, "match", "test", NULL);
     flb_output_set(ctx, out_ffd, "path", TEST_LOGPATH, NULL);
     flb_output_set(ctx, out_ffd, "mkdir", "true", NULL);
-    flb_output_set(ctx, out_ffd, "max_size", "10", NULL);
+    flb_output_set(ctx, out_ffd, "max_size", "10M", NULL);
     flb_output_set(ctx, out_ffd, "max_files", "3", NULL);
     flb_output_set(ctx, out_ffd, "gzip", "false", NULL);
 
@@ -474,7 +483,7 @@ void flb_test_logrotate_performance_test(void)
     TEST_CHECK(out_ffd >= 0);
     flb_output_set(ctx, out_ffd, "match", "test", NULL);
     flb_output_set(ctx, out_ffd, "file", TEST_LOGFILE, NULL);
-    flb_output_set(ctx, out_ffd, "max_size", "10", NULL);  /* 10 MB */
+    flb_output_set(ctx, out_ffd, "max_size", "10M", NULL);  /* 10 MB */
     flb_output_set(ctx, out_ffd, "max_files", "3", NULL);
     flb_output_set(ctx, out_ffd, "gzip", "false", NULL);
 
