get rid of --no-async-context-frame (#5726)

Co-authored-by: Thomas Hunter II <[email protected]>

Author: 2 people

.github/workflows/apm-integrations.yml

@@ -166,8 +166,6 @@ jobs:
       - run: yarn test:plugins:ci
       - uses: ./.github/actions/node/latest
       - run: yarn test:plugins:ci
-        env:
-          OPTIONS_OVERRIDE: 1
       - uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
 
   confluentinc-kafka-javascript:

.github/workflows/debugger.yml

@@ -29,8 +29,6 @@ jobs:
       - uses: ./.github/actions/install
       - run: yarn test:debugger:ci
       - run: yarn test:integration:debugger
-        env:
-          OPTIONS_OVERRIDE: 1
       - if: always()
         uses: ./.github/actions/testagent/logs
         with:

.github/workflows/serverless.yml

@@ -38,11 +38,7 @@ jobs:
   aws-sdk:
     strategy:
       matrix:
-        include:
-          - node-version: latest
-            node-opts: --no-async-context-frame
-          - node-version: oldest
-            node-opts: ''
+        node-version: [oldest, latest]
     runs-on: ubuntu-latest
     services:
       localstack:
@@ -86,8 +82,6 @@ jobs:
           version: ${{ matrix.node-version }}
       - uses: ./.github/actions/install
       - run: yarn test:plugins:ci
-        env:
-          NODE_OPTIONS: ${{ matrix.node-opts }}
       - if: always()
         uses: ./.github/actions/testagent/logs
         with:

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

@@ -4,7 +4,6 @@ const sinon = require('sinon')
 const chai = require('chai')
 const sinonChai = require('sinon-chai')
 const proxyquire = require('../proxyquire')
-const { NODE_MAJOR } = require('../../../../version')
 
 chai.use(sinonChai)
 chai.use(require('../asserts/profile'))
@@ -26,29 +25,3 @@ if (/^v\d+\.x$/.test(process.env.GITHUB_BASE_REF || '')) {
   process.env.DD_INJECTION_ENABLED = 'true'
   process.env.DD_INJECT_FORCE = 'true'
 }
-
-// TODO(bengl): remove this block once we can properly support Node.js 24 without it
-if (NODE_MAJOR >= 24 && !process.env.OPTIONS_OVERRIDE) {
-  const childProcess = require('child_process')
-  const { exec, fork } = childProcess
-
-  function addAsyncContextFrame (fn, thisArg, args) {
-    const opts = args[1]
-    if (opts) {
-      const env = opts.env ||= {}
-      env.NODE_OPTIONS ||= ''
-      if (!env.NODE_OPTIONS.includes('--no-async-context-frame')) {
-        env.NODE_OPTIONS += ' --no-async-context-frame'
-      }
-    }
-    return fn.apply(thisArg, args)
-  }
-
-  childProcess.exec = function () {
-    return addAsyncContextFrame(exec, this, arguments)
-  }
-
-  childProcess.fork = function () {
-    return addAsyncContextFrame(fork, this, arguments)
-  }
-}