Feedback (temporary -- will squash into above)

Signed-off-by: Alec Holmes <[email protected]>

Author: alecholmes

src/flb_log.c

@@ -824,7 +824,14 @@ void flb_log_print(int type, const char *file, int line, const char *fmt, ...)
         if (config != NULL && config->log != NULL) {
             msg_type_str = flb_log_message_type_str(type);
             ts = cfl_time_now();
-            cmt_counter_inc(config->log->metrics->logs_total_counter, ts, 1, (char *[]) {msg_type_str}); // Ignoring inc error
+            ret = cmt_counter_inc(config->log->metrics->logs_total_counter,
+                                  ts,
+                                  1, (char *[]) {msg_type_str});
+            if (ret == -1) {
+                fprintf(stderr,
+                        "[log] failed to increment log total counter for message type '%s' (error=%d)\n",
+                        msg_type_str != NULL ? msg_type_str : "unknown", ret);
+            }
         }
 
         n = flb_pipe_write_all(w->log[1], &msg, sizeof(msg));

tests/runtime/core_internal_logger.c

@@ -117,7 +117,11 @@ int assert_internal_log_metrics(struct http_client_ctx *http_ctx, int fail_test)
     /* The process startup should have logged at least 1 info log */
     regex = flb_regex_create(
         "fluentbit_logger_logs_total\\{message_type=\"info\"\\} [1-9]+[0-9]*");
-    TEST_CHECK(regex != NULL);
+    if (!TEST_CHECK(regex != NULL)) {
+        TEST_MSG("Failed to create regex for info log count check");
+        flb_http_client_destroy(http_client);
+        return -1;
+    }
     if (!TEST_CHECK(flb_regex_match(
             regex, http_client->resp.payload, http_client->resp.payload_size))) {
         TEST_MSG("response payload: %s\n", http_client->resp.payload);
@@ -164,8 +168,8 @@ static void test_internal_log_metrics()
 
     /* If the assertion fails, retry in a sleep loop since the fluent-bit's HTTP server
      * may not be ready yet */
-    for (i = 1; i <= attempt_count; i++) {
-        if (assert_internal_log_metrics(http_ctx, i == attempt_count ? FLB_TRUE : FLB_FALSE)) {
+    for (i = 0; i < attempt_count; i++) {
+        if (assert_internal_log_metrics(http_ctx, i == (attempt_count - 1)) ) {
             break;
         }
         flb_time_msleep(100);