Skip to content

Commit 075e2c6

Browse files
committed
Revert "use no async context frame option for now (#5706)"
This reverts commit f4ee844.
1 parent 5ff2c69 commit 075e2c6

File tree

2 files changed

+0
-35
lines changed

2 files changed

+0
-35
lines changed

.github/workflows/debugger.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
- uses: ./.github/actions/install
2727
- run: yarn test:debugger:ci
2828
- run: yarn test:integration:debugger
29-
env:
30-
OPTIONS_OVERRIDE: 1
3129
- if: always()
3230
uses: ./.github/actions/testagent/logs
3331
with:

packages/dd-trace/test/setup/core.js

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const chai = require('chai')
55
const sinonChai = require('sinon-chai')
66
const { setTimeout } = require('timers/promises')
77
const proxyquire = require('../proxyquire')
8-
const { NODE_MAJOR } = require('../../../../version')
98

109
{
1110
// get-port can often return a port that is already in use, thanks to a race
@@ -53,35 +52,3 @@ if (/^v\d+\.x$/.test(process.env.GITHUB_BASE_REF || '')) {
5352
process.env.DD_INJECTION_ENABLED = 'true'
5453
process.env.DD_INJECT_FORCE = 'true'
5554
}
56-
57-
// TODO(bengl): remove this block once we can properly support Node.js 24 without it
58-
if (NODE_MAJOR >= 24 && !process.env.OPTIONS_OVERRIDE) {
59-
const childProcess = require('child_process')
60-
const { exec, fork } = childProcess
61-
62-
childProcess.exec = function (...args) {
63-
const opts = args[1]
64-
if (opts) {
65-
if (opts?.env?.NODE_OPTIONS && !opts.env.NODE_OPTIONS.includes('--no-async-context-frame')) {
66-
opts.env.NODE_OPTIONS += ' --no-async-context-frame'
67-
} else {
68-
opts.env ||= {}
69-
opts.env.NODE_OPTIONS = '--no-async-context-frame'
70-
}
71-
}
72-
return exec.apply(this, args)
73-
}
74-
75-
childProcess.fork = function (...args) {
76-
const opts = args[1]
77-
if (opts) {
78-
if (opts?.env?.NODE_OPTIONS && !opts.env.NODE_OPTIONS.includes('--no-async-context-frame')) {
79-
opts.env.NODE_OPTIONS += ' --no-async-context-frame'
80-
} else {
81-
opts.env ||= {}
82-
opts.env.NODE_OPTIONS = '--no-async-context-frame'
83-
}
84-
}
85-
return fork.apply(this, args)
86-
}
87-
}

0 commit comments

Comments
 (0)