Skip to content

Commit 195f0ce

Browse files
authored
ci: cap supported next version to be <15.4.1 (#6094)
The latest version of next, which was just released, breaks our CI. Until a proper fix can be implemented, cap the supported range to <15.4.1
1 parent 551f314 commit 195f0ce

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.github/workflows/apm-integrations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ jobs:
754754
version:
755755
- 18
756756
- latest
757-
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']
757+
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']
758758
include:
759759
- range: '>=10.2.0 <11'
760760
range_clean: gte.10.2.0.and.lt.11
@@ -770,7 +770,7 @@ jobs:
770770
range_clean: gte.14.0.0.and.lte.14.2.6
771771
- range: '>=14.2.7 <15'
772772
range_clean: gte.14.2.7.and.lt.15
773-
- range: '>=15.0.0'
773+
- range: '>=15.0.0 <15.4.1'
774774
range_clean: gte.15.0.0
775775
runs-on: ubuntu-latest
776776
env:

.github/workflows/appsec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ jobs:
216216
version:
217217
- oldest
218218
- latest
219-
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']
219+
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']
220220
include:
221221
- range: '>=10.2.0 <11'
222222
range_clean: gte.10.2.0.and.lt.11
@@ -232,7 +232,7 @@ jobs:
232232
range_clean: gte.14.0.0.and.lte.14.2.6
233233
- range: '>=14.2.7 <15'
234234
range_clean: gte.14.2.7.and.lt.15
235-
- range: '>=15.0.0'
235+
- range: '>=15.0.0 <15.4.1'
236236
range_clean: gte.15.0.0
237237
runs-on: ubuntu-latest
238238
env:

packages/datadog-instrumentations/src/next.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ function finish (ctx, result, err) {
197197
// however, it is not provided as a class function or exported property
198198
addHook({
199199
name: 'next',
200-
versions: ['>=13.3.0'],
200+
versions: ['>=13.3.0 <15.4.1'],
201201
file: 'dist/server/web/spec-extension/adapters/next-request.js'
202202
}, NextRequestAdapter => {
203203
shimmer.wrap(NextRequestAdapter.NextRequestAdapter, 'fromNodeNextRequest', fromNodeNextRequest => {
@@ -212,7 +212,7 @@ addHook({
212212

213213
addHook({
214214
name: 'next',
215-
versions: ['>=11.1'],
215+
versions: ['>=11.1 <15.4.1'],
216216
file: 'dist/server/serve-static.js'
217217
}, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true }))
218218

@@ -222,7 +222,7 @@ addHook({
222222
file: 'dist/next-server/server/serve-static.js'
223223
}, serveStatic => shimmer.wrap(serveStatic, 'serveStatic', wrapServeStatic, { replaceGetter: true }))
224224

225-
addHook({ name: 'next', versions: ['>=11.1'], file: 'dist/server/next-server.js' }, nextServer => {
225+
addHook({ name: 'next', versions: ['>=11.1 <15.4.1'], file: 'dist/server/next-server.js' }, nextServer => {
226226
const Server = nextServer.default
227227

228228
shimmer.wrap(Server.prototype, 'handleRequest', wrapHandleRequest)
@@ -239,7 +239,7 @@ addHook({ name: 'next', versions: ['>=11.1'], file: 'dist/server/next-server.js'
239239
})
240240

241241
// `handleApiRequest` changes parameters/implementation at 13.2.0
242-
addHook({ name: 'next', versions: ['>=13.2'], file: 'dist/server/next-server.js' }, nextServer => {
242+
addHook({ name: 'next', versions: ['>=13.2 <15.4.1'], file: 'dist/server/next-server.js' }, nextServer => {
243243
const Server = nextServer.default
244244
shimmer.wrap(Server.prototype, 'handleApiRequest', wrapHandleApiRequestWithMatch)
245245
return nextServer
@@ -277,7 +277,7 @@ addHook({
277277

278278
addHook({
279279
name: 'next',
280-
versions: ['>=13'],
280+
versions: ['>=13 <15.4.1'],
281281
file: 'dist/server/web/spec-extension/request.js'
282282
}, request => {
283283
shimmer.wrap(request.NextRequest.prototype, 'nextUrl', function (originalGet) {

packages/datadog-plugin-next/test/index.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ describe('Plugin', function () {
1919
const satisfiesStandalone = version => satisfies(version, '>=12.0.0')
2020

2121
// TODO: Figure out why 10.x tests are failing.
22-
withVersions('next', 'next', '>=11.1', version => {
22+
withVersions('next', 'next', '>=11.1 <15.4.1', version => {
2323
const pkg = require(`../../../versions/next@${version}/node_modules/next/package.json`)
2424

2525
const startServer = ({ withConfig, standalone }, schemaVersion = 'v0', defaultToGlobalService = false) => {

packages/datadog-plugin-next/test/integration-test/client.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('esm', () => {
1616
let proc
1717
let sandbox
1818
// match versions tested with unit tests
19-
withVersions('next', 'next', '>=11.1', version => {
19+
withVersions('next', 'next', '>=11.1 <15.4.1', version => {
2020
before(async function () {
2121
// next builds slower in the CI, match timeout with unit tests
2222
this.timeout(300 * 1000)

packages/dd-trace/test/appsec/index.next.plugin.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('test suite', () => {
1616

1717
const satisfiesStandalone = version => satisfies(version, '>=12.0.0')
1818

19-
withVersions('next', 'next', '>=11.1', version => {
19+
withVersions('next', 'next', '>=11.1 <15.4.1', version => {
2020
if (version === '>=11.0.0 <13' && NODE_MAJOR === 24 &&
2121
NODE_MINOR === 0 && NODE_PATCH === 0) {
2222
return // node 24.0.0 fails, but 24.0.1 works

0 commit comments

Comments
 (0)