From 86c7fb50f06534638e9141dbbede3a6f81189409 Mon Sep 17 00:00:00 2001 From: James Sumners Date: Tue, 13 May 2025 15:43:11 -0400 Subject: [PATCH] chore: Added Node.js 24 support --- .github/workflows/ci-workflow.yml | 7 ++-- .github/workflows/create-release.yml | 7 ++-- THIRD_PARTY_NOTICES.md | 38 ++++++++++++++++++--- package.json | 4 +-- third_party_manifest.json | 49 ++++++++++++++++++---------- 5 files changed, 75 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 24f46bb..e70c75f 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -38,11 +38,12 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest ] - node: [ 18, 20, 22 ] + node: [ 18, 20, 22, 24 ] arch: [ x86, x64 ] exclude: # Ubuntu does not ship x86 builds. - { os: ubuntu-latest, arch: x86 } + - { os: windows-latest, arch: x86, node: 24 } runs-on: ${{ matrix.os }} name: "${{ matrix.os }} / Node ${{ matrix.node }} ${{ matrix.arch }}" steps: @@ -85,7 +86,7 @@ jobs: # strategy: # matrix: # os: [ macos-14 ] -# node: [ 18, 20, 22 ] +# node: [ 18, 20, 22, 24 ] # arch: [ arm64 ] # runs-on: ${{ matrix.os }} # name: "${{ matrix.os }} / Node ${{ matrix.node }} ${{ matrix.arch }}" @@ -129,7 +130,7 @@ jobs: if: ${{ vars.NR_RUNNER != '' }} strategy: matrix: - node: [ 18, 20, 22 ] + node: [ 18, 20, 22, 24 ] runs-on: ${{ vars.NR_RUNNER }} name: Linux / Node ${{ matrix.node }} arm64 timeout-minutes: 15 diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index fc239b3..3ac8f02 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -12,11 +12,12 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest ] - node: [ 18, 20, 22 ] + node: [ 18, 20, 22, 24 ] arch: [ x86, x64 ] exclude: # Ubuntu does not ship x86 builds. - { os: ubuntu-latest, arch: x86 } + - { os: windows-latest, arch: x86, node: 24 } runs-on: ${{ matrix.os }} name: "${{ matrix.os }} / Node ${{ matrix.node }} ${{ matrix.arch }}" steps: @@ -45,7 +46,7 @@ jobs: strategy: matrix: os: [ macos-14 ] - node: [ 18, 20, 22 ] + node: [ 18, 20, 22, 24 ] arch: [ arm64 ] runs-on: ${{ matrix.os }} name: "${{ matrix.os }} / Node ${{ matrix.node }} ${{ matrix.arch }}" @@ -78,7 +79,7 @@ jobs: if: ${{ vars.NR_RUNNER != '' }} strategy: matrix: - node: [ 18, 20, 22 ] + node: [ 18, 20, 22, 24 ] runs-on: ${{ vars.NR_RUNNER }} name: Linux / Node ${{ matrix.node }} arm64 timeout-minutes: 15 diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index d5555b9..ce34ed3 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -25,6 +25,7 @@ code, the source code can be found at [https://github.com/newrelic/node-native-m * [@newrelic/proxy](#newrelicproxy) * [async](#async) * [aws-sdk](#aws-sdk) +* [borp](#borp) * [c8](#c8) * [eslint-config-prettier](#eslint-config-prettier) * [eslint-plugin-header](#eslint-plugin-header) @@ -45,7 +46,7 @@ code, the source code can be found at [https://github.com/newrelic/node-native-m ### nan -This product includes source derived from [nan](https://github.com/nodejs/nan) ([v2.20.0](https://github.com/nodejs/nan/tree/v2.20.0)), distributed under the [MIT License](https://github.com/nodejs/nan/blob/v2.20.0/LICENSE.md): +This product includes source derived from [nan](https://github.com/nodejs/nan) ([v2.22.2](https://github.com/nodejs/nan/tree/v2.22.2)), distributed under the [MIT License](https://github.com/nodejs/nan/blob/v2.22.2/LICENSE.md): ``` The MIT License (MIT) @@ -62,7 +63,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI ### node-gyp-build -This product includes source derived from [node-gyp-build](https://github.com/prebuild/node-gyp-build) ([v4.8.1](https://github.com/prebuild/node-gyp-build/tree/v4.8.1)), distributed under the [MIT License](https://github.com/prebuild/node-gyp-build/blob/v4.8.1/LICENSE): +This product includes source derived from [node-gyp-build](https://github.com/prebuild/node-gyp-build) ([v4.8.4](https://github.com/prebuild/node-gyp-build/tree/v4.8.4)), distributed under the [MIT License](https://github.com/prebuild/node-gyp-build/blob/v4.8.4/LICENSE): ``` The MIT License (MIT) @@ -583,7 +584,7 @@ THE SOFTWARE. ### aws-sdk -This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1656.0](https://github.com/aws/aws-sdk-js/tree/v2.1656.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1656.0/LICENSE.txt): +This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1591.0](https://github.com/aws/aws-sdk-js/tree/v2.1591.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1591.0/LICENSE.txt): ``` @@ -791,6 +792,35 @@ This product includes source derived from [aws-sdk](https://github.com/aws/aws-s ``` +### borp + +This product includes source derived from [borp](https://github.com/mcollina/borp) ([v0.20.0](https://github.com/mcollina/borp/tree/v0.20.0)), distributed under the [MIT License](https://github.com/mcollina/borp/blob/v0.20.0/LICENSE): + +``` +MIT License + +Copyright (c) 2023 Matteo Collina + +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. + +``` + ### c8 This product includes source derived from [c8](https://github.com/bcoe/c8) ([v8.0.1](https://github.com/bcoe/c8/tree/v8.0.1)), distributed under the [ISC License](https://github.com/bcoe/c8/blob/v8.0.1/LICENSE.txt): @@ -1007,7 +1037,7 @@ SOFTWARE. ### lockfile-lint -This product includes source derived from [lockfile-lint](https://github.com/lirantal/lockfile-lint) ([v4.14.0](https://github.com/lirantal/lockfile-lint/tree/v4.14.0)), distributed under the [Apache-2.0 License](https://github.com/lirantal/lockfile-lint/blob/v4.14.0/LICENSE): +This product includes source derived from [lockfile-lint](https://github.com/lirantal/lockfile-lint) ([v4.13.2](https://github.com/lirantal/lockfile-lint/tree/v4.13.2)), distributed under the [Apache-2.0 License](https://github.com/lirantal/lockfile-lint/blob/v4.13.2/LICENSE): ``` diff --git a/package.json b/package.json index 43b6069..bf8f64a 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@newrelic/proxy": "^2.0.0", "async": "^3.2.2", "aws-sdk": "^2.266.1", - "borp": "^0.19.0", + "borp": "^0.20.0", "c8": "^8.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", @@ -97,7 +97,7 @@ "tap": "^16.3.7" }, "dependencies": { - "nan": "^2.19.0", + "nan": "^2.22.2", "node-gyp-build": "^4.8.1", "prebuildify": "^6.0.1" }, diff --git a/third_party_manifest.json b/third_party_manifest.json index 81afd74..a52902b 100644 --- a/third_party_manifest.json +++ b/third_party_manifest.json @@ -1,30 +1,30 @@ { - "lastUpdated": "Wed Jul 24 2024 13:30:43 GMT-0400 (Eastern Daylight Time)", + "lastUpdated": "Tue May 13 2025 15:43:13 GMT-0400 (Eastern Daylight Time)", "projectName": "Native Metrics for New Relic Node Agent", "projectUrl": "https://github.com/newrelic/node-native-metrics", "includeOptDeps": false, "includeDev": true, "dependencies": { - "nan@2.20.0": { + "nan@2.22.2": { "name": "nan", - "version": "2.20.0", - "range": "^2.19.0", + "version": "2.22.2", + "range": "^2.22.2", "licenses": "MIT", "repoUrl": "https://github.com/nodejs/nan", - "versionedRepoUrl": "https://github.com/nodejs/nan/tree/v2.20.0", + "versionedRepoUrl": "https://github.com/nodejs/nan/tree/v2.22.2", "licenseFile": "node_modules/nan/LICENSE.md", - "licenseUrl": "https://github.com/nodejs/nan/blob/v2.20.0/LICENSE.md", + "licenseUrl": "https://github.com/nodejs/nan/blob/v2.22.2/LICENSE.md", "licenseTextSource": "file" }, - "node-gyp-build@4.8.1": { + "node-gyp-build@4.8.4": { "name": "node-gyp-build", - "version": "4.8.1", + "version": "4.8.4", "range": "^4.8.1", "licenses": "MIT", "repoUrl": "https://github.com/prebuild/node-gyp-build", - "versionedRepoUrl": "https://github.com/prebuild/node-gyp-build/tree/v4.8.1", + "versionedRepoUrl": "https://github.com/prebuild/node-gyp-build/tree/v4.8.4", "licenseFile": "node_modules/node-gyp-build/LICENSE", - "licenseUrl": "https://github.com/prebuild/node-gyp-build/blob/v4.8.1/LICENSE", + "licenseUrl": "https://github.com/prebuild/node-gyp-build/blob/v4.8.4/LICENSE", "licenseTextSource": "file", "publisher": "Mathias Buus", "url": "@mafintosh" @@ -95,19 +95,32 @@ "licenseTextSource": "file", "publisher": "Caolan McMahon" }, - "aws-sdk@2.1656.0": { + "aws-sdk@2.1591.0": { "name": "aws-sdk", - "version": "2.1656.0", + "version": "2.1591.0", "range": "^2.266.1", "licenses": "Apache-2.0", "repoUrl": "https://github.com/aws/aws-sdk-js", - "versionedRepoUrl": "https://github.com/aws/aws-sdk-js/tree/v2.1656.0", + "versionedRepoUrl": "https://github.com/aws/aws-sdk-js/tree/v2.1591.0", "licenseFile": "node_modules/aws-sdk/LICENSE.txt", - "licenseUrl": "https://github.com/aws/aws-sdk-js/blob/v2.1656.0/LICENSE.txt", + "licenseUrl": "https://github.com/aws/aws-sdk-js/blob/v2.1591.0/LICENSE.txt", "licenseTextSource": "file", "publisher": "Amazon Web Services", "url": "https://aws.amazon.com/" }, + "borp@0.20.0": { + "name": "borp", + "version": "0.20.0", + "range": "^0.20.0", + "licenses": "MIT", + "repoUrl": "https://github.com/mcollina/borp", + "versionedRepoUrl": "https://github.com/mcollina/borp/tree/v0.20.0", + "licenseFile": "node_modules/borp/LICENSE", + "licenseUrl": "https://github.com/mcollina/borp/blob/v0.20.0/LICENSE", + "licenseTextSource": "file", + "publisher": "Matteo Collina", + "email": "hello@matteocollina.com" + }, "c8@8.0.1": { "name": "c8", "version": "8.0.1", @@ -208,15 +221,15 @@ "publisher": "Andrey Okonetchnikov", "email": "andrey@okonet.ru" }, - "lockfile-lint@4.14.0": { + "lockfile-lint@4.13.2": { "name": "lockfile-lint", - "version": "4.14.0", + "version": "4.13.2", "range": "^4.9.6", "licenses": "Apache-2.0", "repoUrl": "https://github.com/lirantal/lockfile-lint", - "versionedRepoUrl": "https://github.com/lirantal/lockfile-lint/tree/v4.14.0", + "versionedRepoUrl": "https://github.com/lirantal/lockfile-lint/tree/v4.13.2", "licenseFile": "node_modules/lockfile-lint/LICENSE", - "licenseUrl": "https://github.com/lirantal/lockfile-lint/blob/v4.14.0/LICENSE", + "licenseUrl": "https://github.com/lirantal/lockfile-lint/blob/v4.13.2/LICENSE", "licenseTextSource": "file", "publisher": "Liran Tal", "email": "liran.tal@gmail.com",