out_datadog: task_arn now correctly mapped to full arn

Author: lucastemb

plugins/out_datadog/datadog_remap.c

@@ -187,18 +187,25 @@ static int dd_remap_ecs_task_arn(const char *tag_name,
     char *remain;
     char *split;
     char *task_arn;
+    char *task_id;
     int ret;
 
     buf = flb_sds_create_len(attr_value.via.str.ptr, attr_value.via.str.size);
     if (!buf) {
         flb_errno();
         return -1;
     }
-
     /*
-     * if the input is invalid, not in the form of "arn:aws:ecs:region:XXXX"
-     * then we won't add the "region" in the dd_tags.
-     */
+    * Use the full task ARN for compatibility with Datadog products
+    * that expect the complete ARN format
+    */
+    ret = dd_remap_append_kv_to_ddtags(tag_name, buf, flb_sds_len(buf), dd_tags_buf);
+    if (ret < 0) {
+        flb_sds_destroy(buf);
+        return -1;
+    }
+
+    // --- Begin task_id logic --
     if ((strlen(buf) > strlen(ECS_ARN_PREFIX)) &&
         (strncmp(buf, ECS_ARN_PREFIX, strlen(ECS_ARN_PREFIX)) == 0)) {
 
@@ -214,19 +221,17 @@ static int dd_remap_ecs_task_arn(const char *tag_name,
         }
     }
 
-    task_arn = strstr(buf, ECS_TASK_PREFIX);
-    if (task_arn != NULL) {
-        /* parse out the task_arn */
-        task_arn += strlen(ECS_TASK_PREFIX);
-        ret = dd_remap_append_kv_to_ddtags(tag_name, task_arn, strlen(task_arn), dd_tags_buf);
+    task_id = strstr(buf, ECS_TASK_PREFIX);
+    if (task_id != NULL) {
+        task_id += strlen(ECS_TASK_PREFIX);
+        ret = dd_remap_append_kv_to_ddtags("task_id", task_id, strlen(task_id), dd_tags_buf);
     }
     else {
-        /*
-         * if the input is invalid, not in the form of "XXXXXXXXtask/"task-arn
-         * then we preverse the original value under tag "task_arn".
-         */
-        ret = dd_remap_append_kv_to_ddtags(tag_name, buf, strlen(buf), dd_tags_buf);
+        // If invalid, preserve the original value under task_id
+        ret = dd_remap_append_kv_to_ddtags("task_id", buf, strlen(buf), dd_tags_buf);
     }
+    // --- End task_id logic ---
+
     flb_sds_destroy(buf);
     if (ret < 0) {
          return -1;