diff --git a/.github/workflows/apm-integrations.yml b/.github/workflows/apm-integrations.yml index d21b3e8ba3d..6c215fe75ce 100644 --- a/.github/workflows/apm-integrations.yml +++ b/.github/workflows/apm-integrations.yml @@ -754,7 +754,7 @@ jobs: version: - 18 - latest - range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0'] + range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0 <15.4.1'] include: - range: '>=10.2.0 <11' range_clean: gte.10.2.0.and.lt.11 @@ -770,7 +770,7 @@ jobs: range_clean: gte.14.0.0.and.lte.14.2.6 - range: '>=14.2.7 <15' range_clean: gte.14.2.7.and.lt.15 - - range: '>=15.0.0' + - range: '>=15.0.0 <15.4.1' range_clean: gte.15.0.0 runs-on: ubuntu-latest env: diff --git a/.github/workflows/appsec.yml b/.github/workflows/appsec.yml index ec65546f08c..4c40ebff52b 100644 --- a/.github/workflows/appsec.yml +++ b/.github/workflows/appsec.yml @@ -216,7 +216,7 @@ jobs: version: - oldest - latest - range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0'] + range: ['>=10.2.0 <11', '>=11.0.0 <13', '11.1.4', '>=13.0.0 <14', '13.2.0', '>=14.0.0 <=14.2.6', '>=14.2.7 <15', '>=15.0.0 <15.4.1'] include: - range: '>=10.2.0 <11' range_clean: gte.10.2.0.and.lt.11 @@ -232,7 +232,7 @@ jobs: range_clean: gte.14.0.0.and.lte.14.2.6 - range: '>=14.2.7 <15' range_clean: gte.14.2.7.and.lt.15 - - range: '>=15.0.0' + - range: '>=15.0.0 <15.4.1' range_clean: gte.15.0.0 runs-on: ubuntu-latest env: diff --git a/packages/datadog-instrumentations/src/next.js b/packages/datadog-instrumentations/src/next.js index 335304f4012..375e82d6524 100644 --- a/packages/datadog-instrumentations/src/next.js +++ b/packages/datadog-instrumentations/src/next.js @@ -197,7 +197,7 @@ function finish (ctx, result, err) { // however, it is not provided as a class function or exported property addHook({ name: 'next', - versions: ['>=13.3.0'], + versions: ['>=13.3.0 <15.4.1'], file: 'dist/server/web/spec-extension/adapters/next-request.js' }, NextRequestAdapter => { shimmer.wrap(NextRequestAdapter.NextRequestAdapter, 'fromNodeNextRequest', fromNodeNextRequest => { @@ -212,7 +212,7 @@ addHook({ addHook({ name: 'next', - versions: ['>=11.1'], + versions: ['>=11.1 <15.4.1'], file: 'dist/server/serve-static.js' }, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true })) @@ -222,7 +222,7 @@ addHook({ file: 'dist/next-server/server/serve-static.js' }, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true })) -addHook({ name: 'next', versions: ['>=11.1'], file: 'dist/server/next-server.js' }, nextServer => { +addHook({ name: 'next', versions: ['>=11.1 <15.4.1'], file: 'dist/server/next-server.js' }, nextServer => { const Server = nextServer.default shimmer.wrap(Server.prototype, 'handleRequest', wrapHandleRequest) @@ -239,7 +239,7 @@ addHook({ name: 'next', versions: ['>=11.1'], file: 'dist/server/next-server.js' }) // `handleApiRequest` changes parameters/implementation at 13.2.0 -addHook({ name: 'next', versions: ['>=13.2'], file: 'dist/server/next-server.js' }, nextServer => { +addHook({ name: 'next', versions: ['>=13.2 <15.4.1'], file: 'dist/server/next-server.js' }, nextServer => { const Server = nextServer.default shimmer.wrap(Server.prototype, 'handleApiRequest', wrapHandleApiRequestWithMatch) return nextServer @@ -277,7 +277,7 @@ addHook({ addHook({ name: 'next', - versions: ['>=13'], + versions: ['>=13 <15.4.1'], file: 'dist/server/web/spec-extension/request.js' }, request => { shimmer.wrap(request.NextRequest.prototype, 'nextUrl', function (originalGet) { diff --git a/packages/datadog-plugin-next/test/index.spec.js b/packages/datadog-plugin-next/test/index.spec.js index 627cbc6e2e0..32f2895f603 100644 --- a/packages/datadog-plugin-next/test/index.spec.js +++ b/packages/datadog-plugin-next/test/index.spec.js @@ -19,7 +19,7 @@ describe('Plugin', function () { const satisfiesStandalone = version => satisfies(version, '>=12.0.0') // TODO: Figure out why 10.x tests are failing. - withVersions('next', 'next', '>=11.1', version => { + withVersions('next', 'next', '>=11.1 <15.4.1', version => { const pkg = require(`../../../versions/next@${version}/node_modules/next/package.json`) const startServer = ({ withConfig, standalone }, schemaVersion = 'v0', defaultToGlobalService = false) => { diff --git a/packages/datadog-plugin-next/test/integration-test/client.spec.js b/packages/datadog-plugin-next/test/integration-test/client.spec.js index 76b114bc76c..1265e91b1f5 100644 --- a/packages/datadog-plugin-next/test/integration-test/client.spec.js +++ b/packages/datadog-plugin-next/test/integration-test/client.spec.js @@ -16,7 +16,7 @@ describe('esm', () => { let proc let sandbox // match versions tested with unit tests - withVersions('next', 'next', '>=11.1', version => { + withVersions('next', 'next', '>=11.1 <15.4.1', version => { before(async function () { // next builds slower in the CI, match timeout with unit tests this.timeout(300 * 1000) diff --git a/packages/dd-trace/test/appsec/index.next.plugin.spec.js b/packages/dd-trace/test/appsec/index.next.plugin.spec.js index 8f7fbf2a9d8..4aaa0445336 100644 --- a/packages/dd-trace/test/appsec/index.next.plugin.spec.js +++ b/packages/dd-trace/test/appsec/index.next.plugin.spec.js @@ -16,7 +16,7 @@ describe('test suite', () => { const satisfiesStandalone = version => satisfies(version, '>=12.0.0') - withVersions('next', 'next', '>=11.1', version => { + withVersions('next', 'next', '>=11.1 <15.4.1', version => { if (version === '>=11.0.0 <13' && NODE_MAJOR === 24 && NODE_MINOR === 0 && NODE_PATCH === 0) { return // node 24.0.0 fails, but 24.0.1 works