From d42e7e757439592adb52c415c1a9c73d1a662295 Mon Sep 17 00:00:00 2001 From: Ben Ripkens Date: Fri, 27 Apr 2018 07:24:04 +0200 Subject: [PATCH] fix(security): Remove vulnerable hoek from transitive dev dependencies --- package-lock.json | 1014 +++++++----------- package.json | 6 +- test/actions/profiling/cpu_test.js | 6 +- test/actions/source_test.js | 11 +- test/agentCommunication_test.js | 11 +- test/apps/agentStub_test.js | 10 +- test/disabledTracing_test.js | 6 +- test/metrics/healthchecks_test.js | 8 +- test/tracing/asyncAwait_test.js | 8 +- test/tracing/bluebird/test.js | 7 +- test/tracing/elasticsearch_test.js | 6 +- test/tracing/express_uncaughtErrors/test.js | 7 +- test/tracing/https_test.js | 6 +- test/tracing/ioredis/test.js | 7 +- test/tracing/kafka_test.js | 8 +- test/tracing/mongodb_test.js | 6 +- test/tracing/mongoose/test.js | 7 +- test/tracing/mysql_test.js | 6 +- test/tracing/opentracing/integration_test.js | 11 +- test/tracing/redis/test.js | 7 +- test/tracing/stackTraces_test.js | 6 +- test/tracing_test.js | 8 +- 22 files changed, 474 insertions(+), 698 deletions(-) diff --git a/package-lock.json b/package-lock.json index 90de4e3848..960be05062 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "instana-nodejs-sensor", - "version": "1.37.2", + "version": "1.38.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -19,219 +19,6 @@ "semver": "5.4.1", "tar": "2.2.1", "tar-pack": "3.4.1" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "optional": true - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "optional": true - }, - "boom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", - "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", - "optional": true, - "requires": { - "hoek": "4.2.1" - } - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "optional": true - }, - "cryptiles": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", - "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", - "optional": true, - "requires": { - "boom": "5.2.0" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", - "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", - "optional": true, - "requires": { - "hoek": "4.2.1" - } - } - } - }, - "form-data": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", - "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", - "optional": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.6", - "mime-types": "2.1.18" - } - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", - "optional": true, - "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" - } - }, - "hawk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", - "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", - "optional": true, - "requires": { - "boom": "4.3.1", - "cryptiles": "3.1.2", - "hoek": "4.2.1", - "sntp": "2.1.0" - } - }, - "hoek": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", - "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "optional": true, - "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" - } - }, - "nopt": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", - "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "optional": true - }, - "request": { - "version": "2.85.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", - "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", - "optional": true, - "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "hawk": "6.0.2", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.1", - "safe-buffer": "5.1.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "optional": true, - "requires": { - "glob": "7.1.2" - } - }, - "sntp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", - "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", - "optional": true, - "requires": { - "hoek": "4.2.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - } } }, "@risingstack/v8-profiler": { @@ -274,8 +61,8 @@ "handlebars": "4.0.11", "hbs": "4.0.1", "jquery": "3.3.1", - "lodash": "4.17.5", - "prismjs": "1.13.0" + "lodash": "4.17.10", + "prismjs": "1.14.0" }, "dependencies": { "body-parser": { @@ -333,6 +120,12 @@ "utils-merge": "1.0.1", "vary": "1.1.2" } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "dev": true } } }, @@ -349,7 +142,6 @@ "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "optional": true, "requires": { "co": "4.6.0", "fast-deep-equal": "1.1.0", @@ -413,7 +205,7 @@ "optional": true, "requires": { "delegates": "1.0.0", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "argparse": { @@ -475,10 +267,9 @@ "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" }, "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "assertion-error": { "version": "1.1.0", @@ -503,24 +294,22 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "optional": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", - "dev": true + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==" }, "bail": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz", - "integrity": "sha1-99bBcxYwqfnw1NNe0fli4gdKF2Q=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz", + "integrity": "sha512-1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg==", "dev": true }, "balanced-match": { @@ -535,6 +324,14 @@ "dev": true, "requires": { "safe-buffer": "5.1.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "dev": true + } } }, "bcrypt-pbkdf": { @@ -569,43 +366,6 @@ "dev": true, "optional": true }, - "bl": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz", - "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=", - "dev": true, - "requires": { - "readable-stream": "2.0.6" - }, - "dependencies": { - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true - }, - "readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "0.10.31", - "util-deprecate": "1.0.2" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } - } - }, "block-stream": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", @@ -702,12 +462,11 @@ } }, "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", "requires": { - "hoek": "2.16.3" + "hoek": "4.2.1" } }, "bootstrap": { @@ -782,7 +541,7 @@ "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=", "requires": { "dtrace-provider": "0.8.6", - "moment": "2.22.0", + "moment": "2.22.1", "mv": "2.1.1", "safe-json-stringify": "1.1.0" } @@ -811,15 +570,14 @@ } }, "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "ccount": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz", - "integrity": "sha1-U7ai+BW7d7nChx97mnLDol8djok=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz", + "integrity": "sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==", "dev": true }, "center-align": { @@ -875,27 +633,27 @@ } }, "character-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz", - "integrity": "sha1-92hxvl72bdt/j440eOzDdMJ9bco=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz", + "integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==", "dev": true }, "character-entities-html4": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz", - "integrity": "sha1-NZoqSg9+KdPcKsmb2+Ie45Q46lA=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz", + "integrity": "sha512-sIrXwyna2+5b0eB9W149izTPJk/KkJTg6mEzDGibwBUkyH1SbDa+nf515Ppdi3MaH35lW0JFJDWeq9Luzes1Iw==", "dev": true }, "character-entities-legacy": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz", - "integrity": "sha1-9Ad53xoQGHK7UQo9KV4fzPFHIC8=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz", + "integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==", "dev": true }, "character-reference-invalid": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz", - "integrity": "sha1-lCg191Dk7GGjCOYMLvjMEBEgLvw=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz", + "integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==", "dev": true }, "circular-json": { @@ -953,16 +711,15 @@ } }, "cluster-key-slot": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.8.tgz", - "integrity": "sha1-dlRVYIWmUzCTKi6LWXb44tCz5BQ=", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.0.9.tgz", + "integrity": "sha512-NHiq3CUXSvG7rhGaUt3/urwIl1kk8jcrW18p0oogi1noGAahjFpCE/jDvQH27/z9SWnRaodgiHnZYmbMGDcKuA==", "dev": true }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "optional": true + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, "code-point-at": { "version": "1.1.0", @@ -970,9 +727,9 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "collapse-white-space": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz", - "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz", + "integrity": "sha512-YfQ1tAUZm561vpYD+5eyWN8+UsceQbSrqqlc/6zDY2gtAE+uZLSdkkovhnGpmCThsvKBFakq4EdY/FF93E8XIw==", "dev": true }, "combined-stream": { @@ -984,9 +741,9 @@ } }, "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz", + "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=", "dev": true }, "concat-map": { @@ -1002,7 +759,7 @@ "requires": { "buffer-from": "1.0.0", "inherits": "2.0.3", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "typedarray": "0.0.6" } }, @@ -1041,12 +798,21 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", "requires": { - "boom": "2.10.1" + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", + "requires": { + "hoek": "4.2.1" + } + } } }, "d": { @@ -1064,13 +830,6 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "debug": { @@ -1129,15 +888,7 @@ "object-assign": "4.1.1", "pify": "2.3.0", "pinkie-promise": "2.0.1", - "rimraf": "2.4.5" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } + "rimraf": "2.6.2" } }, "delayed-stream": { @@ -1201,6 +952,12 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true + }, + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", + "dev": true } } }, @@ -1520,6 +1277,18 @@ "requires": { "brace-expansion": "1.1.11" } + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", + "dev": true + }, + "strip-json-comments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", + "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=", + "dev": true } } }, @@ -1815,14 +1584,12 @@ "fast-deep-equal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", - "optional": true + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "optional": true + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, "fast-levenshtein": { "version": "1.0.7", @@ -1838,14 +1605,6 @@ "requires": { "escape-string-regexp": "1.0.5", "object-assign": "4.1.1" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } } }, "file-entry-cache": { @@ -1856,14 +1615,6 @@ "requires": { "flat-cache": "1.3.0", "object-assign": "4.1.1" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } } }, "fill-keys": { @@ -1921,25 +1672,13 @@ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz", - "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=", - "dev": true, + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "requires": { - "async": "2.6.0", + "asynckit": "0.4.0", "combined-stream": "1.0.6", "mime-types": "2.1.18" - }, - "dependencies": { - "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "dev": true, - "requires": { - "lodash": "4.17.5" - } - } } }, "formatio": { @@ -1976,7 +1715,7 @@ "graceful-fs": "4.1.11", "inherits": "2.0.3", "mkdirp": "0.5.1", - "rimraf": "2.4.5" + "rimraf": "2.6.2" } }, "fstream-ignore": { @@ -1997,30 +1736,19 @@ "dev": true }, "gauge": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", - "integrity": "sha1-01MBrRjpaQK0dR3LvkD0IYuUKkY=", - "dev": true, + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "optional": true, "requires": { "aproba": "1.2.0", "console-control-strings": "1.1.0", - "has-color": "0.1.7", "has-unicode": "2.0.1", "object-assign": "4.1.1", "signal-exit": "3.0.2", "string-width": "1.0.2", "strip-ansi": "3.0.1", "wide-align": "1.1.2" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true, - "optional": true - } } }, "gcstats.js": { @@ -2065,20 +1793,14 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "requires": { "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "requires": { + "fs.realpath": "1.0.0", "inflight": "1.0.6", "inherits": "2.0.3", "minimatch": "3.0.4", @@ -2104,28 +1826,6 @@ "object-assign": "4.1.1", "pify": "2.3.0", "pinkie-promise": "2.0.1" - }, - "dependencies": { - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } } }, "good-listener": { @@ -2164,19 +1864,15 @@ "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "optional": true + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", - "dev": true, + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "chalk": "1.1.3", - "commander": "2.15.1", - "is-my-json-valid": "2.17.2", - "pinkie-promise": "2.0.1" + "ajv": "5.5.2", + "har-schema": "2.0.0" } }, "has": { @@ -2211,15 +1907,14 @@ "optional": true }, "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.1", + "sntp": "2.1.0" } }, "hbs": { @@ -2247,10 +1942,9 @@ } }, "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==" }, "hooks-fixed": { "version": "1.2.0", @@ -2269,7 +1963,7 @@ "domutils": "1.7.0", "entities": "1.1.1", "inherits": "2.0.3", - "readable-stream": "2.3.5" + "readable-stream": "2.3.6" } }, "http-errors": { @@ -2285,12 +1979,11 @@ } }, "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", - "dev": true, + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "requires": { - "assert-plus": "0.2.0", + "assert-plus": "1.0.0", "jsprim": "1.4.1", "sshpk": "1.14.1" } @@ -2354,7 +2047,7 @@ "dev": true, "requires": { "bluebird": "3.5.1", - "cluster-key-slot": "1.0.8", + "cluster-key-slot": "1.0.9", "debug": "2.6.9", "denque": "1.2.3", "flexbuffer": "0.0.6", @@ -2399,19 +2092,19 @@ "dev": true }, "is-alphabetical": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz", - "integrity": "sha1-x3B5zJHU76x3W+EDS/LSQ/lebwg=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz", + "integrity": "sha512-V0xN4BYezDHcBSKb1QHUFMlR4as/XEuCZBzMJUU4n7+Cbt33SmUnSol+pnXFvLxSHNq2CemUXNdaXV6Flg7+xg==", "dev": true }, "is-alphanumerical": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz", - "integrity": "sha1-37SqTRCF4zvbYcLe6cgOnGwZ9Ts=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz", + "integrity": "sha512-pyfU/0kHdISIgslFfZN9nfY1Gk3MquQgUm1mJTjdkEPpkAKNWuBTSqFwewOpR7N351VkErCiyV71zX7mlQQqsg==", "dev": true, "requires": { - "is-alphabetical": "1.0.1", - "is-decimal": "1.0.1" + "is-alphabetical": "1.0.2", + "is-decimal": "1.0.2" } }, "is-bluebird": { @@ -2426,9 +2119,9 @@ "dev": true }, "is-decimal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz", - "integrity": "sha1-9ftqlJlq2ejjdh+/vQkfH8qMToI=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz", + "integrity": "sha512-TRzl7mOCchnhchN+f3ICUCzYvL9ul7R+TYOsZ8xia++knyZAJfv/uA1FvQXsAnYIl1T3B2X5E/J7Wb1QXiIBXg==", "dev": true }, "is-fullwidth-code-point": { @@ -2440,9 +2133,9 @@ } }, "is-hexadecimal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz", - "integrity": "sha1-bghLvJIGH7sJcexYts5tQE4k2mk=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz", + "integrity": "sha512-but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A==", "dev": true }, "is-my-ip-valid": { @@ -2590,8 +2283,7 @@ "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "optional": true + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" }, "json-stable-stringify": { "version": "1.0.1", @@ -2628,13 +2320,6 @@ "extsprintf": "1.3.0", "json-schema": "0.2.3", "verror": "1.10.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "kafka-node": { @@ -2648,7 +2333,7 @@ "buffer-crc32": "0.2.13", "buffermaker": "1.2.0", "debug": "2.6.9", - "lodash": "4.17.5", + "lodash": "4.17.10", "minimatch": "3.0.4", "nested-error-stacks": "2.0.0", "node-zookeeper-client": "0.2.2", @@ -2691,9 +2376,9 @@ } }, "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==", + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true }, "lodash-compat": { @@ -3161,12 +2846,6 @@ "supports-color": "1.2.0" }, "dependencies": { - "commander": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz", - "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=", - "dev": true - }, "debug": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz", @@ -3239,9 +2918,9 @@ "dev": true }, "moment": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz", - "integrity": "sha512-1muXCh8jb1N/gHRbn9VDUBr0GYb8A/aVcHlII9QSB68a50spqEVLIGN6KVmCOnSvJrUhC0edGgKU5ofnGXdYdg==", + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", + "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==", "optional": true }, "mongodb": { @@ -3275,6 +2954,15 @@ "string_decoder": "1.0.3", "util-deprecate": "1.0.2" } + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } } } }, @@ -3314,7 +3002,7 @@ "integrity": "sha1-YSpKtF70KnDN6Aa62G7m2wR+g4U=", "dev": true, "requires": { - "lodash": "4.17.5" + "lodash": "4.17.10" } }, "bson": { @@ -3471,6 +3159,30 @@ "mkdirp": "0.5.1", "ncp": "2.0.0", "rimraf": "2.4.5" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "optional": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "rimraf": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", + "optional": true, + "requires": { + "glob": "6.0.4" + } + } } }, "mysql": { @@ -3505,6 +3217,21 @@ "string_decoder": "1.0.3", "util-deprecate": "1.0.2" } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "dev": true + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } } } }, @@ -3523,7 +3250,7 @@ "named-placeholders": "1.1.1", "object-assign": "4.1.1", "readable-stream": "2.3.5", - "safe-buffer": "5.1.1", + "safe-buffer": "5.1.2", "seq-queue": "0.0.5", "sqlstring": "2.3.1" }, @@ -3544,17 +3271,35 @@ "yallist": "2.1.2" } }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true + "readable-stream": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", + "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } }, "sqlstring": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz", "integrity": "sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A=", "dev": true + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } } } }, @@ -3624,26 +3369,52 @@ "npmlog": "3.1.2", "osenv": "0.1.5", "path-array": "1.0.1", - "request": "2.74.0", - "rimraf": "2.4.5", + "request": "2.85.0", + "rimraf": "2.6.2", "semver": "5.4.1", "tar": "2.2.1", "which": "1.3.0" }, "dependencies": { - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "gauge": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz", + "integrity": "sha1-01MBrRjpaQK0dR3LvkD0IYuUKkY=", "dev": true, "optional": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-color": "0.1.7", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "optional": true, + "requires": { + "abbrev": "1.1.1" + } + }, + "npmlog": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz", + "integrity": "sha1-LUb6h0M3r5SYovErtD2NC+SjaHM=", + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.6.0", + "set-blocking": "2.0.0" } } } @@ -3673,25 +3444,24 @@ } }, "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "optional": true, "requires": { - "abbrev": "1.1.1" + "abbrev": "1.1.1", + "osenv": "0.1.5" } }, "npmlog": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz", - "integrity": "sha1-LUb6h0M3r5SYovErtD2NC+SjaHM=", - "dev": true, + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "optional": true, "requires": { "are-we-there-yet": "1.1.4", "console-control-strings": "1.1.0", - "gauge": "2.6.0", + "gauge": "2.7.4", "set-blocking": "2.0.0" } }, @@ -3706,10 +3476,9 @@ "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" }, "object-assign": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", - "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=", - "dev": true + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "on-finished": { "version": "2.3.0", @@ -3735,9 +3504,9 @@ } }, "opentracing": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/opentracing/-/opentracing-0.14.2.tgz", - "integrity": "sha1-IVxcwBUkg7jF10zsWTCM8c1ZX7E=" + "version": "0.14.3", + "resolved": "https://registry.npmjs.org/opentracing/-/opentracing-0.14.3.tgz", + "integrity": "sha1-I+OtAp+mamU5Jq2+V+g0Rp+FUKo=" }, "optimist": { "version": "0.6.1", @@ -3797,12 +3566,12 @@ "integrity": "sha1-gRLYhHExnyerrk1klksSL+ThuJA=", "dev": true, "requires": { - "character-entities": "1.2.1", - "character-entities-legacy": "1.1.1", - "character-reference-invalid": "1.1.1", - "is-alphanumerical": "1.0.1", - "is-decimal": "1.0.1", - "is-hexadecimal": "1.0.1" + "character-entities": "1.2.2", + "character-entities-legacy": "1.1.2", + "character-reference-invalid": "1.1.2", + "is-alphanumerical": "1.0.2", + "is-decimal": "1.0.2", + "is-hexadecimal": "1.0.2" } }, "parseurl": { @@ -3841,8 +3610,7 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "optional": true + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pify": { "version": "2.3.0", @@ -3872,9 +3640,9 @@ "dev": true }, "prismjs": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.13.0.tgz", - "integrity": "sha512-0/1Fiyg3MCzepo6t6Wzx2Ef4nftGKeQIv+Z6LO38RcYJN5QV2ePHh8W41ZkFn57B++6BnglF6fCiJ9b80YlzkQ==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.14.0.tgz", + "integrity": "sha512-sa2s4m60bXs+kU3jcuUwx3ZCrUH7o0kuqnOOINbODqlRrDB7KY8SRx+xR/D7nHLlgfDdG7zXbRO8wJ+su5Ls0A==", "dev": true, "requires": { "clipboard": "2.0.0" @@ -3991,26 +3759,20 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "optional": true - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "optional": true } } }, "readable-stream": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz", - "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", "isarray": "1.0.0", "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", "util-deprecate": "1.0.2" } }, @@ -4103,7 +3865,7 @@ "integrity": "sha1-w8oQ+ajaBGFcKPCapOMEUQUm7CE=", "dev": true, "requires": { - "collapse-white-space": "1.0.3", + "collapse-white-space": "1.0.4", "extend": "3.0.1", "parse-entities": "1.1.1", "repeat-string": "1.6.1", @@ -4120,7 +3882,7 @@ "integrity": "sha1-pxBeJbnuK/mkm3XSxCPxGwauIJI=", "dev": true, "requires": { - "ccount": "1.0.2", + "ccount": "1.0.3", "extend": "3.0.1", "longest-streak": "1.0.0", "markdown-table": "0.4.0", @@ -4137,57 +3899,44 @@ "dev": true }, "request": { - "version": "2.74.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz", - "integrity": "sha1-dpPKdou7DqXIzgjAhKRe+gW4kqs=", - "dev": true, + "version": "2.85.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", + "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "bl": "1.1.2", - "caseless": "0.11.0", + "aws-sign2": "0.7.0", + "aws4": "1.7.0", + "caseless": "0.12.0", "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", - "form-data": "1.0.1", - "har-validator": "2.0.6", - "hawk": "3.1.3", - "http-signature": "1.1.1", + "form-data": "2.3.2", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", "mime-types": "2.1.18", - "node-uuid": "1.4.8", "oauth-sign": "0.8.2", - "qs": "6.2.3", + "performance-now": "2.1.0", + "qs": "6.5.1", + "safe-buffer": "5.1.2", "stringstream": "0.0.5", "tough-cookie": "2.3.4", - "tunnel-agent": "0.4.3" - }, - "dependencies": { - "node-uuid": { - "version": "1.4.8", - "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", - "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=", - "dev": true - }, - "qs": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz", - "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=", - "dev": true - } + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" } }, "request-promise": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.1.1.tgz", - "integrity": "sha1-JgIeT29W/Uwwn2vx69jJepWsH7U=", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.2.tgz", + "integrity": "sha1-0epG1lSm7k+O5qT+oQGMIpEZBLQ=", "dev": true, "requires": { "bluebird": "3.5.1", "request-promise-core": "1.1.1", - "stealthy-require": "1.1.1" + "stealthy-require": "1.1.1", + "tough-cookie": "2.3.4" } }, "request-promise-core": { @@ -4196,17 +3945,18 @@ "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", "dev": true, "requires": { - "lodash": "4.17.5" + "lodash": "4.17.10" } }, "request-promise-native": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.3.tgz", - "integrity": "sha1-nLKy9p8TfkrPNRFqCKRBy/0MATQ=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", + "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", "dev": true, "requires": { "request-promise-core": "1.1.1", - "stealthy-require": "1.1.1" + "stealthy-require": "1.1.1", + "tough-cookie": "2.3.4" } }, "require_optional": { @@ -4242,11 +3992,11 @@ } }, "rimraf": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "requires": { - "glob": "6.0.4" + "glob": "7.1.2" } }, "run-async": { @@ -4265,9 +4015,9 @@ "dev": true }, "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-json-stringify": { "version": "1.1.0", @@ -4407,12 +4157,11 @@ } }, "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", "requires": { - "hoek": "2.16.3" + "hoek": "4.2.1" } }, "source-map": { @@ -4449,13 +4198,6 @@ "getpass": "0.1.7", "jsbn": "0.1.1", "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "stack-chain": { @@ -4486,11 +4228,11 @@ } }, "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "5.1.2" } }, "stringify-entities": { @@ -4499,10 +4241,10 @@ "integrity": "sha1-sVDsLXKsTBtfMktR+2soyc3/BYw=", "dev": true, "requires": { - "character-entities-html4": "1.1.1", - "character-entities-legacy": "1.1.1", - "is-alphanumerical": "1.0.1", - "is-hexadecimal": "1.0.1" + "character-entities-html4": "1.1.2", + "character-entities-legacy": "1.1.2", + "is-alphanumerical": "1.0.2", + "is-hexadecimal": "1.0.2" } }, "stringstream": { @@ -4519,10 +4261,10 @@ } }, "strip-json-comments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", - "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=", - "dev": true + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "optional": true }, "structured-source": { "version": "3.0.2", @@ -4559,35 +4301,10 @@ "fstream": "1.0.11", "fstream-ignore": "1.0.5", "once": "1.4.0", - "readable-stream": "2.3.5", + "readable-stream": "2.3.6", "rimraf": "2.6.2", "tar": "2.2.1", "uid-number": "0.0.6" - }, - "dependencies": { - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "optional": true, - "requires": { - "glob": "7.1.2" - } - } } }, "text-table": { @@ -4654,16 +4371,18 @@ "dev": true }, "trough": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz", - "integrity": "sha1-qf2LA5Swro//guBjOgo2zK1bX4Y=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz", + "integrity": "sha512-FHkoUZvG6Egrv9XZAyYGKEyb1JMsFphgPjoczkZC2y6W93U1jswcVURB8MUvtsahEPEVACyxD47JAL63vF4JsQ==", "dev": true }, "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", - "dev": true + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "5.1.2" + } }, "tweetnacl": { "version": "0.14.5", @@ -4737,9 +4456,9 @@ "optional": true }, "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz", + "integrity": "sha512-4IV1DSSxC1QK48j9ONFK1MoIAKKkbE8i7u55w2R6IqBqbT7A/iG7aZBCR2Bi8piF0Uz+i/MG1aeqLwl/5vqF+A==", "dev": true }, "unherit": { @@ -4758,11 +4477,11 @@ "integrity": "sha1-dv9Dqo2kMPbn5KVchOusKtLPzS4=", "dev": true, "requires": { - "bail": "1.0.2", + "bail": "1.0.3", "extend": "3.0.1", "has": "1.0.1", "once": "1.4.0", - "trough": "1.0.1", + "trough": "1.0.2", "vfile": "1.4.0" } }, @@ -4855,13 +4574,6 @@ "assert-plus": "1.0.0", "core-util-is": "1.0.2", "extsprintf": "1.3.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - } } }, "vfile": { diff --git a/package.json b/package.json index 6b9403a2d3..763c033554 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,9 @@ "mysql2": "^1.5.1", "proxyquire": "1.7.3", "redis": "^2.8.0", - "request": "2.74.0", - "request-promise": "4.1.1", - "request-promise-native": "1.0.3", + "request": "^2.85.0", + "request-promise": "^4.1.1", + "request-promise-native": "^1.0.3", "sinon": "1.17.1", "underscore": "^1.8.3", "uuid": "^3.2.1" diff --git a/test/actions/profiling/cpu_test.js b/test/actions/profiling/cpu_test.js index 6781b79a0b..fda82ad23c 100644 --- a/test/actions/profiling/cpu_test.js +++ b/test/actions/profiling/cpu_test.js @@ -5,9 +5,7 @@ var semver = require('semver'); var path = require('path'); var fs = require('fs'); -var expressElasticsearchControls = require('../../apps/expressElasticsearchControls'); var supportedVersion = require('../../../src/tracing/index').supportedVersion; -var agentStubControls = require('../../apps/agentStubControls'); var cpu = require('../../../src/actions/profiling/cpu'); var config = require('../../config'); var utils = require('../../utils'); @@ -18,6 +16,10 @@ describe('actions/profiling/cpu', function() { return; } + // controls require features that aren't available in early Node.js versions + var expressElasticsearchControls = require('../../apps/expressElasticsearchControls'); + var agentStubControls = require('../../apps/agentStubControls'); + describe('toTreeWithTiming', function() { var rawCpuProfile; diff --git a/test/actions/source_test.js b/test/actions/source_test.js index 24d653b77b..e872fcf5f0 100644 --- a/test/actions/source_test.js +++ b/test/actions/source_test.js @@ -1,16 +1,23 @@ 'use strict'; var expect = require('chai').expect; +var semver = require('semver'); var path = require('path'); var supportedVersion = require('../../src/tracing/index').supportedVersion; -var expressControls = require('../apps/expressElasticsearchControls'); -var agentStubControls = require('../apps/agentStubControls'); var config = require('../config'); var utils = require('../utils'); describe('actions/source', function() { + if (semver.satisfies(process.versions.node, '<4')) { + return; + } + + // controls require features that aren't available in early Node.js versions + var expressControls = require('../apps/expressElasticsearchControls'); + var agentStubControls = require('../apps/agentStubControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/agentCommunication_test.js b/test/agentCommunication_test.js index 500b8f648c..b7c23e189d 100644 --- a/test/agentCommunication_test.js +++ b/test/agentCommunication_test.js @@ -1,13 +1,20 @@ 'use strict'; var expect = require('chai').expect; +var semver = require('semver'); -var agentStubControls = require('./apps/agentStubControls'); -var expressControls = require('./apps/expressControls'); var config = require('./config'); var utils = require('./utils'); describe('agentCommunication', function() { + if (semver.satisfies(process.versions.node, '<4')) { + return; + } + + // controls require features that aren't available in early Node.js versions + var agentStubControls = require('./apps/agentStubControls'); + var expressControls = require('./apps/expressControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/apps/agentStub_test.js b/test/apps/agentStub_test.js index 44642c8bf2..345a643bc5 100644 --- a/test/apps/agentStub_test.js +++ b/test/apps/agentStub_test.js @@ -2,12 +2,18 @@ 'use strict'; +var supportedVersion = require('../../src/tracing/index').supportedVersion; var config = require('../config'); -var agentStubControls = require('./agentStubControls'); var expect = require('chai').expect; - describe('agentStub', function() { + if (!supportedVersion(process.versions.node)) { + return; + } + + // controls require features that aren't available in early Node.js versions + var agentStubControls = require('./agentStubControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/disabledTracing_test.js b/test/disabledTracing_test.js index 5a48310ffc..099cb936f3 100644 --- a/test/disabledTracing_test.js +++ b/test/disabledTracing_test.js @@ -4,8 +4,6 @@ var expect = require('chai').expect; var Promise = require('bluebird'); var supportedVersion = require('../src/tracing/index').supportedVersion; -var agentStubControls = require('./apps/agentStubControls'); -var expressControls = require('./apps/expressControls'); var config = require('./config'); var utils = require('./utils'); @@ -14,6 +12,10 @@ describe('disabled tracing', function() { return; } + // controls require features that aren't available in early Node.js versions + var agentStubControls = require('./apps/agentStubControls'); + var expressControls = require('./apps/expressControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/metrics/healthchecks_test.js b/test/metrics/healthchecks_test.js index 69317832b8..c75d8d0c98 100644 --- a/test/metrics/healthchecks_test.js +++ b/test/metrics/healthchecks_test.js @@ -2,9 +2,6 @@ var expect = require('chai').expect; var semver = require('semver'); - -var agentStubControls = require('../apps/agentStubControls'); -var expressControls = require('../apps/expressControls'); var config = require('../config'); var utils = require('../utils'); @@ -14,6 +11,11 @@ describe('metrics/healthchecks', function() { if (!semver.satisfies(process.versions.node, '>=6.0.0')) { return; } + + // require controls at this place, because the modules themselves aren't compatible with Node.js 0.12 + var agentStubControls = require('../apps/agentStubControls'); + var expressControls = require('../apps/expressControls'); + this.timeout(config.getTestTimeout()); var start = new Date().getTime(); diff --git a/test/tracing/asyncAwait_test.js b/test/tracing/asyncAwait_test.js index 51658a0aa1..9d9fa87922 100644 --- a/test/tracing/asyncAwait_test.js +++ b/test/tracing/asyncAwait_test.js @@ -3,9 +3,6 @@ var expect = require('chai').expect; var semver = require('semver'); -var expressAsyncAwaitControls = require('../apps/expressAsyncAwaitControls'); -var agentStubControls = require('../apps/agentStubControls'); -var expressControls = require('../apps/expressControls'); var config = require('../config'); var utils = require('../utils'); @@ -14,6 +11,11 @@ describe('tracing', function() { return; } + // controls require features that aren't available in early Node.js versions + var expressAsyncAwaitControls = require('../apps/expressAsyncAwaitControls'); + var agentStubControls = require('../apps/agentStubControls'); + var expressControls = require('../apps/expressControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/tracing/bluebird/test.js b/test/tracing/bluebird/test.js index 30ad812080..37be46c4c1 100644 --- a/test/tracing/bluebird/test.js +++ b/test/tracing/bluebird/test.js @@ -3,8 +3,6 @@ var expect = require('chai').expect; var supportedVersion = require('../../../src/tracing/index').supportedVersion; -var agentControls = require('../../apps/agentStubControls'); -var BluebirdControls = require('./controls'); var config = require('../../config'); var utils = require('../../utils'); @@ -12,6 +10,11 @@ describe('tracing/bluebird', function() { if (!supportedVersion(process.versions.node)) { return; } + + // controls require features that aren't available in early Node.js versions + var agentControls = require('../../apps/agentStubControls'); + var BluebirdControls = require('./controls'); + this.timeout(config.getTestTimeout()); agentControls.registerTestHooks(); diff --git a/test/tracing/elasticsearch_test.js b/test/tracing/elasticsearch_test.js index bb31abf2e7..847515aa2a 100644 --- a/test/tracing/elasticsearch_test.js +++ b/test/tracing/elasticsearch_test.js @@ -2,9 +2,7 @@ var expect = require('chai').expect; -var expressElasticsearchControls = require('../apps/expressElasticsearchControls'); var supportedVersion = require('../../src/tracing/index').supportedVersion; -var agentStubControls = require('../apps/agentStubControls'); var config = require('../config'); var utils = require('../utils'); @@ -13,6 +11,10 @@ describe('tracing/elasticsearch', function() { return; } + // controls require features that aren't available in early Node.js versions + var expressElasticsearchControls = require('../apps/expressElasticsearchControls'); + var agentStubControls = require('../apps/agentStubControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/tracing/express_uncaughtErrors/test.js b/test/tracing/express_uncaughtErrors/test.js index 7251af854d..aa6b470729 100644 --- a/test/tracing/express_uncaughtErrors/test.js +++ b/test/tracing/express_uncaughtErrors/test.js @@ -3,8 +3,6 @@ var expect = require('chai').expect; var supportedVersion = require('../../../src/tracing/index').supportedVersion; -var agentControls = require('../../apps/agentStubControls'); -var ExpressUncaughtErrorsControls = require('./controls'); var config = require('../../config'); var utils = require('../../utils'); @@ -12,6 +10,11 @@ describe('tracing/express with uncaught errors', function() { if (!supportedVersion(process.versions.node)) { return; } + + // controls require features that aren't available in early Node.js versions + var agentControls = require('../../apps/agentStubControls'); + var ExpressUncaughtErrorsControls = require('./controls'); + this.timeout(config.getTestTimeout()); agentControls.registerTestHooks(); diff --git a/test/tracing/https_test.js b/test/tracing/https_test.js index 1c1fc3ae69..6952dcc1a4 100644 --- a/test/tracing/https_test.js +++ b/test/tracing/https_test.js @@ -3,8 +3,6 @@ var expect = require('chai').expect; var supportedVersion = require('../../src/tracing/index').supportedVersion; -var agentStubControls = require('../apps/agentStubControls'); -var expressControls = require('../apps/expressControls'); var config = require('../config'); var utils = require('../utils'); @@ -13,6 +11,10 @@ describe('tracing/https', function() { return; } + // controls require features that aren't available in early Node.js versions + var agentStubControls = require('../apps/agentStubControls'); + var expressControls = require('../apps/expressControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/tracing/ioredis/test.js b/test/tracing/ioredis/test.js index f07be27c7f..e7c6108ce2 100644 --- a/test/tracing/ioredis/test.js +++ b/test/tracing/ioredis/test.js @@ -3,8 +3,6 @@ var expect = require('chai').expect; var supportedVersion = require('../../../src/tracing/index').supportedVersion; -var agentControls = require('../../apps/agentStubControls'); -var IoRedisControls = require('./controls'); var config = require('../../config'); var utils = require('../../utils'); @@ -12,6 +10,11 @@ describe('tracing/ioredis', function() { if (!supportedVersion(process.versions.node)) { return; } + + // controls require features that aren't available in early Node.js versions + var agentControls = require('../../apps/agentStubControls'); + var IoRedisControls = require('./controls'); + this.timeout(config.getTestTimeout()); agentControls.registerTestHooks(); diff --git a/test/tracing/kafka_test.js b/test/tracing/kafka_test.js index 56ba4ebbf8..21111cf148 100644 --- a/test/tracing/kafka_test.js +++ b/test/tracing/kafka_test.js @@ -2,10 +2,7 @@ var expect = require('chai').expect; -var expressKafkaProducerControls = require('../apps/expressKafkaProducerControls'); var supportedVersion = require('../../src/tracing/index').supportedVersion; -var kafkaConsumerControls = require('../apps/kafkaConsumerControls'); -var agentStubControls = require('../apps/agentStubControls'); var config = require('../config'); var utils = require('../utils'); @@ -14,6 +11,11 @@ describe('tracing/kafka', function() { return; } + // controls require features that aren't available in early Node.js versions + var expressKafkaProducerControls = require('../apps/expressKafkaProducerControls'); + var kafkaConsumerControls = require('../apps/kafkaConsumerControls'); + var agentStubControls = require('../apps/agentStubControls'); + // Too many moving parts with Kafka involed. Increase the default timeout. // This is especially important since the Kafka client has an // exponential backoff implemented. diff --git a/test/tracing/mongodb_test.js b/test/tracing/mongodb_test.js index f55a2aef53..c11dfe2a59 100644 --- a/test/tracing/mongodb_test.js +++ b/test/tracing/mongodb_test.js @@ -5,8 +5,6 @@ var Promise = require('bluebird'); var _ = require('lodash'); var supportedVersion = require('../../src/tracing/index').supportedVersion; -var expressMongodbControls = require('../apps/expressMongodbControls'); -var agentStubControls = require('../apps/agentStubControls'); var config = require('../config'); var utils = require('../utils'); @@ -15,6 +13,10 @@ describe('tracing/mongodb', function() { return; } + // controls require features that aren't available in early Node.js versions + var expressMongodbControls = require('../apps/expressMongodbControls'); + var agentStubControls = require('../apps/agentStubControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/tracing/mongoose/test.js b/test/tracing/mongoose/test.js index 36d44ad798..8d49e75a63 100644 --- a/test/tracing/mongoose/test.js +++ b/test/tracing/mongoose/test.js @@ -4,8 +4,6 @@ var expect = require('chai').expect; var uuid = require('uuid/v4'); var supportedVersion = require('../../../src/tracing/index').supportedVersion; -var agentControls = require('../../apps/agentStubControls'); -var MongooseControls = require('./controls'); var config = require('../../config'); var utils = require('../../utils'); @@ -13,6 +11,11 @@ describe('tracing/mongoose', function() { if (!supportedVersion(process.versions.node)) { return; } + + // controls require features that aren't available in early Node.js versions + var agentControls = require('../../apps/agentStubControls'); + var MongooseControls = require('./controls'); + this.timeout(config.getTestTimeout()); agentControls.registerTestHooks(); diff --git a/test/tracing/mysql_test.js b/test/tracing/mysql_test.js index ffd33e23d2..e944dffd02 100644 --- a/test/tracing/mysql_test.js +++ b/test/tracing/mysql_test.js @@ -3,8 +3,6 @@ var expect = require('chai').expect; var supportedVersion = require('../../src/tracing/index').supportedVersion; -var expressMysqlControls = require('../apps/expressMysqlControls'); -var agentStubControls = require('../apps/agentStubControls'); var config = require('../config'); var utils = require('../utils'); @@ -13,6 +11,10 @@ describe('tracing/mysql', function() { return; } + // controls require features that aren't available in early Node.js versions + var expressMysqlControls = require('../apps/expressMysqlControls'); + var agentStubControls = require('../apps/agentStubControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/tracing/opentracing/integration_test.js b/test/tracing/opentracing/integration_test.js index 638858d44e..f837baa6b3 100644 --- a/test/tracing/opentracing/integration_test.js +++ b/test/tracing/opentracing/integration_test.js @@ -1,14 +1,21 @@ 'use strict'; var expect = require('chai').expect; +var semver = require('semver'); var supportedVersion = require('../../../src/tracing/index').supportedVersion; -var expressOpentracingControls = require('../../apps/expressOpentracingControls'); -var agentStubControls = require('../../apps/agentStubControls'); var config = require('../../config'); var utils = require('../../utils'); describe('tracing/opentracing/integration', function() { + if (semver.satisfies(process.versions.node, '<4')) { + return; + } + + // controls require features that aren't available in early Node.js versions + var agentStubControls = require('../../apps/agentStubControls'); + var expressOpentracingControls = require('../../apps/expressOpentracingControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/tracing/redis/test.js b/test/tracing/redis/test.js index 2e020e687a..c1409197ec 100644 --- a/test/tracing/redis/test.js +++ b/test/tracing/redis/test.js @@ -3,8 +3,6 @@ var expect = require('chai').expect; var supportedVersion = require('../../../src/tracing/index').supportedVersion; -var agentControls = require('../../apps/agentStubControls'); -var RedisControls = require('./controls'); var config = require('../../config'); var utils = require('../../utils'); @@ -12,6 +10,11 @@ describe('tracing/redis', function() { if (!supportedVersion(process.versions.node)) { return; } + + // controls require features that aren't available in early Node.js versions + var agentControls = require('../../apps/agentStubControls'); + var RedisControls = require('./controls'); + this.timeout(config.getTestTimeout()); agentControls.registerTestHooks(); diff --git a/test/tracing/stackTraces_test.js b/test/tracing/stackTraces_test.js index 324581092d..8f2ddff705 100644 --- a/test/tracing/stackTraces_test.js +++ b/test/tracing/stackTraces_test.js @@ -3,8 +3,6 @@ var expect = require('chai').expect; var supportedVersion = require('../../src/tracing/index').supportedVersion; -var agentStubControls = require('../apps/agentStubControls'); -var expressProxyControls = require('../apps/expressProxyControls'); var config = require('../config'); var utils = require('../utils'); @@ -13,6 +11,10 @@ describe('tracing/stackTraces', function() { return; } + // controls require features that aren't available in early Node.js versions + var agentStubControls = require('../apps/agentStubControls'); + var expressProxyControls = require('../apps/expressProxyControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks(); diff --git a/test/tracing_test.js b/test/tracing_test.js index c49406e8aa..3285c62d00 100644 --- a/test/tracing_test.js +++ b/test/tracing_test.js @@ -4,9 +4,6 @@ var expect = require('chai').expect; var Promise = require('bluebird'); var supportedVersion = require('../src/tracing/index').supportedVersion; -var expressProxyControls = require('./apps/expressProxyControls'); -var agentStubControls = require('./apps/agentStubControls'); -var expressControls = require('./apps/expressControls'); var config = require('./config'); var utils = require('./utils'); @@ -15,6 +12,11 @@ describe('tracing', function() { return; } + // controls require features that aren't available in early Node.js versions + var expressProxyControls = require('./apps/expressProxyControls'); + var agentStubControls = require('./apps/agentStubControls'); + var expressControls = require('./apps/expressControls'); + this.timeout(config.getTestTimeout()); agentStubControls.registerTestHooks();