@ikonintegration/ikapi 3.1.25 → 3.1.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "3.1.25",
+  "version": "3.1.28",
   "description": "",
   "main": "index.js",
   "module": "main.js",
@@ -17,7 +17,7 @@
     "@aws-sdk/credential-provider-node": "^3.137.0",
     "@aws-sdk/node-http-handler": "^3.127.0",
     "@aws-sdk/util-dynamodb": "^3.137.0",
-    "@ikonintegration/mod-resources-tracker-client": "0.0.15",
+    "@ikonintegration/mod-resources-tracker-client": "0.0.17",
     "abind": "^1.0.5",
     "bluebird": "^3.7.2",
     "email-templates": "^8.0.8",

package/src/BaseEvent/IKProcess.js

@@ -35,7 +35,7 @@ export default class IKProcess {
       await this._execute(executionFunc);
     }, this.interval);
     //
-    if (this.allowExecutionIdentification && this.tracker) await this.tracker.stopTracking();
+    if (this.allowExecutionIdentification && this.tracker) await this.tracker.trackExecAndDrain(true);
   }
   //Executions
   async _execute(executionFunc) {

package/src/BaseEvent/IKTransaction.js

@@ -103,7 +103,7 @@ export default class IKTransaction {
       await safeExecution();
       await this.logger.flushLogs();
       //Tracker
-      if (this.tracker) await this.tracker.stopTracking();
+      if (this.tracker) await this.tracker.trackExecAndDrain(true);
     } catch (e) {
       this.logger.error('Exception when flushing logs.');
       this.logger.exception(e);

package/src/Tracker/IKExecutionTracker.js

@@ -8,6 +8,7 @@ export default class IKExecutionTracker {
   constructor(config, context, db) {
     this.context = context;
     this.db = db;
+    this.config = config;
     this.startedOn = Date.now();
     if (config) this.client = this._getClient(config);
     this.claimers = {};
@@ -24,12 +25,14 @@ export default class IKExecutionTracker {
       await this.client.drain(this.claimers);
     } catch (e) { console.error(`Error while draining tracker events: ${e}`); }
   }
-  async stopTracking() {
+  async trackExecAndDrain(isAutotracking) {
     try {
       //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();
+      this._detectExecutionAndLog(isAutotracking);
       //detect DB and log (DDB only for now)
       this._collectDDBStats();
       //drain stats
@@ -37,14 +40,14 @@ export default class IKExecutionTracker {
     } catch (e) { console.error(`Error while tracking execution: ${e}`); }
   }
   /* private tracker */
-  _detectExecutionAndLog() {
+  _detectExecutionAndLog(isAutotracking) {
     //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: Date.now(), taskConfig: { cpu: process.env.CPU, memory: process.env.MEMORY, taskName: context.TaskDefinitionFamily } };
+        const extraDetails = { startTime: this.startedOn, endTime: isAutotracking ? Date.now() : -1, taskConfig: { cpu: process.env.CPU, memory: process.env.MEMORY, taskName: context.TaskDefinitionFamily } };
         const event = RTClient.newECSExecutionEvent(context.TaskARN, context.ContainerInstanceARN, extraDetails);
         this.appendEvent(event);
       }