diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 243ee0750b..488aa64e2a 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -16,7 +16,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic * [@grpc/grpc-js](#grpcgrpc-js) * [@grpc/proto-loader](#grpcproto-loader) -* [@newrelic/ritm](#newrelicritm) * [@newrelic/security-agent](#newrelicsecurity-agent) * [@tyriar/fibonacci-heap](#tyriarfibonacci-heap) * [concat-stream](#concat-stream) @@ -510,36 +509,6 @@ This product includes source derived from [@grpc/proto-loader](https://github.co ``` -### @newrelic/ritm - -This product includes source derived from [@newrelic/ritm](https://github.com/newrelic-forks/require-in-the-middle) ([v7.2.0](https://github.com/newrelic-forks/require-in-the-middle/tree/v7.2.0)), distributed under the [MIT License](https://github.com/newrelic-forks/require-in-the-middle/blob/v7.2.0/LICENSE): - -``` -The MIT License (MIT) - -Copyright (c) 2016-2019, Thomas Watson Steen -Copyright (c) 2019-2023, Elasticsearch B.V. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -``` - ### @newrelic/security-agent This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.5.0](https://github.com/newrelic/csec-node-agent/tree/v1.5.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.5.0/LICENSE): @@ -1107,7 +1076,7 @@ SOFTWARE. ### @aws-sdk/client-s3 -This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.631.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.631.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.631.0/LICENSE): +This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.632.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.632.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.632.0/LICENSE): ``` Apache License @@ -1316,7 +1285,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co ### @aws-sdk/s3-request-presigner -This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.631.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.631.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.631.0/LICENSE): +This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.632.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.632.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.632.0/LICENSE): ``` Apache License @@ -1971,7 +1940,7 @@ This product includes source derived from [@newrelic/newrelic-oss-cli](https://g ### @newrelic/test-utilities -This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v8.7.0](https://github.com/newrelic/node-test-utilities/tree/v8.7.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v8.7.0/LICENSE): +This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v9.1.0](https://github.com/newrelic/node-test-utilities/tree/v9.1.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v9.1.0/LICENSE): ``` Apache License @@ -2210,7 +2179,7 @@ THE SOFTWARE. ### @slack/bolt -This product includes source derived from [@slack/bolt](https://github.com/slackapi/bolt) ([v3.21.0](https://github.com/slackapi/bolt/tree/v3.21.0)), distributed under the [MIT License](https://github.com/slackapi/bolt/blob/v3.21.0/LICENSE): +This product includes source derived from [@slack/bolt](https://github.com/slackapi/bolt) ([v3.21.1](https://github.com/slackapi/bolt/tree/v3.21.1)), distributed under the [MIT License](https://github.com/slackapi/bolt/blob/v3.21.1/LICENSE): ``` The MIT License (MIT) @@ -2714,7 +2683,7 @@ THE SOFTWARE. ### aws-sdk -This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1675.0](https://github.com/aws/aws-sdk-js/tree/v2.1675.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1675.0/LICENSE.txt): +This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1677.0](https://github.com/aws/aws-sdk-js/tree/v2.1677.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1677.0/LICENSE.txt): ``` @@ -4057,7 +4026,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ### self-cert -This product includes source derived from [self-cert](https://github.com/jsumners/self-cert) ([v2.0.0](https://github.com/jsumners/self-cert/tree/v2.0.0)), distributed under the [MIT License](https://github.com/jsumners/self-cert/blob/v2.0.0/Readme.md): +This product includes source derived from [self-cert](https://github.com/jsumners/self-cert) ([v2.0.1](https://github.com/jsumners/self-cert/tree/v2.0.1)), distributed under the [MIT License](https://github.com/jsumners/self-cert/blob/v2.0.1/Readme.md): ``` MIT License diff --git a/bin/run-versioned-tests.sh b/bin/run-versioned-tests.sh index 8e442f9695..b44966e365 100755 --- a/bin/run-versioned-tests.sh +++ b/bin/run-versioned-tests.sh @@ -24,6 +24,14 @@ EXTERNAL_MODE="${EXTERNAL_MODE:-include}" # Known values are "simple", "pretty", and "quiet". OUTPUT_MODE="${OUTPUT_MODE:-pretty}" +MATRIX_COUNT_ONLY=${MATRIX_COUNT_ONLY:-0} +if [[ ${MATRIX_COUNT_ONLY} -ne 0 ]]; then + MATRIX_COUNT="--matrix-count" +else + MATRIX_COUNT="" +fi + + # Determine context manager for sanity sake if [[ $NEW_RELIC_FEATURE_FLAG_LEGACY_CONTEXT_MANAGER == 1 ]]; then @@ -100,4 +108,4 @@ then fi export NR_LOADER=./esm-loader.mjs -time $C8 ./node_modules/.bin/versioned-tests $VERSIONED_MODE --print $OUTPUT_MODE -i 100 --all --strict --samples $SAMPLES $JOBS_ARGS ${directories[@]} +time $C8 ./node_modules/.bin/versioned-tests $VERSIONED_MODE $MATRIX_COUNT --print $OUTPUT_MODE -i 100 --all --strict --samples $SAMPLES $JOBS_ARGS ${directories[@]} diff --git a/package.json b/package.json index 369fc232ec..43c9f1cbe1 100644 --- a/package.json +++ b/package.json @@ -221,7 +221,7 @@ "@koa/router": "^12.0.1", "@newrelic/eslint-config": "^0.3.0", "@newrelic/newrelic-oss-cli": "^0.1.2", - "@newrelic/test-utilities": "^8.5.0", + "@newrelic/test-utilities": "^9.1.0", "@octokit/rest": "^18.0.15", "@slack/bolt": "^3.7.0", "@smithy/eventstream-codec": "^2.2.0", diff --git a/third_party_manifest.json b/third_party_manifest.json index 0e997cfdba..d36962c491 100644 --- a/third_party_manifest.json +++ b/third_party_manifest.json @@ -1,5 +1,5 @@ { - "lastUpdated": "Thu Aug 15 2024 12:52:31 GMT-0400 (Eastern Daylight Time)", + "lastUpdated": "Mon Aug 19 2024 14:49:27 GMT-0400 (Eastern Daylight Time)", "projectName": "New Relic Node Agent", "projectUrl": "https://github.com/newrelic/node-newrelic", "includeOptDeps": true, @@ -68,20 +68,6 @@ "licenseTextSource": "file", "publisher": "Google Inc." }, - "@newrelic/ritm@7.2.0": { - "name": "@newrelic/ritm", - "version": "7.2.0", - "range": "^7.2.0", - "licenses": "MIT", - "repoUrl": "https://github.com/newrelic-forks/require-in-the-middle", - "versionedRepoUrl": "https://github.com/newrelic-forks/require-in-the-middle/tree/v7.2.0", - "licenseFile": "node_modules/@newrelic/ritm/LICENSE", - "licenseUrl": "https://github.com/newrelic-forks/require-in-the-middle/blob/v7.2.0/LICENSE", - "licenseTextSource": "file", - "publisher": "Thomas Watson Steen", - "email": "w@tson.dk", - "url": "https://twitter.com/wa7son" - }, "@newrelic/security-agent@1.5.0": { "name": "@newrelic/security-agent", "version": "1.5.0", @@ -240,28 +226,28 @@ } }, "devDependencies": { - "@aws-sdk/client-s3@3.631.0": { + "@aws-sdk/client-s3@3.632.0": { "name": "@aws-sdk/client-s3", - "version": "3.631.0", + "version": "3.632.0", "range": "^3.556.0", "licenses": "Apache-2.0", "repoUrl": "https://github.com/aws/aws-sdk-js-v3", - "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.631.0", + "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.632.0", "licenseFile": "node_modules/@aws-sdk/client-s3/LICENSE", - "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.631.0/LICENSE", + "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.632.0/LICENSE", "licenseTextSource": "file", "publisher": "AWS SDK for JavaScript Team", "url": "https://aws.amazon.com/javascript/" }, - "@aws-sdk/s3-request-presigner@3.631.0": { + "@aws-sdk/s3-request-presigner@3.632.0": { "name": "@aws-sdk/s3-request-presigner", - "version": "3.631.0", + "version": "3.632.0", "range": "^3.556.0", "licenses": "Apache-2.0", "repoUrl": "https://github.com/aws/aws-sdk-js-v3", - "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.631.0", + "versionedRepoUrl": "https://github.com/aws/aws-sdk-js-v3/tree/v3.632.0", "licenseFile": "node_modules/@aws-sdk/s3-request-presigner/LICENSE", - "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.631.0/LICENSE", + "licenseUrl": "https://github.com/aws/aws-sdk-js-v3/blob/v3.632.0/LICENSE", "licenseTextSource": "file", "publisher": "AWS SDK for JavaScript Team", "url": "https://aws.amazon.com/javascript/" @@ -304,15 +290,15 @@ "licenseTextSource": "file", "publisher": "New Relic" }, - "@newrelic/test-utilities@8.7.0": { + "@newrelic/test-utilities@9.1.0": { "name": "@newrelic/test-utilities", - "version": "8.7.0", - "range": "^8.5.0", + "version": "9.1.0", + "range": "^9.1.0", "licenses": "Apache-2.0", "repoUrl": "https://github.com/newrelic/node-test-utilities", - "versionedRepoUrl": "https://github.com/newrelic/node-test-utilities/tree/v8.7.0", + "versionedRepoUrl": "https://github.com/newrelic/node-test-utilities/tree/v9.1.0", "licenseFile": "node_modules/@newrelic/test-utilities/LICENSE", - "licenseUrl": "https://github.com/newrelic/node-test-utilities/blob/v8.7.0/LICENSE", + "licenseUrl": "https://github.com/newrelic/node-test-utilities/blob/v9.1.0/LICENSE", "licenseTextSource": "file", "publisher": "New Relic Node.js agent team", "email": "nodejs@newrelic.com" @@ -328,15 +314,15 @@ "licenseUrl": "https://github.com/octokit/rest.js/blob/v18.12.0/LICENSE", "licenseTextSource": "file" }, - "@slack/bolt@3.21.0": { + "@slack/bolt@3.21.1": { "name": "@slack/bolt", - "version": "3.21.0", + "version": "3.21.1", "range": "^3.7.0", "licenses": "MIT", "repoUrl": "https://github.com/slackapi/bolt", - "versionedRepoUrl": "https://github.com/slackapi/bolt/tree/v3.21.0", + "versionedRepoUrl": "https://github.com/slackapi/bolt/tree/v3.21.1", "licenseFile": "node_modules/@slack/bolt/LICENSE", - "licenseUrl": "https://github.com/slackapi/bolt/blob/v3.21.0/LICENSE", + "licenseUrl": "https://github.com/slackapi/bolt/blob/v3.21.1/LICENSE", "licenseTextSource": "file", "publisher": "Slack Technologies, LLC" }, @@ -390,15 +376,15 @@ "licenseTextSource": "file", "publisher": "Caolan McMahon" }, - "aws-sdk@2.1675.0": { + "aws-sdk@2.1677.0": { "name": "aws-sdk", - "version": "2.1675.0", + "version": "2.1677.0", "range": "^2.1604.0", "licenses": "Apache-2.0", "repoUrl": "https://github.com/aws/aws-sdk-js", - "versionedRepoUrl": "https://github.com/aws/aws-sdk-js/tree/v2.1675.0", + "versionedRepoUrl": "https://github.com/aws/aws-sdk-js/tree/v2.1677.0", "licenseFile": "node_modules/aws-sdk/LICENSE.txt", - "licenseUrl": "https://github.com/aws/aws-sdk-js/blob/v2.1675.0/LICENSE.txt", + "licenseUrl": "https://github.com/aws/aws-sdk-js/blob/v2.1677.0/LICENSE.txt", "licenseTextSource": "file", "publisher": "Amazon Web Services", "url": "https://aws.amazon.com/" @@ -751,15 +737,15 @@ "email": "i@izs.me", "url": "http://blog.izs.me/" }, - "self-cert@2.0.0": { + "self-cert@2.0.1": { "name": "self-cert", - "version": "2.0.0", + "version": "2.0.1", "range": "^2.0.0", "licenses": "MIT", "repoUrl": "https://github.com/jsumners/self-cert", - "versionedRepoUrl": "https://github.com/jsumners/self-cert/tree/v2.0.0", + "versionedRepoUrl": "https://github.com/jsumners/self-cert/tree/v2.0.1", "licenseFile": "node_modules/self-cert/Readme.md", - "licenseUrl": "https://github.com/jsumners/self-cert/blob/v2.0.0/Readme.md", + "licenseUrl": "https://github.com/jsumners/self-cert/blob/v2.0.1/Readme.md", "licenseTextSource": "spdx", "publisher": "James Sumners", "email": "james.sumners@gmail.com"