From 07a25012262b80ac90ed05f129af89ccc161a99f Mon Sep 17 00:00:00 2001 From: Sam Brenner Date: Tue, 7 Apr 2026 09:30:25 -0400 Subject: [PATCH 1/6] upgrade ts --- package.json | 2 +- packages/dd-trace/test/plugins/versions/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 1bd4a579b65..5f5e8ba224a 100644 --- a/package.json +++ b/package.json @@ -200,7 +200,7 @@ "semver": "^7.7.2", "sinon": "^21.0.3", "tiktoken": "^1.0.21", - "typescript": "^5.9.2", + "typescript": "^6.0.2", "workerpool": "^10.0.0", "yaml": "^2.8.3", "yarn-deduplicate": "^6.0.2" diff --git a/packages/dd-trace/test/plugins/versions/package.json b/packages/dd-trace/test/plugins/versions/package.json index 54e9c7903dc..9ff2c1ecbcc 100644 --- a/packages/dd-trace/test/plugins/versions/package.json +++ b/packages/dd-trace/test/plugins/versions/package.json @@ -200,7 +200,7 @@ "stripe": "20.1.0", "tedious": "19.2.0", "tinypool": "2.1.0", - "typescript": "5.9.3", + "typescript": "6.0.2", "undici": "7.18.2", "vitest": "4.1.0", "when": "3.7.8", diff --git a/yarn.lock b/yarn.lock index dffd2578b74..c2a55e54440 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4377,10 +4377,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@^5.9.2: - version "5.9.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" - integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== +typescript@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.2.tgz#0b1bfb15f68c64b97032f3d78abbf98bdbba501f" + integrity sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ== unbox-primitive@^1.1.0: version "1.1.0" From 8dfdb858872ac1fb4989216c9e3bd26b177bcf39 Mon Sep 17 00:00:00 2001 From: Sam Brenner Date: Tue, 7 Apr 2026 09:30:32 -0400 Subject: [PATCH 2/6] fix llmobs tests --- packages/dd-trace/test/llmobs/sdk/typescript/index.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/dd-trace/test/llmobs/sdk/typescript/index.spec.js b/packages/dd-trace/test/llmobs/sdk/typescript/index.spec.js index e54d5839f5b..b0445b00b77 100644 --- a/packages/dd-trace/test/llmobs/sdk/typescript/index.spec.js +++ b/packages/dd-trace/test/llmobs/sdk/typescript/index.spec.js @@ -27,6 +27,7 @@ const testVersions = [ '^3', '^4', '^5', + '^6', ] const testCases = [ @@ -100,7 +101,7 @@ describe('typescript', () => { // compile typescript execSync( - `tsc --target ES6 --experimentalDecorators --module commonjs --sourceMap ${file}.ts`, + `tsc --target ES6 --experimentalDecorators --module commonjs --sourceMap --types node ${file}.ts`, { cwd, stdio: 'inherit' } ) From 02da4f5277efe5eaf31cb7369c3679ff78ab0468 Mon Sep 17 00:00:00 2001 From: Sam Brenner Date: Tue, 7 Apr 2026 14:30:52 -0400 Subject: [PATCH 3/6] try changing prisma esm test module resolution --- packages/datadog-plugin-prisma/test/index.spec.js | 2 +- .../datadog-plugin-prisma/test/integration-test/client.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/datadog-plugin-prisma/test/index.spec.js b/packages/datadog-plugin-prisma/test/index.spec.js index 6cd6ec503fc..6a8305ce359 100644 --- a/packages/datadog-plugin-prisma/test/index.spec.js +++ b/packages/datadog-plugin-prisma/test/index.spec.js @@ -33,7 +33,7 @@ function execPrismaGenerate (config, cwd) { '--target esnext', '--module commonjs', '--allowJs true', - '--moduleResolution node', + '--moduleResolution node16', ].join(' '), ].join(' && '), { cwd, diff --git a/packages/datadog-plugin-prisma/test/integration-test/client.spec.js b/packages/datadog-plugin-prisma/test/integration-test/client.spec.js index 063ab2bd6b2..dac12709316 100644 --- a/packages/datadog-plugin-prisma/test/integration-test/client.spec.js +++ b/packages/datadog-plugin-prisma/test/integration-test/client.spec.js @@ -272,7 +272,7 @@ describe('esm', () => { ' --target ES2023' + ' --module ESNext' + ' --strict true' + - ' --moduleResolution node' + + ' --moduleResolution node16' + ' --esModuleInterop true' ) } From 33c97886c05e71707ad9385d9bacb23e023fe627 Mon Sep 17 00:00:00 2001 From: Sam Brenner Date: Tue, 7 Apr 2026 14:36:09 -0400 Subject: [PATCH 4/6] try different prisma esm test module resolution flag --- packages/datadog-plugin-prisma/test/index.spec.js | 2 +- .../datadog-plugin-prisma/test/integration-test/client.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/datadog-plugin-prisma/test/index.spec.js b/packages/datadog-plugin-prisma/test/index.spec.js index 6a8305ce359..042855b8fcf 100644 --- a/packages/datadog-plugin-prisma/test/index.spec.js +++ b/packages/datadog-plugin-prisma/test/index.spec.js @@ -33,7 +33,7 @@ function execPrismaGenerate (config, cwd) { '--target esnext', '--module commonjs', '--allowJs true', - '--moduleResolution node16', + '--moduleResolution bundler', ].join(' '), ].join(' && '), { cwd, diff --git a/packages/datadog-plugin-prisma/test/integration-test/client.spec.js b/packages/datadog-plugin-prisma/test/integration-test/client.spec.js index dac12709316..953be6bb308 100644 --- a/packages/datadog-plugin-prisma/test/integration-test/client.spec.js +++ b/packages/datadog-plugin-prisma/test/integration-test/client.spec.js @@ -272,7 +272,7 @@ describe('esm', () => { ' --target ES2023' + ' --module ESNext' + ' --strict true' + - ' --moduleResolution node16' + + ' --moduleResolution bundler' + ' --esModuleInterop true' ) } From 5dc39049f68b4a29d88ccb11ebb70ba1e53e4558 Mon Sep 17 00:00:00 2001 From: Sam Brenner Date: Tue, 7 Apr 2026 14:42:27 -0400 Subject: [PATCH 5/6] update prisma esm test config --- packages/datadog-plugin-prisma/test/index.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/datadog-plugin-prisma/test/index.spec.js b/packages/datadog-plugin-prisma/test/index.spec.js index 042855b8fcf..9ea0574fce8 100644 --- a/packages/datadog-plugin-prisma/test/index.spec.js +++ b/packages/datadog-plugin-prisma/test/index.spec.js @@ -33,7 +33,8 @@ function execPrismaGenerate (config, cwd) { '--target esnext', '--module commonjs', '--allowJs true', - '--moduleResolution bundler', + '--moduleResolution node', + '--ignoreDeprecations 6.0', ].join(' '), ].join(' && '), { cwd, From cafc43919ba125f3b2f63f78ec3d8a81530c17f7 Mon Sep 17 00:00:00 2001 From: Sam Brenner Date: Tue, 7 Apr 2026 15:22:34 -0400 Subject: [PATCH 6/6] try another configuration --- packages/datadog-plugin-prisma/test/index.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/datadog-plugin-prisma/test/index.spec.js b/packages/datadog-plugin-prisma/test/index.spec.js index 9ea0574fce8..6cd6ec503fc 100644 --- a/packages/datadog-plugin-prisma/test/index.spec.js +++ b/packages/datadog-plugin-prisma/test/index.spec.js @@ -34,7 +34,6 @@ function execPrismaGenerate (config, cwd) { '--module commonjs', '--allowJs true', '--moduleResolution node', - '--ignoreDeprecations 6.0', ].join(' '), ].join(' && '), { cwd,