@ikonintegration/ikapi 3.1.28 → 3.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikonintegration/ikapi",
-  "version": "3.1.28",
+  "version": "3.1.31",
   "description": "",
   "main": "index.js",
   "module": "main.js",
@@ -11,13 +11,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.137.0",
-    "@aws-sdk/client-ses": "^3.137.0",
-    "@aws-sdk/client-sns": "^3.137.0",
-    "@aws-sdk/credential-provider-node": "^3.137.0",
+    "@aws-sdk/client-dynamodb": "^3.145.0",
+    "@aws-sdk/client-ses": "^3.145.0",
+    "@aws-sdk/client-sns": "^3.145.0",
+    "@aws-sdk/credential-provider-node": "^3.145.0",
     "@aws-sdk/node-http-handler": "^3.127.0",
-    "@aws-sdk/util-dynamodb": "^3.137.0",
-    "@ikonintegration/mod-resources-tracker-client": "0.0.17",
+    "@aws-sdk/util-dynamodb": "^3.145.0",
+    "@ikonintegration/mod-resources-tracker-client": "0.0.18",
     "abind": "^1.0.5",
     "bluebird": "^3.7.2",
     "email-templates": "^8.0.8",

package/src/BaseEvent/IKProcess.js

@@ -28,14 +28,16 @@ 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);
-    //
-    if (this.allowExecutionIdentification && this.tracker) await this.tracker.trackExecAndDrain(true);
+    //Tracker
+    if (this.allowExecutionIdentification && this.tracker) await this.tracker.trackExecAndDrain();
   }
   //Executions
   async _execute(executionFunc) {

package/src/BaseEvent/IKTransaction.js

@@ -53,6 +53,8 @@ export default class IKTransaction {
     try { //Execute
       this.logger.debug("Starting main request code");
       this._resp = await executionFunc(this);
+      //Tracker after successful execution (before succeeding the context, which will cause things to die)
+      if (this.tracker) await this.tracker.trackExecAndDrain();
       //Answer client
       if (this._resp && this._resp instanceof IKResponse) {
         await this._resp.build(this._context, this, this._syncReturn);
@@ -102,8 +104,8 @@ export default class IKTransaction {
     try {
       await safeExecution();
       await this.logger.flushLogs();
-      //Tracker
-      if (this.tracker) await this.tracker.trackExecAndDrain(true);
+      //Tracker (if not tracked yet -- exception case)
+      if (this.tracker) await this.tracker.trackExecAndDrain();
     } catch (e) {
       this.logger.error('Exception when flushing logs.');
       this.logger.exception(e);

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,37 +18,42 @@ 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
-      if (!this.client || Object.keys(this.claimers).length == 0) return; //disabled
-      //drain stats
+      //Check for client but claimers
+      if (!this.client) return; //disabled
+      //drain stats (drain will filter for events with claimers only)
       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
+      if (!this.client) 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
+      //drain stats (drain will filter for events with claimers only)
       await this.client.drain(this.claimers);
     } 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);
       }