diff --git a/package-lock.json b/package-lock.json index 9a07e8bc63..638d7a54f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5330,11 +5330,6 @@ "node": ">= 6" } }, - "node_modules/@tootallnate/quickjs-emscripten": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", - "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" - }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "license": "MIT" @@ -6121,6 +6116,7 @@ }, "node_modules/asap": { "version": "2.0.6", + "dev": true, "license": "MIT" }, "node_modules/asn1": { @@ -6197,17 +6193,6 @@ "node": ">=14" } }, - "node_modules/ast-types": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz", - "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==", - "dependencies": { - "tslib": "^2.0.1" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/astral-regex": { "version": "2.0.0", "license": "MIT", @@ -6385,14 +6370,6 @@ "integrity": "sha512-GFj8iVxo9onSU6BnnQvVwqvxh60UcSHJEDnIk3z4B6iOjsKSmqe+ibW0Rsz7YO7IE1HG3D3tqCNIidP46SZVdQ==", "dev": true }, - "node_modules/basic-ftp": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz", - "integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", "dev": true, @@ -7523,11 +7500,6 @@ "dev": true, "license": "ISC" }, - "node_modules/component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" - }, "node_modules/compress-brotli": { "version": "1.3.6", "license": "MIT", @@ -7813,11 +7785,6 @@ "version": "1.0.6", "license": "MIT" }, - "node_modules/cookiejar": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", - "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==" - }, "node_modules/core-js": { "version": "3.22.2", "dev": true, @@ -8037,14 +8004,6 @@ "node": ">=0.10" } }, - "node_modules/data-uri-to-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", - "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==", - "engines": { - "node": ">= 14" - } - }, "node_modules/datadog-metrics": { "version": "0.9.3", "license": "MIT", @@ -8212,19 +8171,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/degenerator": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", - "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", - "dependencies": { - "ast-types": "^0.13.4", - "escodegen": "^2.1.0", - "esprima": "^4.0.1" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/delayed-stream": { "version": "1.0.0", "license": "MIT", @@ -8501,6 +8447,7 @@ }, "node_modules/dezalgo": { "version": "1.0.4", + "dev": true, "license": "ISC", "dependencies": { "asap": "^2.0.0", @@ -10119,11 +10066,6 @@ "fastest-levenshtein": "^1.0.7" } }, - "node_modules/fast-safe-stringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==" - }, "node_modules/fastest-levenshtein": { "version": "1.0.16", "license": "MIT", @@ -10478,20 +10420,6 @@ "node": ">=12.20.0" } }, - "node_modules/formidable": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz", - "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==", - "dependencies": { - "dezalgo": "^1.0.4", - "hexoid": "^1.0.0", - "once": "^1.4.0", - "qs": "^6.11.0" - }, - "funding": { - "url": "https://ko-fi.com/tunnckoCore/commissions" - } - }, "node_modules/forwarded": { "version": "0.2.0", "dev": true, @@ -10729,33 +10657,6 @@ "node": ">=4" } }, - "node_modules/get-uri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz", - "integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==", - "dependencies": { - "basic-ftp": "^5.0.2", - "data-uri-to-buffer": "^5.0.1", - "debug": "^4.3.4", - "fs-extra": "^8.1.0" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/get-uri/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, "node_modules/getpass": { "version": "0.1.7", "dev": true, @@ -11199,14 +11100,6 @@ "version": "1.0.1", "license": "Apache-2.0" }, - "node_modules/hexoid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz", - "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==", - "engines": { - "node": ">=8" - } - }, "node_modules/highlight.js": { "version": "10.7.3", "license": "BSD-3-Clause", @@ -11594,10 +11487,6 @@ "node": ">= 0.10" } }, - "node_modules/ip": { - "version": "1.1.8", - "license": "MIT" - }, "node_modules/ipaddr.js": { "version": "1.9.1", "dev": true, @@ -12413,19 +12302,6 @@ "node": ">= 0.8.0" } }, - "node_modules/libhoney": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/libhoney/-/libhoney-4.1.0.tgz", - "integrity": "sha512-U8oCouZXzjlO67wAhDyvnskn9MJFIzTWkxpzsAawUU4nQLMSdISgaGL64eqAeElLRnjlA4hhREr8zOz1So0+yg==", - "dependencies": { - "proxy-agent": "^6.3.0", - "superagent": "^8.0.0", - "url-join": "^5.0.0" - }, - "engines": { - "node": ">= 14.*" - } - }, "node_modules/libtap": { "version": "1.4.0", "dev": true, @@ -13304,6 +13180,7 @@ }, "node_modules/methods": { "version": "1.1.2", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -13337,17 +13214,6 @@ "dev": true, "license": "MIT" }, - "node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/mime-db": { "version": "1.52.0", "license": "MIT", @@ -13977,14 +13843,6 @@ "node": ">= 0.6" } }, - "node_modules/netmask": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz", - "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==", - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/nice-try": { "version": "1.0.5", "license": "MIT" @@ -14804,6 +14662,7 @@ }, "node_modules/object-inspect": { "version": "1.12.3", + "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -15144,72 +15003,6 @@ "node": ">=6" } }, - "node_modules/pac-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.0.tgz", - "integrity": "sha512-t4tRAMx0uphnZrio0S0Jw9zg3oDbz1zVhQ/Vy18FjLfP1XOLNUEjaVxYCYRI6NS+BsMBXKIzV6cTLOkO9AtywA==", - "dependencies": { - "@tootallnate/quickjs-emscripten": "^0.23.0", - "agent-base": "^7.0.2", - "debug": "^4.3.4", - "get-uri": "^6.0.1", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.0", - "pac-resolver": "^7.0.0", - "socks-proxy-agent": "^8.0.1" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/pac-proxy-agent/node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", - "dependencies": { - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", - "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz", - "integrity": "sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==", - "dependencies": { - "agent-base": "^7.0.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/pac-resolver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.0.tgz", - "integrity": "sha512-Fd9lT9vJbHYRACT8OhCbZBbxr6KRSawSovFpy8nDGshaK99S/EBhVIHp9+crhxrsZOuvLpgL1n23iyPg6Rl2hg==", - "dependencies": { - "degenerator": "^5.0.0", - "ip": "^1.1.8", - "netmask": "^2.0.2" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/package-hash": { "version": "4.0.0", "dev": true, @@ -15986,72 +15779,6 @@ "node": ">= 0.10" } }, - "node_modules/proxy-agent": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.3.0.tgz", - "integrity": "sha512-0LdR757eTj/JfuU7TL2YCuAZnxWXu3tkJbg4Oq3geW/qFNT/32T0sp2HnZ9O0lMR4q3vwAt0+xCA8SR0WAD0og==", - "dependencies": { - "agent-base": "^7.0.2", - "debug": "^4.3.4", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.0", - "lru-cache": "^7.14.1", - "pac-proxy-agent": "^7.0.0", - "proxy-from-env": "^1.1.0", - "socks-proxy-agent": "^8.0.1" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/proxy-agent/node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", - "dependencies": { - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/proxy-agent/node_modules/http-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", - "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/proxy-agent/node_modules/https-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz", - "integrity": "sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==", - "dependencies": { - "agent-base": "^7.0.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/proxy-agent/node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "engines": { - "node": ">=12" - } - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, "node_modules/ps-tree": { "version": "1.2.0", "dev": true, @@ -16113,6 +15840,7 @@ }, "node_modules/qs": { "version": "6.11.0", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.0.4" @@ -17040,6 +16768,7 @@ }, "node_modules/side-channel": { "version": "1.0.4", + "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.0", @@ -17129,6 +16858,7 @@ }, "node_modules/smart-buffer": { "version": "4.2.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 6.0.0", @@ -17165,6 +16895,7 @@ }, "node_modules/socks": { "version": "2.7.1", + "dev": true, "license": "MIT", "dependencies": { "ip": "^2.0.0", @@ -17175,32 +16906,9 @@ "npm": ">= 3.0.0" } }, - "node_modules/socks-proxy-agent": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz", - "integrity": "sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==", - "dependencies": { - "agent-base": "^7.0.1", - "debug": "^4.3.4", - "socks": "^2.7.1" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/socks-proxy-agent/node_modules/agent-base": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", - "dependencies": { - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/socks/node_modules/ip": { "version": "2.0.0", + "dev": true, "license": "MIT" }, "node_modules/sort-keys": { @@ -17615,53 +17323,6 @@ "node": ">=14" } }, - "node_modules/superagent": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz", - "integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==", - "dependencies": { - "component-emitter": "^1.3.0", - "cookiejar": "^2.1.4", - "debug": "^4.3.4", - "fast-safe-stringify": "^2.1.1", - "form-data": "^4.0.0", - "formidable": "^2.1.2", - "methods": "^1.1.2", - "mime": "2.6.0", - "qs": "^6.11.0", - "semver": "^7.3.8" - }, - "engines": { - "node": ">=6.4.0 <13 || >=14" - } - }, - "node_modules/superagent/node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/superagent/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/supports-color": { "version": "5.5.0", "license": "MIT", @@ -20657,14 +20318,6 @@ "querystring": "0.2.0" } }, - "node_modules/url-join": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz", - "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, "node_modules/url-parse": { "version": "1.5.10", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", @@ -21950,7 +21603,6 @@ "esbuild-wasm": "^0.19.8", "eventemitter3": "^4.0.4", "fs-extra": "^10.1.0", - "ip": "^1.1.8", "is-builtin-module": "^2.0.0", "joi": "^17.6.0", "js-yaml": "^3.13.1", @@ -22378,7 +22030,6 @@ "debug": "^4.1.1", "dogapi": "^2.8.4", "hot-shots": "^6.0.1", - "libhoney": "^4.1.0", "lightstep-tracer": "^0.31.0", "mixpanel": "^0.13.0", "opentracing": "^0.14.5", @@ -23437,7 +23088,6 @@ "cli-highlight": "^2.1.11", "debug": "^4.3.1", "gradient-string": "^2.0.2", - "ip": "^1.1.8", "jmespath": "^0.16.0", "js-yaml": "^3.13.1", "mime-types": "2.1.35", diff --git a/packages/artillery-engine-playwright/test/fargate.aws.js b/packages/artillery-engine-playwright/test/fargate.aws.js index 260c03f01d..6994e73c2e 100644 --- a/packages/artillery-engine-playwright/test/fargate.aws.js +++ b/packages/artillery-engine-playwright/test/fargate.aws.js @@ -22,14 +22,22 @@ test('playwright typescript test works and reports data', async (t) => { const output = await $`../artillery/bin/run run ./test/fixtures/pw-acceptance.yml --output ${playwrightOutput} --overrides ${configOverride} --tags ${tags} --record`; - t.equal(output.exitCode, 0); + t.equal( + output.exitCode, + 0, + `should have exit code 0, got ${output.exitCode}` + ); const jsonReportAggregate = JSON.parse( fs.readFileSync(playwrightOutput, 'utf8') ).aggregate; //Assert: should have no failed VUs - t.equal(jsonReportAggregate.counters['vusers.failed'], 0); + t.equal( + jsonReportAggregate.counters['vusers.failed'], + 0, + 'should have no failed VUs' + ); //Assert: should have done http_requests and reported codes t.ok( @@ -113,7 +121,11 @@ test('playwright typescript test fails and has correct vu count when expectation try { await $`../artillery/bin/run run ./test/fixtures/pw-acceptance.yml --output ${playwrightOutput} --overrides ${scenarioOverride} --tags ${tags} --record`; } catch (output) { - t.equal(output.exitCode, 1); + t.equal( + output.exitCode, + 1, + `should have exit code 1, got ${output.exitCode}` + ); const jsonReportAggregate = JSON.parse( fs.readFileSync(playwrightOutput, 'utf8') diff --git a/packages/artillery-engine-playwright/test/index.test.js b/packages/artillery-engine-playwright/test/index.test.js index cb0508eac6..d24082d604 100644 --- a/packages/artillery-engine-playwright/test/index.test.js +++ b/packages/artillery-engine-playwright/test/index.test.js @@ -17,14 +17,22 @@ test('playwright js test works and reports data', async (t) => { const output = await $`../artillery/bin/run run ./test/fixtures/pw-acceptance.yml --output ${playwrightOutput}`; - t.equal(output.exitCode, 0); + t.equal( + output.exitCode, + 0, + `should have exit code 0, got ${output.exitCode}` + ); const jsonReportAggregate = JSON.parse( fs.readFileSync(playwrightOutput, 'utf8') ).aggregate; //Assert: should have no failed VUs - t.equal(jsonReportAggregate.counters['vusers.failed'], 0); + t.equal( + jsonReportAggregate.counters['vusers.failed'], + 0, + 'should have no failed VUs' + ); //Assert: should have done http_requests and reported codes t.ok( @@ -105,7 +113,11 @@ test('playwright js test fails and has correct vu count when expectation fails', try { await $`../artillery/bin/run run ./test/fixtures/pw-acceptance.yml --output ${playwrightOutput} --overrides ${scenarioOverride}`; } catch (output) { - t.equal(output.exitCode, 1); + t.equal( + output.exitCode, + 1, + `should have exit code 1, got ${output.exitCode}` + ); const jsonReportAggregate = JSON.parse( fs.readFileSync(playwrightOutput, 'utf8') @@ -131,14 +143,22 @@ test('playwright typescript test works and reports data', async (t) => { const output = await $`../artillery/bin/run run ./test/fixtures/pw-acceptance.yml --output ${playwrightOutput} --overrides ${configOverride}`; - t.equal(output.exitCode, 0); + t.equal( + output.exitCode, + 0, + `should have exit code 0, got ${output.exitCode}` + ); const jsonReportAggregate = JSON.parse( fs.readFileSync(playwrightOutput, 'utf8') ).aggregate; //Assert: should have no failed VUs - t.equal(jsonReportAggregate.counters['vusers.failed'], 0); + t.equal( + jsonReportAggregate.counters['vusers.failed'], + 0, + 'should have no failed VUs' + ); //Assert: should have done http_requests and reported codes t.ok( @@ -222,7 +242,11 @@ test('playwright typescript test fails and has correct vu count when expectation try { await $`../artillery/bin/run run ./test/fixtures/pw-acceptance.yml --output ${playwrightOutput} --overrides ${scenarioOverride}`; } catch (output) { - t.equal(output.exitCode, 1); + t.equal( + output.exitCode, + 1, + `should have exit code 1, got ${output.exitCode}` + ); const jsonReportAggregate = JSON.parse( fs.readFileSync(playwrightOutput, 'utf8') diff --git a/packages/artillery-plugin-publish-metrics/package.json b/packages/artillery-plugin-publish-metrics/package.json index deba998222..f99427c8da 100644 --- a/packages/artillery-plugin-publish-metrics/package.json +++ b/packages/artillery-plugin-publish-metrics/package.json @@ -33,7 +33,6 @@ "debug": "^4.1.1", "dogapi": "^2.8.4", "hot-shots": "^6.0.1", - "libhoney": "^4.1.0", "lightstep-tracer": "^0.31.0", "mixpanel": "^0.13.0", "opentracing": "^0.14.5", diff --git a/packages/artillery/lib/cmds/run.js b/packages/artillery/lib/cmds/run.js index f0c4edee45..926635818b 100644 --- a/packages/artillery/lib/cmds/run.js +++ b/packages/artillery/lib/cmds/run.js @@ -14,7 +14,6 @@ const { const p = require('util').promisify; const csv = require('csv-parse'); const debug = require('debug')('commands:run'); -const ip = require('ip'); const dotenv = require('dotenv'); const _ = require('lodash'); @@ -586,21 +585,33 @@ async function sendTelemetry(script, flags, extraProps) { properties.distinctId = properties.targetHash; } - const ipaddr = ip.address(); let macaddr; + const nonInternalIpv6Interfaces = []; for (const [iface, descrs] of Object.entries(os.networkInterfaces())) { for (const o of descrs) { - if (o.address === ipaddr) { - macaddr = o.mac; - break; + if (o.internal == true) { + continue; } + + //prefer ipv4 interface when available + if (o.family != 'IPv4') { + nonInternalIpv6Interfaces.push(o); + continue; + } + + macaddr = o.mac; + break; } } + //default to first ipv6 interface if no ipv4 interface is available + if (!macaddr && nonInternalIpv6Interfaces.length > 0) { + macaddr = nonInternalIpv6Interfaces[0].mac; + } + if (macaddr) { properties.macHash = hash(macaddr); } - properties.ipHash = hash(ipaddr); properties.hostnameHash = hash(os.hostname()); properties.usernameHash = hash(os.userInfo().username); diff --git a/packages/artillery/package.json b/packages/artillery/package.json index bb9c6065dd..87c682abde 100644 --- a/packages/artillery/package.json +++ b/packages/artillery/package.json @@ -115,7 +115,6 @@ "esbuild-wasm": "^0.19.8", "eventemitter3": "^4.0.4", "fs-extra": "^10.1.0", - "ip": "^1.1.8", "is-builtin-module": "^2.0.0", "joi": "^17.6.0", "js-yaml": "^3.13.1", diff --git a/packages/skytrace/package.json b/packages/skytrace/package.json index ce54e6fe95..7565e20ab5 100644 --- a/packages/skytrace/package.json +++ b/packages/skytrace/package.json @@ -31,7 +31,6 @@ "cli-highlight": "^2.1.11", "debug": "^4.3.1", "gradient-string": "^2.0.2", - "ip": "^1.1.8", "jmespath": "^0.16.0", "js-yaml": "^3.13.1", "mime-types": "2.1.35", diff --git a/packages/skytrace/src/commands/ping.ts b/packages/skytrace/src/commands/ping.ts index 40fcb7e9ba..995c0d6eca 100644 --- a/packages/skytrace/src/commands/ping.ts +++ b/packages/skytrace/src/commands/ping.ts @@ -5,7 +5,6 @@ const fs = require('fs'); const nodeCrypto = require('node:crypto'); const os = require('os'); -const ip = require('ip'); const sprintf = require('sprintf-js').sprintf; const { Command, flags } = require('@oclif/command');