@ikonintegration/ikapi 3.1.28 → 3.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "3.1.28",
+  "version": "3.1.29",
   "description": "",
   "main": "index.js",
   "module": "main.js",

package/src/BaseEvent/IKProcess.js

@@ -28,13 +28,15 @@ export default class IKProcess {
   //Main interface
   async execute(executionFunc) {
     this.logger.debug("Starting main process code");
+    //Tracker
+    if (this.allowExecutionIdentification && this.tracker) this.tracker.resetExecutionTrace();
     //Connect DB
     if (this.db) await this.db.connect();
-    //program loop
+    //Program loop
     setInterval( async () => {
       await this._execute(executionFunc);
     }, this.interval);
-    //
+    //Tracker
     if (this.allowExecutionIdentification && this.tracker) await this.tracker.trackExecAndDrain(true);
   }
   //Executions

package/src/Tracker/IKExecutionTracker.js

@@ -10,6 +10,7 @@ export default class IKExecutionTracker {
     this.db = db;
     this.config = config;
     this.startedOn = Date.now();
+    this.drainedExecution = false;
     if (config) this.client = this._getClient(config);
     this.claimers = {};
   }
@@ -17,6 +18,10 @@ export default class IKExecutionTracker {
   appendClaimer(value, key) { this.claimers[value] = key; }
   appendEvent(event) { this.client.appendEvent(event); }
   //
+  resetExecutionTrace() { 
+    this.startedOn = Date.now(); 
+    this.drainedExecution = false;
+  }
   async quickDrain() {
     try {
       //Check for client and claimers
@@ -25,14 +30,15 @@ export default class IKExecutionTracker {
       await this.client.drain(this.claimers);
     } catch (e) { console.error(`Error while draining tracker events: ${e}`); }
   }
-  async trackExecAndDrain(isAutotracking) {
+  async trackExecAndDrain() {
     try {
+      //Check 
+      if (this.drainedExecution) return;
+      this.drainedExecution = true;
       //Check for client and claimers
       if (!this.client || Object.keys(this.claimers).length == 0) return; //disabled
-      //Check for config
-      if (isAutotracking && this.config.disableAutoTracking) return; //disabled
       //detect execution and log (ECS or lambda)
-      this._detectExecutionAndLog(isAutotracking);
+      this._detectExecutionAndLog();
       //detect DB and log (DDB only for now)
       this._collectDDBStats();
       //drain stats
@@ -40,14 +46,14 @@ export default class IKExecutionTracker {
     } catch (e) { console.error(`Error while tracking execution: ${e}`); }
   }
   /* private tracker */
-  _detectExecutionAndLog(isAutotracking) {
+  _detectExecutionAndLog() {
     //Is running on container?
     if (Utils.isHybridlessContainer()) {
       //ECS, get metadata info and log if applicable and succeeded on it
       const context = this._getECSMetadataObject();
       // console.debug('Context', context);
       if (context && context.ContainerInstanceARN) {
-        const extraDetails = { startTime: this.startedOn, endTime: isAutotracking ? Date.now() : -1, taskConfig: { cpu: process.env.CPU, memory: process.env.MEMORY, taskName: context.TaskDefinitionFamily } };
+        const extraDetails = { startTime: this.startedOn, endTime: Date.now(), taskConfig: { cpu: process.env.CPU, memory: process.env.MEMORY, taskName: context.TaskDefinitionFamily } };
         const event = RTClient.newECSExecutionEvent(context.TaskARN, context.ContainerInstanceARN, extraDetails);
         this.appendEvent(event);
       }