From 13bdc58535c66ccd0b94556d150aa6abbd96b3c6 Mon Sep 17 00:00:00 2001 From: rochdev Date: Mon, 29 Sep 2025 17:49:22 -0400 Subject: [PATCH 1/2] add support for test version dependency resolutions --- packages/dd-trace/test/plugins/versions/index.js | 7 +++++-- packages/dd-trace/test/plugins/versions/package.json | 3 +++ scripts/install_plugin_modules.js | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/dd-trace/test/plugins/versions/index.js b/packages/dd-trace/test/plugins/versions/index.js index 5a249c76ed2..b1674623ec0 100644 --- a/packages/dd-trace/test/plugins/versions/index.js +++ b/packages/dd-trace/test/plugins/versions/index.js @@ -1,7 +1,9 @@ 'use strict' const { subset } = require('semver') -const latests = require('./package.json').dependencies +const pkg = require('./package.json') +const latests = pkg.dependencies +const resolutions = pkg.resolutions const exactVersionExp = /^=?\d+\.\d+\.\d+/ @@ -41,5 +43,6 @@ function capSubrange (name, subrange) { } module.exports = { - getCappedRange + getCappedRange, + resolutions } diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json index 46364e2abe4..3b90d2069a8 100644 --- a/packages/dd-trace/test/plugins/versions/package.json +++ b/packages/dd-trace/test/plugins/versions/package.json @@ -3,6 +3,9 @@ "version": "1.0.0", "license": "BSD-3-Clause", "private": true, + "resolutions": { + "is-generator-function": "1.1.0" + }, "dependencies": { "@ai-sdk/openai": "2.0.34", "@openai/agents": "0.1.4", diff --git a/scripts/install_plugin_modules.js b/scripts/install_plugin_modules.js index 5d15f007fa6..1e5b25b12cc 100644 --- a/scripts/install_plugin_modules.js +++ b/scripts/install_plugin_modules.js @@ -8,7 +8,7 @@ const semver = require('semver') const exec = require('./helpers/exec') const externals = require('../packages/dd-trace/test/plugins/externals.json') const { getInstrumentation } = require('../packages/dd-trace/test/setup/helpers/load-inst') -const { getCappedRange } = require('../packages/dd-trace/test/plugins/versions') +const { getCappedRange, resolutions } = require('../packages/dd-trace/test/plugins/versions') const requirePackageJsonPath = require.resolve('../packages/dd-trace/src/require-package-json') @@ -218,6 +218,7 @@ async function assertWorkspaces () { version: '1.0.0', license: 'BSD-3-Clause', private: true, + resolutions: resolutions || {}, workspaces: { packages: Array.from(workspaces) } From d8fe7d02ad5b3c1d889974257523da3484a01520 Mon Sep 17 00:00:00 2001 From: rochdev Date: Tue, 30 Sep 2025 19:31:34 -0400 Subject: [PATCH 2/2] remove no longer needed resolution --- packages/dd-trace/test/plugins/versions/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json index 3b90d2069a8..46364e2abe4 100644 --- a/packages/dd-trace/test/plugins/versions/package.json +++ b/packages/dd-trace/test/plugins/versions/package.json @@ -3,9 +3,6 @@ "version": "1.0.0", "license": "BSD-3-Clause", "private": true, - "resolutions": { - "is-generator-function": "1.1.0" - }, "dependencies": { "@ai-sdk/openai": "2.0.34", "@openai/agents": "0.1.4",