test(knex): use the @vscode/sqlite3 fork for 1.x and raise the sandbox add timeout

BridgeAR · BridgeAR · commit 733830693aae · 2026-06-22T22:24:31.000+02:00
diff --git a/integration-tests/helpers/index.js b/integration-tests/helpers/index.js
@@ -612,7 +612,9 @@ async function createSandbox (
   }
 
   if (cappedDependencies.length > 0) {
-    execHelper(`${BUN} add ${cappedDependencies.join(' ')} ${addFlags.join(' ')}`, addOptions)
+    // knex 1.x pulls in the @vscode/sqlite3 fork, which compiles from source when no prebuilt matches the runner
+    // and routinely runs past the 60s default.
+    execHelper(`${BUN} add ${cappedDependencies.join(' ')} ${addFlags.join(' ')}`, { ...addOptions, timeout: 300_000 })
   }
 
   execHelper(`${BUN} add file:${out} ${[...addFlags, '--ignore-scripts'].join(' ')}`, addOptions)
diff --git a/packages/datadog-plugin-knex/test/integration-test/client.spec.js b/packages/datadog-plugin-knex/test/integration-test/client.spec.js
@@ -1,6 +1,9 @@
 'use strict'
 
 const assert = require('node:assert/strict')
+
+const semver = require('semver')
+
 const {
   sandboxCwd,
   useSandbox,
@@ -12,11 +15,14 @@ const {
 } = require('../../../../integration-tests/helpers')
 const { withVersions } = require('../../../dd-trace/test/setup/mocha')
 
-withVersions('knex', 'knex', version => {
+withVersions('knex', 'knex', (version, _, resolvedVersion) => {
   describe('ESM', () => {
     let variants, proc, agent
 
-    useSandbox([`'knex@${version}'`, 'express', 'sqlite3'], false,
+    // knex 1.x routes the `sqlite3` client through the @vscode/sqlite3 fork; every other major uses sqlite3.
+    const sqlite3Driver = semver.satisfies(resolvedVersion, '1.x') ? '@vscode/sqlite3' : 'sqlite3'
+
+    useSandbox([`'knex@${version}'`, 'express', sqlite3Driver], false,
       ['./packages/datadog-plugin-knex/test/integration-test/*'])
 
     before(function () {

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,9 @@ async function createSandbox (`
`612`	`612`	`}`
`613`	`613`
`614`	`614`	`if (cappedDependencies.length > 0) {`
`615`		- execHelper(`${BUN} add ${cappedDependencies.join(' ')} ${addFlags.join(' ')}`, addOptions)
	`615`	`+ // knex 1.x pulls in the @vscode/sqlite3 fork, which compiles from source when no prebuilt matches the runner`
	`616`	`+ // and routinely runs past the 60s default.`
	`617`	+ execHelper(`${BUN} add ${cappedDependencies.join(' ')} ${addFlags.join(' ')}`, { ...addOptions, timeout: 300_000 })
`616`	`618`	`}`
`617`	`619`
`618`	`620`	execHelper(`${BUN} add file:${out} ${[...addFlags, '--ignore-scripts'].join(' ')}`, addOptions)