out_logdna: remove promoted keys from line field

Signed-off-by: lecaros <lecaros@chronosphere.io>

Author: lecaros

plugins/out_logdna/logdna.c

@@ -97,46 +97,53 @@ static int record_append_primary_keys(struct flb_logdna *ctx,
         v = map->via.map.ptr[i].val;
         is_primary = FLB_FALSE;
 
-        /* Level - optional */
-        if (!level &&
-            (primary_key_check(k, LOGDNA_LEVEL_KEY, sizeof(LOGDNA_LEVEL_KEY) - 1) == FLB_TRUE ||
-             primary_key_check(k, LOGDNA_SEVERITY_KEY, sizeof(LOGDNA_SEVERITY_KEY) - 1) == FLB_TRUE)) {
-            level = &k;
-            msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_LEVEL_KEY) - 1);
-            msgpack_pack_str_body(mp_sbuf, LOGDNA_LEVEL_KEY, sizeof(LOGDNA_LEVEL_KEY) - 1);
-            msgpack_pack_object(mp_sbuf, v);
-            c++;
+        /* Level - optional (both "level" and "severity" are primary) */
+        if (primary_key_check(k, LOGDNA_LEVEL_KEY, sizeof(LOGDNA_LEVEL_KEY) - 1) == FLB_TRUE ||
+            primary_key_check(k, LOGDNA_SEVERITY_KEY, sizeof(LOGDNA_SEVERITY_KEY) - 1) == FLB_TRUE) {
             is_primary = FLB_TRUE;
+            if (!level) {
+                level = &k;
+                msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_LEVEL_KEY) - 1);
+                msgpack_pack_str_body(mp_sbuf, LOGDNA_LEVEL_KEY, sizeof(LOGDNA_LEVEL_KEY) - 1);
+                msgpack_pack_object(mp_sbuf, v);
+                c++;
+            }
         }
 
         /* Meta - optional */
-        if (!meta && primary_key_check(k, LOGDNA_META_KEY, sizeof(LOGDNA_META_KEY) - 1) == FLB_TRUE) {
-            meta = &k;
-            msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_META_KEY) - 1);
-            msgpack_pack_str_body(mp_sbuf, LOGDNA_META_KEY, sizeof(LOGDNA_META_KEY) - 1);
-            msgpack_pack_object(mp_sbuf, v);
-            c++;
+        if (primary_key_check(k, LOGDNA_META_KEY, sizeof(LOGDNA_META_KEY) - 1) == FLB_TRUE) {
             is_primary = FLB_TRUE;
+            if (!meta) {
+                meta = &k;
+                msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_META_KEY) - 1);
+                msgpack_pack_str_body(mp_sbuf, LOGDNA_META_KEY, sizeof(LOGDNA_META_KEY) - 1);
+                msgpack_pack_object(mp_sbuf, v);
+                c++;
+            }
         }
 
         /* File */
-        if (!file && primary_key_check(k, LOGDNA_FILE_KEY, sizeof(LOGDNA_FILE_KEY) - 1) == FLB_TRUE) {
-            file = &k;
-            msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_FILE_KEY) - 1);
-            msgpack_pack_str_body(mp_sbuf, LOGDNA_FILE_KEY, sizeof(LOGDNA_FILE_KEY) - 1);
-            msgpack_pack_object(mp_sbuf, v);
-            c++;
+        if (primary_key_check(k, LOGDNA_FILE_KEY, sizeof(LOGDNA_FILE_KEY) - 1) == FLB_TRUE) {
             is_primary = FLB_TRUE;
+            if (!file) {
+                file = &k;
+                msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_FILE_KEY) - 1);
+                msgpack_pack_str_body(mp_sbuf, LOGDNA_FILE_KEY, sizeof(LOGDNA_FILE_KEY) - 1);
+                msgpack_pack_object(mp_sbuf, v);
+                c++;
+            }
         }
 
         /* App */
