@builtioflow/uhm-nodejs-agent - npm Package Compare versions

Comparing version 10.17.4 to 10.17.5

lib/plugins/wmio/engine/WorkerManagerAdapter/WorkerPoolExecutorInterceptor.js

@@ -116,3 +116,3 @@ "use strict";
                   if (!isConnectorDisabled && actionId && !ignoreActions.includes(action.actionId) && !processedActions.includes(actionId) && action.name !== PROVIDER_CONDITION) {
-                    let localSpan = prepareLocalspan(action, uhmResource, resource);
+                    let localSpan = prepareLocalspan(action, uhmResource, resource, actionList);
                     processedActions.push(actionId);
@@ -206,3 +206,3 @@ addChildSpans(flowMap, actionList, actionId, uhmResource, processedActions, localSpan, resource);
         const actionId = _.get(actionData, "actionId", "");
-        let childSpan = prepareLocalspan(actionData, uhmResource, resource);
+        let childSpan = prepareLocalspan(actionData, uhmResource, resource, actionList);
         addChildSpans(flowMap, actionList, actionId, uhmResource, processedActions, childSpan, resource);
@@ -232,3 +232,3 @@ } else {
         if (!isConnectorDisabled) {
-          let localSpan = prepareLocalspan(action, uhmResource, resource);
+          let localSpan = prepareLocalspan(action, uhmResource, resource, actionList);
           const actionId = _.get(action, "actionId", "");
@@ -259,3 +259,3 @@ groupProcessedActions.push(actionId);
         let actionData = actionList.find((data) => data.actionId === action.actionId);
-        let childSpan = prepareLocalspan(actionData, uhmResource, resource);
+        let childSpan = prepareLocalspan(actionData, uhmResource, resource, actionList);
         const actionId = _.get(actionData, "actionId", "");
@@ -323,4 +323,15 @@ removeIndex(actionId, groupActions);
   // Prepare SPAN
-  function prepareLocalspan(action, uhmResource, resource) {
+  function prepareLocalspan(action, uhmResource, resource, actionList) {
     let localSpan = uhmResource._contextManager.createLocalSpan(action.name);
+    let actionEndTime = convertToEpoch(_.get(action, "actionEndTime", ""));
+    // Find last group action item for correct end time.
+    if (action.type && action.type === PROVIDER_TYPE_GROUP) {
+      let groupList = actionList.filter((data) => data.actionId === action.actionId);
+      groupList = groupList.sort((a, b) => (a.actionEndTime < b.actionEndTime) ? -1 : (a.actionEndTime > b.actionEndTime ? 1 : 0));
+      const actionData = groupList.slice(-1).pop();
+      actionEndTime = convertToEpoch(_.get(actionData, "actionEndTime", ""));
+      if (!actionEndTime) {
+        logger.warn("timestamp is '%s' for Loop connector in workflow '%s' with bill ID '%s'", actionEndTime, resource.jobData.name, resource.jobData.bill_uid);
+      }
+    }
     const icon = _.get(action, "icon", false) ? action.icon : action.name;
@@ -341,3 +352,3 @@ const actionResult = _.get(action, "actionOutput", false);
     Tags.START_TIME.tag(localSpan, convertToEpoch(_.get(action, "actionStartTime", "")));
-    Tags.END_TIME.tag(localSpan, convertToEpoch(_.get(action, "actionEndTime", "")));
+    Tags.END_TIME.tag(localSpan, actionEndTime);
     Tags.ACTION_ID.tag(localSpan, _.get(action, "actionId", ""));
@@ -344,0 +355,0 @@ Tags.ACCOUNT_NAME.tag(localSpan, accountName);

package.json

 {
   "name": "@builtioflow/uhm-nodejs-agent",
-  "version": "10.17.4",
+  "version": "10.17.5",
   "description": "A nodejs agent for skyapm agents",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

602370

increased by0.13%

Lines of code

16073

increased by0.07%

No dependency changes