@artilleryio/int-core 2.14.0 → 2.15.0-6d31f8a

package/lib/engine_http.js

@@ -403,15 +403,23 @@ HttpEngine.prototype.step = function step(requestSpec, ee, opts) {
             requestParams.formData,
             function (acc, v, k) {
               let V = template(v, context);
-              if (V && _.isPlainObject(V) && V.fromFile) {
-                const absPath = path.resolve(
-                  path.dirname(context.vars.$scenarioFile),
-                  V.fromFile
-                );
-                fileUpload = absPath;
-                V = fs.createReadStream(absPath);
+              let options;
+              if (V && _.isPlainObject(V)) {
+                if (V.contentType) {
+                  options = { contentType: V.contentType };
+                }
+                if (V.fromFile) {
+                  const absPath = path.resolve(
+                    path.dirname(context.vars.$scenarioFile),
+                    V.fromFile
+                  );
+                  fileUpload = absPath;
+                  V = fs.createReadStream(absPath);
+                } else if (V.value) {
+                  V = V.value;
+                }
               }
-              acc.append(k, V);
+              acc.append(k, V, options);
               return acc;
             },
             f
@@ -815,6 +823,34 @@ HttpEngine.prototype._handleResponse = function (
   ee.emit('counter', 'http.responses', 1);
   // ee.emit('rate', 'http.response_rate');
   ee.emit('histogram', 'http.response_time', res.timings.phases.firstByte);
+
+  const statusCode = res.statusCode;
+  if (statusCode >= 200 && statusCode < 300) {
+    ee.emit(
+      'histogram',
+      'http.response_time.2xx',
+      res.timings.phases.firstByte
+    );
+  } else if (statusCode >= 300 && statusCode < 400) {
+    ee.emit(
+      'histogram',
+      'http.response_time.3xx',
+      res.timings.phases.firstByte
+    );
+  } else if (statusCode >= 400 && statusCode < 500) {
+    ee.emit(
+      'histogram',
+      'http.response_time.4xx',
+      res.timings.phases.firstByte
+    );
+  } else if (statusCode >= 500 && statusCode < 600) {
+    ee.emit(
+      'histogram',
+      'http.response_time.5xx',
+      res.timings.phases.firstByte
+    );
+  }
+
   if (this.extendedHTTPMetrics) {
     ee.emit('histogram', 'http.dns', res.timings.phases.dns);
     ee.emit('histogram', 'http.tcp', res.timings.phases.tcp);

package/lib/runner.js

@@ -10,11 +10,8 @@ const _ = require('lodash');
 const debug = require('debug')('runner');
 const debugPerf = require('debug')('perf');
 const uuidv4 = require('uuid').v4;
-const A = require('async');
 const { SSMS } = require('./ssms');
-const tryResolve = require('try-require').resolve;
 const createPhaser = require('./phases');
-const isIdlePhase = require('./is-idle-phase');
 const createReader = require('./readers');
 const engineUtil = require('@artilleryio/int-commons').engine_util;
 const wl = require('./weighted-pick');
@@ -223,15 +220,9 @@ function run(script, ee, options, runState, contextVars) {
   });
   phaser.on('phaseStarted', function (spec) {
     ee.emit('phaseStarted', spec);
-    if (isIdlePhase(spec)) {
-      ee.emit('stats', SSMS.empty());
-    }
   });
   phaser.on('phaseCompleted', function (spec) {
     ee.emit('phaseCompleted', spec);
-    if (isIdlePhase(spec)) {
-      ee.emit('stats', SSMS.empty());
-    }
   });
   phaser.on('done', function () {
     debug('All phases launched');
@@ -407,23 +398,23 @@ function datafileVariables(script) {
   let result = {};
   if (script.config.payload) {
     _.each(script.config.payload, function (el) {
-      //when loading all the csv, we don't set individual fields
       if (!el.loadAll) {
+        // Load individual fields from the CSV into VU context variables
         // If data = [] (i.e. the CSV file is empty, or only has headers and
         // skipHeaders = true), then row could = undefined
         let row = el.reader(el.data) || [];
         _.each(el.fields, function (fieldName, j) {
           result[fieldName] = row[j];
         });
-      }
-
-      if (typeof el.name !== 'undefined') {
-        // Make the entire CSV available
-        result[el.name] = el.reader(el.data);
       } else {
-        console.log(
-          'WARNING: loadAll is set to true but no name is provided for the CSV data'
-        );
+        if (typeof el.name !== 'undefined') {
+          // Make the entire CSV available
+          result[el.name] = el.reader(el.data);
+        } else {
+          console.log(
+            'WARNING: loadAll is set to true but no name is provided for the CSV data'
+          );
+        }
       }
     });
   }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@artilleryio/int-core",
-  "version": "2.14.0",
+  "version": "2.15.0-6d31f8a",
   "main": "./index.js",
   "license": "MPL-2.0",
   "dependencies": {
-    "@artilleryio/int-commons": "2.10.0",
+    "@artilleryio/int-commons": "2.11.0-6d31f8a",
     "@artilleryio/sketches-js": "^2.1.1",
     "agentkeepalive": "^4.1.0",
     "arrivals": "^2.1.2",
@@ -31,7 +31,6 @@
     "socket.io-client": "^4.5.1",
     "socketio-wildcard": "^2.0.0",
     "tough-cookie": "^5.0.0-rc.2",
-    "try-require": "^1.2.1",
     "uuid": "^8.0.0",
     "ws": "^7.5.7"
   },
@@ -58,7 +57,7 @@
     "proxy": "^2.1.1",
     "rewiremock": "^3.14.3",
     "sinon": "^4.5.0",
-    "socket.io": "^4.7.1",
+    "socket.io": "^4.8.0",
     "tap": "^19.0.2"
   }
 }