From 1a8dd39e3a26ddf06d479d2314b96d51faa0dec9 Mon Sep 17 00:00:00 2001
From: braydonk <braydonk@google.com>
Date: Mon, 27 Nov 2023 23:29:40 +0000
Subject: [PATCH] input_chunk: update records in the right place

In commit ac4ec1f, the input chunk writing was moved down from the
previous spot to be below where input metrics are update. This PR moves
the metric update below the input chunk write so that the `ret ==
CIO_OK` check is actually right, and so that the metrics are only
updated after the write has occurred.

I also moved adding to `total_records` outside of the metric ifdef. This
appears to have been here for some time, but there are numerous output
plugins that rely on `event_chunk->total_events`, which is set from this
total_records value. This will mean it always gets updated, even if
metrics are disabled.

Signed-off-by: braydonk <braydonk@google.com>
---
 src/flb_input_chunk.c | 50 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/flb_input_chunk.c b/src/flb_input_chunk.c
index 959e5fd396e..7437ca77654 100644
--- a/src/flb_input_chunk.c
+++ b/src/flb_input_chunk.c
@@ -1499,31 +1499,6 @@ static int input_chunk_append_raw(struct flb_input_instance *in,
     flb_chunk_trace_do_input(ic);
 #endif /* FLB_HAVE_CHUNK_TRACE */
 
-    /* Update 'input' metrics */
-#ifdef FLB_HAVE_METRICS
-    if (ret == CIO_OK) {
-        ic->added_records =  n_records;
-        ic->total_records += n_records;
-    }
-
-    if (ic->total_records > 0) {
-        /* timestamp */
-        ts = cfl_time_now();
-
-        /* fluentbit_input_records_total */
-        cmt_counter_add(in->cmt_records, ts, ic->added_records,
-                        1, (char *[]) {(char *) flb_input_name(in)});
-
-        /* fluentbit_input_bytes_total */
-        cmt_counter_add(in->cmt_bytes, ts, buf_size,
-                        1, (char *[]) {(char *) flb_input_name(in)});
-
-        /* OLD api */
-        flb_metrics_sum(FLB_METRIC_N_RECORDS, ic->added_records, in->metrics);
-        flb_metrics_sum(FLB_METRIC_N_BYTES, buf_size, in->metrics);
-    }
-#endif
-
     filtered_data_buffer = NULL;
     final_data_buffer = (char *) buf;
     final_data_size = buf_size;
@@ -1555,6 +1530,31 @@ static int input_chunk_append_raw(struct flb_input_instance *in,
         flb_free(filtered_data_buffer);
     }
 
+    if (ret == CIO_OK) {
+        ic->added_records =  n_records;
+        ic->total_records += n_records;
+    }
+
+    /* Update 'input' metrics */
+#ifdef FLB_HAVE_METRICS
+    if (ic->total_records > 0) {
+        /* timestamp */
+        ts = cfl_time_now();
+
+        /* fluentbit_input_records_total */
+        cmt_counter_add(in->cmt_records, ts, ic->added_records,
+                        1, (char *[]) {(char *) flb_input_name(in)});
+
+        /* fluentbit_input_bytes_total */
+        cmt_counter_add(in->cmt_bytes, ts, buf_size,
+                        1, (char *[]) {(char *) flb_input_name(in)});
+
+        /* OLD api */
+        flb_metrics_sum(FLB_METRIC_N_RECORDS, ic->added_records, in->metrics);
+        flb_metrics_sum(FLB_METRIC_N_BYTES, buf_size, in->metrics);
+    }
+#endif
+
     if (ret == -1) {
         flb_error("[input chunk] error writing data from %s instance",
                   in->name);