out_loki: fix removing keys defined by labels

When key is defined as a Loki label with labels, label_keys or
label_map_path, the code is trying to remove them. However, if
remove_keys is not defined, it never gets to the part that actually
removes them. This looks like an obvious bug to me.

I moved the debug message to inside the if (size > 0) statement, because
earlier it would only print it if it was actually trying to remove
something. So without moving it it would spam it every time. And absence
of the message would then indicate size == 0. Not sure if this is the
best, though.

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

Author: ajantti

plugins/out_loki/loki.c

@@ -916,13 +916,14 @@ static int prepare_remove_keys(struct flb_loki *ctx)
                 return -1;
             }
         }
-        size = mk_list_size(patterns);
+    }
+
+    size = mk_list_size(patterns);
+    if (size > 0) {
         flb_plg_debug(ctx->ins, "remove_mpa size: %d", size);
-        if (size > 0) {
-            ctx->remove_mpa = flb_mp_accessor_create(patterns);
-            if (ctx->remove_mpa == NULL) {
-                return -1;
-            }
+        ctx->remove_mpa = flb_mp_accessor_create(patterns);
+        if (ctx->remove_mpa == NULL) {
+            return -1;
         }
     }