Removed severity from jsonPayload, because it is moved to the root, so there is no need to be duplicated. (this might count as a breaking change, so if needed a flag might be added whether to remove it or not from the jsonPayload)

Signed-off-by: Todor Petrov <[email protected]>

Author: tpetrov-lp

plugins/out_stackdriver/stackdriver.c

@@ -1116,6 +1116,7 @@ static int pack_json_payload(int insert_id_extracted,
         monitored_resource_key,
         local_resource_id_key,
         ctx->labels_key,
+        ctx->severity_key,
         ctx->trace_key,
         stream
         /* more special fields are required to be added */

plugins/out_stackdriver/stackdriver.h

@@ -50,6 +50,7 @@
 #define MONITORED_RESOURCE_KEY "logging.googleapis.com/monitored_resource"
 #define LOCAL_RESOURCE_ID_KEY "logging.googleapis.com/local_resource_id"
 #define DEFAULT_LABELS_KEY "logging.googleapis.com/labels"
+#define DEFAULT_SEVERITY_KEY "logging.googleapis.com/severity"
 #define DEFAULT_TRACE_KEY "logging.googleapis.com/trace"
 #define DEFAULT_INSERT_ID_KEY "logging.googleapis.com/insertId"
 #define SOURCELOCATION_FIELD_IN_JSON "logging.googleapis.com/sourceLocation"

plugins/out_stackdriver/stackdriver_conf.c

@@ -268,6 +268,9 @@ struct flb_stackdriver *flb_stackdriver_conf_create(struct flb_output_instance *
     if (tmp) {
         ctx->severity_key = flb_sds_create(tmp);
     }
+    else {
+        ctx->severity_key = flb_sds_create(DEFAULT_SEVERITY_KEY);
+    }
 
     tmp = flb_output_get_property("trace_key", ins);
     if (tmp) {

tests/runtime/data/stackdriver/stackdriver_test_log_name.h

@@ -0,0 +1,5 @@
+#define LOG_NAME_OVERRIDE	"[" \
+	"1591111124," \
+	"{"	\
+        "\"custom_log_name_key\": \"custom_log_name\"" \
+	"}]"