-        if (!app && primary_key_check(k, LOGDNA_APP_KEY, sizeof(LOGDNA_APP_KEY) - 1) == FLB_TRUE) {
-            app = &k;
-            msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_APP_KEY) - 1);
-            msgpack_pack_str_body(mp_sbuf, LOGDNA_APP_KEY, sizeof(LOGDNA_APP_KEY) - 1);
-            msgpack_pack_object(mp_sbuf, v);
-            c++;
+        if (primary_key_check(k, LOGDNA_APP_KEY, sizeof(LOGDNA_APP_KEY) - 1) == FLB_TRUE) {
             is_primary = FLB_TRUE;
+            if (!app) {
+                app = &k;
+                msgpack_pack_str(mp_sbuf, sizeof(LOGDNA_APP_KEY) - 1);
+                msgpack_pack_str_body(mp_sbuf, LOGDNA_APP_KEY, sizeof(LOGDNA_APP_KEY) - 1);
+                msgpack_pack_object(mp_sbuf, v);
+                c++;
+            }
         }
 
         if (line_pck && is_primary == FLB_FALSE) {
@@ -658,7 +665,7 @@ static struct flb_config_map config_map[] = {
     {
      FLB_CONFIG_MAP_BOOL, "exclude_promoted_keys", "false",
      0, FLB_TRUE, offsetof(struct flb_logdna, exclude_promoted_keys),
-     "Exclude promoted keys (meta, level, app, file) from the line body"
+     "Exclude promoted keys (meta, level, severity (promoted as level), app, file) from the line body"
     },
 
     /* EOF */

tests/runtime/out_logdna.c

@@ -312,6 +312,92 @@ void flb_test_severity_promoted_as_level()
     flb_destroy(ctx);
 }
 
+/*
+ * Test: record with both "level" and "severity" — only first is promoted,
+ * neither appears in line body, and no msgpack corruption occurs.
+ */
+#define JSON_LEVEL_AND_SEVERITY \
+    "[12345678, {\"message\":\"hello\"," \
+    "\"level\":\"info\"," \
+    "\"severity\":\"warning\"," \
+    "\"host\":\"server1\"}]"
+
+static void cb_check_level_and_severity(void *ctx, int ffd, int res_ret,
+                                        void *res_data, size_t res_size,
+                                        void *data)
+{
+    flb_sds_t json = res_data;
+
+    /* First level/severity key promoted as "level" */
+    if (!TEST_CHECK(strstr(json, "\"level\":\"info\"") != NULL)) {
+        TEST_MSG("level not promoted: %s", json);
+    }
+
+    /* Neither level nor severity in line body */
+    if (!TEST_CHECK(strstr(json, "\\\"level\\\":") == NULL)) {
+        TEST_MSG("level duplicated in line: %s", json);
+    }
+    if (!TEST_CHECK(strstr(json, "\\\"severity\\\":") == NULL)) {
+        TEST_MSG("severity duplicated in line: %s", json);
+    }
+
+    /* Non-primary keys preserved in line */
+    if (!TEST_CHECK(strstr(json, "\\\"message\\\":") != NULL)) {
+        TEST_MSG("message missing from line: %s", json);
+    }
+    if (!TEST_CHECK(strstr(json, "\\\"host\\\":") != NULL)) {
+        TEST_MSG("host missing from line: %s", json);
+    }
+
+    set_output_num(get_output_num() + 1);
+    flb_sds_destroy(json);
+}
+
+void flb_test_level_and_severity()
+{
+    int ret;
+    flb_ctx_t *ctx;
+    int in_ffd, out_ffd;
+
+    clear_output_num();
+
+    ctx = flb_create();
+    flb_service_set(ctx, "flush", "1", "grace", "1",
+                    "log_level", "error", NULL);
+
+    in_ffd = flb_input(ctx, (char *) "lib", NULL);
+    TEST_CHECK(in_ffd >= 0);
+    flb_input_set(ctx, in_ffd, "tag", "test", NULL);
+
+    out_ffd = flb_output(ctx, (char *) "logdna", NULL);
+    TEST_CHECK(out_ffd >= 0);
+    flb_output_set(ctx, out_ffd,
+                   "match", "test",
+                   "api_key", "test-key",
+                   "exclude_promoted_keys", "true",
+                   NULL);
+
+    ret = flb_output_set_test(ctx, out_ffd, "formatter",
+                              cb_check_level_and_severity, NULL, NULL);
+    TEST_CHECK(ret == 0);
+
+    ret = flb_start(ctx);
+    TEST_CHECK(ret == 0);
+
+    flb_lib_push(ctx, in_ffd,
+                 (char *) JSON_LEVEL_AND_SEVERITY,
+                 sizeof(JSON_LEVEL_AND_SEVERITY) - 1);
+
+    sleep(2);
+
+    if (!TEST_CHECK(get_output_num() > 0)) {
+        TEST_MSG("formatter callback was not invoked");
+    }
+
+    flb_stop(ctx);
+    flb_destroy(ctx);
+}
+
 /*
  * Test: default app name is set when record has no "app" key.
  */
@@ -649,6 +735,7 @@ TEST_LIST = {
     {"non_duplication",            flb_test_non_duplication},
     {"data_completeness",          flb_test_data_completeness},
     {"severity_promoted_as_level", flb_test_severity_promoted_as_level},
+    {"level_and_severity",         flb_test_level_and_severity},
     {"default_app",                flb_test_default_app},
     {"no_primary_keys",            flb_test_no_primary_keys},
     {"payload_structure",          flb_test_payload_structure},