diff --git a/.tekton/tasks/install-project-dependencies.yaml b/.tekton/tasks/install-project-dependencies.yaml index 5b123e7223..2f32850f9e 100644 --- a/.tekton/tasks/install-project-dependencies.yaml +++ b/.tekton/tasks/install-project-dependencies.yaml @@ -43,7 +43,17 @@ spec: if [ -n "$(params.npm-version)" ]; then npm install npm@$(params.npm-version) -g - fi + fi + + # Override yargs to v18 for Node 26+ (v17 has compatibility issues) + NODE_MAJOR=$(node -v | cut -d'.' -f1 | sed 's/v//') + if [ "$NODE_MAJOR" -ge 26 ]; then + echo "Node $NODE_MAJOR detected - overriding yargs to v18 for compatibility" + # Force reinstall with yargs v18 override + npm pkg set 'overrides.mocha.yargs=18.0.0' + npm install --package-lock-only + npm install + fi if [ "$(params.skip-cache)" == "true" ]; then echo "Skipping npm cache..." diff --git a/currencies.json b/currencies.json index fcf2856c2f..2adba3cc6a 100644 --- a/currencies.json +++ b/currencies.json @@ -383,7 +383,8 @@ "core": false, "versions": [ { - "v": "2.1693.0" + "v": "2.1693.0", + "node": "<26" } ] }, @@ -1164,19 +1165,22 @@ "versions": [ { "v": "7.8.0", - "node": ">=20.19.0 <23 || >=24", + "node": ">=20.19.0 <23 || >=24 <26", "skipValidation": true }, { "v": "6.19.0", + "node": "<26", "skipValidation": true }, { "v": "4.16.2", + "node": "<26", "skipValidation": true }, { "v": "4.5.0", + "node": "<26", "skipValidation": true } ] diff --git a/native-dep-packs/build-and-copy-node-modules-linux b/native-dep-packs/build-and-copy-node-modules-linux index cd9713e844..4e5f6cfd50 100644 --- a/native-dep-packs/build-and-copy-node-modules-linux +++ b/native-dep-packs/build-and-copy-node-modules-linux @@ -29,7 +29,7 @@ function buildAndCopyModulesLinux { -f "$dockerfile" \ --load -t "$dockertag" \ . - else if [[ "$arch" = "x64" ]]; then + elif [[ "$arch" = "x64" ]]; then docker build \ --platform=linux/amd64 \ --build-arg BASE_IMAGE=$baseimage \ diff --git a/native-dep-packs/rebuild-precompiled-addons.sh b/native-dep-packs/rebuild-precompiled-addons.sh index 9d754b8df4..2a9349746b 100755 --- a/native-dep-packs/rebuild-precompiled-addons.sh +++ b/native-dep-packs/rebuild-precompiled-addons.sh @@ -19,6 +19,7 @@ declare -A ABI_VERSIONS=( # ["131"]="23.0" \ ["137"]="24.0" # ["141"]="25.0" # Non-LTS (skipped intentionally) + ["147"]="26.0" ) LIBC_VARIANTS=( diff --git a/package-lock.json b/package-lock.json index 6fa1ad737d..5af41756a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -85,7 +85,7 @@ "mocha-multi-reporters": "1.5.1", "moment": "2.30.1", "morgan": "1.10.0", - "nan": "2.22.2", + "nan": "2.27.0", "node-gyp": "11.2.0", "opentracing": "0.14.7", "pino": "10.3.0", @@ -26165,10 +26165,9 @@ } }, "node_modules/nan": { - "version": "2.22.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", - "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==", - "devOptional": true, + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.27.0.tgz", + "integrity": "sha512-hC+0LidcL3XE4rp1C4H54KujgXKzbfyTngZTwBByQxsOxCEKZT0MPQ4hOKUH2jU1OYstqdDH4onyHPDzcV0XdQ==", "license": "MIT" }, "node_modules/nanoid": { @@ -26265,9 +26264,9 @@ } }, "node_modules/node-abi": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.8.0.tgz", - "integrity": "sha512-+P1Mf1XNURT+wN9UK8cjtHSwmmG02iAsX0JaYDDdXgMUe5eybde3AKpGGxOrkDmPkuonYJ6WjIRrNVQe0kjmFg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-4.31.0.tgz", + "integrity": "sha512-Erq5w/t3syw3s4sDsUaX4QttIdBPsGKTT1DTRsCkTonGggczhlDKm/wDX3o+HPJpQ41EjXCbcmXf0tgr5YZJXw==", "dev": true, "license": "MIT", "dependencies": { @@ -33535,7 +33534,7 @@ "dependencies": { "@instana/core": "5.4.3", "detect-libc": "^2.1.2", - "nan": "^2.26.2", + "nan": "^2.27.0", "node-gyp-build": "^4.8.4", "semver": "^7.7.4" }, @@ -33552,12 +33551,6 @@ "node": ">=8" } }, - "packages/autoprofile/node_modules/nan": { - "version": "2.26.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz", - "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==", - "license": "MIT" - }, "packages/autoprofile/node_modules/semver": { "version": "7.7.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", diff --git a/package.json b/package.json index 87820bb6e5..15465ec519 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,7 @@ "mocha-multi-reporters": "1.5.1", "moment": "2.30.1", "morgan": "1.10.0", - "nan": "2.22.2", + "nan": "2.27.0", "node-gyp": "11.2.0", "opentracing": "0.14.7", "pino": "10.3.0", @@ -171,14 +171,14 @@ }, "overrides": { "prebuildify": { - "node-abi": "4.8.0" + "node-abi": "4.31.0" }, "stream-shift": "1.0.2", "event-loop-stats": { - "nan": "2.22.2" + "nan": "2.27.0" }, "gcstats.js": { - "nan": "2.22.2" + "nan": "2.27.0" } }, "config": { diff --git a/packages/autoprofile/CONTRIBUTING.md b/packages/autoprofile/CONTRIBUTING.md index 7feac1d7fd..79dc61b28e 100644 --- a/packages/autoprofile/CONTRIBUTING.md +++ b/packages/autoprofile/CONTRIBUTING.md @@ -39,7 +39,7 @@ Supported arch: node scripts/prebuilds.js --os=darwin --node=20.0.0 [build v20 only for darwin] node scripts/prebuilds.js --os=linux --node=18.0.0 [build v18 only for linux] node scripts/prebuilds.js --os=linux --arch=linux-arm64 --node=18.0.0 [build v18 only for linux arm64] -node scripts/prebuilds.js --node22.0.0 [build specific node version] +node scripts/prebuilds.js --node=22.0.0 [build specific node version] node scripts/prebuilds.js --node=22.0.0,21.0.0 [build specific node versions] ``` diff --git a/packages/autoprofile/package.json b/packages/autoprofile/package.json index 4785aba7ab..a9e6c97ce0 100644 --- a/packages/autoprofile/package.json +++ b/packages/autoprofile/package.json @@ -51,7 +51,7 @@ "dependencies": { "@instana/core": "5.4.3", "detect-libc": "^2.1.2", - "nan": "^2.26.2", + "nan": "^2.27.0", "node-gyp-build": "^4.8.4", "semver": "^7.7.4" }, diff --git a/packages/autoprofile/prebuilds/darwin-arm64/node.abi147.node b/packages/autoprofile/prebuilds/darwin-arm64/node.abi147.node new file mode 100755 index 0000000000..f60cf00b30 Binary files /dev/null and b/packages/autoprofile/prebuilds/darwin-arm64/node.abi147.node differ diff --git a/packages/autoprofile/prebuilds/darwin-x64/node.abi147.node b/packages/autoprofile/prebuilds/darwin-x64/node.abi147.node new file mode 100755 index 0000000000..924fb00687 Binary files /dev/null and b/packages/autoprofile/prebuilds/darwin-x64/node.abi147.node differ diff --git a/packages/autoprofile/prebuilds/linux-arm/node.abi147.armv6.node b/packages/autoprofile/prebuilds/linux-arm/node.abi147.armv6.node new file mode 100755 index 0000000000..72a40cb5d5 Binary files /dev/null and b/packages/autoprofile/prebuilds/linux-arm/node.abi147.armv6.node differ diff --git a/packages/autoprofile/prebuilds/linux-arm/node.abi147.armv7.node b/packages/autoprofile/prebuilds/linux-arm/node.abi147.armv7.node new file mode 100755 index 0000000000..e8bae948f1 Binary files /dev/null and b/packages/autoprofile/prebuilds/linux-arm/node.abi147.armv7.node differ diff --git a/packages/autoprofile/prebuilds/linux-arm64/node.abi147.armv8.node b/packages/autoprofile/prebuilds/linux-arm64/node.abi147.armv8.node new file mode 100755 index 0000000000..108192fbc5 Binary files /dev/null and b/packages/autoprofile/prebuilds/linux-arm64/node.abi147.armv8.node differ diff --git a/packages/autoprofile/prebuilds/linux-arm64/node.abi147.node b/packages/autoprofile/prebuilds/linux-arm64/node.abi147.node new file mode 100755 index 0000000000..0d94320463 Binary files /dev/null and b/packages/autoprofile/prebuilds/linux-arm64/node.abi147.node differ diff --git a/packages/autoprofile/prebuilds/linux-s390x/node.abi147.node b/packages/autoprofile/prebuilds/linux-s390x/node.abi147.node new file mode 100755 index 0000000000..355aeafe0f Binary files /dev/null and b/packages/autoprofile/prebuilds/linux-s390x/node.abi147.node differ diff --git a/packages/autoprofile/prebuilds/linux-x64/node.abi147.musl.node b/packages/autoprofile/prebuilds/linux-x64/node.abi147.musl.node new file mode 100755 index 0000000000..71d48133f2 Binary files /dev/null and b/packages/autoprofile/prebuilds/linux-x64/node.abi147.musl.node differ diff --git a/packages/autoprofile/prebuilds/linux-x64/node.abi147.node b/packages/autoprofile/prebuilds/linux-x64/node.abi147.node new file mode 100755 index 0000000000..0d94320463 Binary files /dev/null and b/packages/autoprofile/prebuilds/linux-x64/node.abi147.node differ diff --git a/packages/shared-metrics/addons/darwin/arm64/147/event-loop-stats.tar.gz b/packages/shared-metrics/addons/darwin/arm64/147/event-loop-stats.tar.gz new file mode 100644 index 0000000000..d50e74a3fb Binary files /dev/null and b/packages/shared-metrics/addons/darwin/arm64/147/event-loop-stats.tar.gz differ diff --git a/packages/shared-metrics/addons/darwin/arm64/147/gcstats.js.tar.gz b/packages/shared-metrics/addons/darwin/arm64/147/gcstats.js.tar.gz new file mode 100644 index 0000000000..2ede502093 Binary files /dev/null and b/packages/shared-metrics/addons/darwin/arm64/147/gcstats.js.tar.gz differ diff --git a/packages/shared-metrics/addons/darwin/x64/147/event-loop-stats.tar.gz b/packages/shared-metrics/addons/darwin/x64/147/event-loop-stats.tar.gz new file mode 100644 index 0000000000..000ebd09a0 Binary files /dev/null and b/packages/shared-metrics/addons/darwin/x64/147/event-loop-stats.tar.gz differ diff --git a/packages/shared-metrics/addons/darwin/x64/147/gcstats.js.tar.gz b/packages/shared-metrics/addons/darwin/x64/147/gcstats.js.tar.gz new file mode 100644 index 0000000000..24a1042bf8 Binary files /dev/null and b/packages/shared-metrics/addons/darwin/x64/147/gcstats.js.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/arm64/glibc/147/event-loop-stats.tar.gz b/packages/shared-metrics/addons/linux/arm64/glibc/147/event-loop-stats.tar.gz new file mode 100644 index 0000000000..8b1f4b4964 Binary files /dev/null and b/packages/shared-metrics/addons/linux/arm64/glibc/147/event-loop-stats.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/arm64/glibc/147/gcstats.js.tar.gz b/packages/shared-metrics/addons/linux/arm64/glibc/147/gcstats.js.tar.gz new file mode 100644 index 0000000000..dbe30f01ff Binary files /dev/null and b/packages/shared-metrics/addons/linux/arm64/glibc/147/gcstats.js.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/arm64/musl/147/event-loop-stats.tar.gz b/packages/shared-metrics/addons/linux/arm64/musl/147/event-loop-stats.tar.gz new file mode 100644 index 0000000000..0986e14286 Binary files /dev/null and b/packages/shared-metrics/addons/linux/arm64/musl/147/event-loop-stats.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/arm64/musl/147/gcstats.js.tar.gz b/packages/shared-metrics/addons/linux/arm64/musl/147/gcstats.js.tar.gz new file mode 100644 index 0000000000..1118f1e786 Binary files /dev/null and b/packages/shared-metrics/addons/linux/arm64/musl/147/gcstats.js.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/s390x/glibc/147/event-loop-stats.tar.gz b/packages/shared-metrics/addons/linux/s390x/glibc/147/event-loop-stats.tar.gz new file mode 100644 index 0000000000..767aa7d3cb Binary files /dev/null and b/packages/shared-metrics/addons/linux/s390x/glibc/147/event-loop-stats.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/s390x/glibc/147/gcstats.js.tar.gz b/packages/shared-metrics/addons/linux/s390x/glibc/147/gcstats.js.tar.gz new file mode 100644 index 0000000000..7c8acca302 Binary files /dev/null and b/packages/shared-metrics/addons/linux/s390x/glibc/147/gcstats.js.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/x64/glibc/147/event-loop-stats.tar.gz b/packages/shared-metrics/addons/linux/x64/glibc/147/event-loop-stats.tar.gz new file mode 100644 index 0000000000..cab76e43b5 Binary files /dev/null and b/packages/shared-metrics/addons/linux/x64/glibc/147/event-loop-stats.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/x64/glibc/147/gcstats.js.tar.gz b/packages/shared-metrics/addons/linux/x64/glibc/147/gcstats.js.tar.gz new file mode 100644 index 0000000000..0786b86cce Binary files /dev/null and b/packages/shared-metrics/addons/linux/x64/glibc/147/gcstats.js.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/x64/musl/147/event-loop-stats.tar.gz b/packages/shared-metrics/addons/linux/x64/musl/147/event-loop-stats.tar.gz new file mode 100644 index 0000000000..3445b25dd7 Binary files /dev/null and b/packages/shared-metrics/addons/linux/x64/musl/147/event-loop-stats.tar.gz differ diff --git a/packages/shared-metrics/addons/linux/x64/musl/147/gcstats.js.tar.gz b/packages/shared-metrics/addons/linux/x64/musl/147/gcstats.js.tar.gz new file mode 100644 index 0000000000..789770040e Binary files /dev/null and b/packages/shared-metrics/addons/linux/x64/musl/147/gcstats.js.tar.gz differ