processor_content_modifier: free autogenerated OTEL scope keys

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>

Author: edsiper

plugins/processor_content_modifier/cm.h

@@ -97,6 +97,7 @@ struct content_modifier_ctx {
     flb_sds_t pattern;             /* pattern to create 'regex' context */
     flb_sds_t converted_type_str;  /* converted_type */
     flb_sds_t key;                 /* target key */
+    int key_is_autogenerated;      /* key ownership for synthesized OTEL keys */
     flb_sds_t value;               /* used for any value */
     struct flb_regex *regex;       /* regular expression context created from 'pattern' */
 

plugins/processor_content_modifier/cm_config.c

@@ -22,6 +22,7 @@
 #include <fluent-bit/flb_regex.h>
 
 #include "cm.h"
+#include "cm_config.h"
 
 static int set_action(struct content_modifier_ctx *ctx)
 {
@@ -146,6 +147,11 @@ static int set_context(struct content_modifier_ctx *ctx)
             /* check that 'name' is the key set */
             if (!ctx->key) {
                 ctx->key = flb_sds_create("name");
+                if (!ctx->key) {
+                    flb_errno();
+                    return -1;
+                }
+                ctx->key_is_autogenerated = FLB_TRUE;
             }
             else if (strcasecmp(ctx->key, "name") != 0) {
                 flb_plg_error(ctx->ins, "context '%s' requires the name of the key to be 'name', no '%s'",
@@ -182,6 +188,11 @@ static int set_context(struct content_modifier_ctx *ctx)
             /* check that 'version' is the key set */
             if (!ctx->key) {
                 ctx->key = flb_sds_create("version");
+                if (!ctx->key) {
+                    flb_errno();
+                    return -1;
+                }
+                ctx->key_is_autogenerated = FLB_TRUE;
             }
             else if (strcasecmp(ctx->key, "version") != 0) {
                 flb_plg_error(ctx->ins, "context '%s' requires the name of the key to be 'version', no '%s'",
@@ -256,6 +267,11 @@ static int set_context(struct content_modifier_ctx *ctx)
             /* check that 'name' is the key set */
             if (!ctx->key) {
                 ctx->key = flb_sds_create("name");
+                if (!ctx->key) {
+                    flb_errno();
+                    return -1;
+                }
+                ctx->key_is_autogenerated = FLB_TRUE;
             }
             else if (strcasecmp(ctx->key, "name") != 0) {
                 flb_plg_error(ctx->ins, "context '%s' requires the name of the key to be 'name', no '%s'",
@@ -356,27 +372,27 @@ struct content_modifier_ctx *cm_config_create(struct flb_processor_instance *ins
     /* Initialize the config map */
     ret = flb_processor_instance_config_map_set(ins, ctx);
     if (ret == -1) {
-        flb_free(ctx);
+        cm_config_destroy(ctx);
         return NULL;
     }
 
     if (!ctx->action_str) {
         flb_plg_error(ctx->ins, "no 'action' defined");
-        flb_free(ctx);
+        cm_config_destroy(ctx);
         return NULL;
     }
 
     /* process the 'action' configuration */
     ret = set_action(ctx);
     if (ret == -1) {
-        flb_free(ctx);
+        cm_config_destroy(ctx);
         return NULL;
     }
 
     /* process the 'context' where the action will be applied */
     ret = set_context(ctx);
     if (ret == -1) {
-        flb_free(ctx);
+        cm_config_destroy(ctx);
         return NULL;
     }
 
@@ -385,25 +401,33 @@ struct content_modifier_ctx *cm_config_create(struct flb_processor_instance *ins
         ctx->regex = flb_regex_create(ctx->pattern);
         if (!ctx->regex) {
             flb_plg_error(ctx->ins, "invalid regex pattern '%s'", ctx->pattern);
-            flb_free(ctx);
+            cm_config_destroy(ctx);
             return NULL;
         }
     }
 
     /* Certain actions needs extra configuration, e.g: insert -> requires a key and a value */
     ret = check_action_requirements(ctx);
     if (ret == -1) {
-        flb_free(ctx);
+        cm_config_destroy(ctx);
         return NULL;
     }
     return ctx;
 }
 
 void cm_config_destroy(struct content_modifier_ctx *ctx)
 {
+    if (ctx == NULL) {
+        return;
+    }
+
     if (ctx->regex) {
         flb_regex_destroy(ctx->regex);
     }
 
+    if (ctx->key_is_autogenerated == FLB_TRUE && ctx->key != NULL) {
+        flb_sds_destroy(ctx->key);
+    }
+
     flb_free(ctx);
 }