Remove code targeting unsupported Node.js versions

Author: BridgeAR

benchmark/sirun/plugin-graphql/index.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const semver = require('semver')
-
 // TODO: benchmark the tracer as well but for now it's just too slow
 if (Number(process.env.WITH_TRACER)) {
   const tracer = require('../../..').init()
@@ -16,9 +14,7 @@ if (Number(process.env.WITH_TRACER)) {
 }
 
 if (Number(process.env.WITH_ASYNC_HOOKS)) {
-  const hook = semver.satisfies(process.versions.node, '>=14.5')
-    ? { init () {} }
-    : { init () {}, before () {}, after () {}, destroy () {} }
+  const hook = { init () {} }
 
   require('async_hooks').createHook(hook).enable()
 }

integration-tests/init.spec.js

@@ -168,27 +168,20 @@ describe('init.js', () => {
   testRuntimeVersionChecks('require', 'init.js')
 })
 
-// ESM is not supportable prior to Node.js 12.17.0, 14.13.1 on the 14.x line,
-// or on 18.0.0 in particular.
-if (
-  semver.satisfies(process.versions.node, '>=12.17.0') &&
-  semver.satisfies(process.versions.node, '>=14.13.1')
-) {
-  describe('initialize.mjs', () => {
-    setShouldKill(false)
-    useSandbox()
-    stubTracerIfNeeded()
-
-    context('as --loader', () => {
-      testInjectionScenarios('loader', 'initialize.mjs',
-        process.versions.node !== '18.0.0')
+describe('initialize.mjs', () => {
+  setShouldKill(false)
+  useSandbox()
+  stubTracerIfNeeded()
+
+  context('as --loader', () => {
+    testInjectionScenarios('loader', 'initialize.mjs',
+      process.versions.node !== '18.0.0')
+    testRuntimeVersionChecks('loader', 'initialize.mjs')
+  })
+  if (semver.satisfies(process.versions.node, '>=20.6.0')) {
+    context('as --import', () => {
+      testInjectionScenarios('import', 'initialize.mjs', true)
       testRuntimeVersionChecks('loader', 'initialize.mjs')
     })
-    if (semver.satisfies(process.versions.node, '>=20.6.0')) {
-      context('as --import', () => {
-        testInjectionScenarios('import', 'initialize.mjs', true)
-        testRuntimeVersionChecks('loader', 'initialize.mjs')
-      })
-    }
-  })
-}
+  }
+})

integration-tests/opentelemetry.spec.js

@@ -4,7 +4,6 @@ const { FakeAgent, createSandbox } = require('./helpers')
 const { fork } = require('child_process')
 const { join } = require('path')
 const { assert } = require('chai')
-const { satisfies } = require('semver')
 const axios = require('axios')
 
 function check (agent, proc, timeout, onMessage = () => { }, isMetrics) {
@@ -61,13 +60,11 @@ describe('opentelemetry', () => {
       '@opentelemetry/instrumentation',
       '@opentelemetry/instrumentation-http',
       '@opentelemetry/instrumentation-express@0.47.1',
-      'express@4' // TODO: Remove pinning once our tests support Express v5
-    ]
-    if (satisfies(process.version.slice(1), '>=14')) {
-      dependencies.push('@opentelemetry/sdk-node')
+      'express@4', // TODO: Remove pinning once our tests support Express v5
+      '@opentelemetry/sdk-node',
       // Needed because sdk-node doesn't start a tracer without an exporter
-      dependencies.push('@opentelemetry/exporter-jaeger')
-    }
+      '@opentelemetry/exporter-jaeger'
+    ]
     sandbox = await createSandbox(dependencies)
     cwd = sandbox.folder
     agent = await new FakeAgent().start()
@@ -453,26 +450,24 @@ describe('opentelemetry', () => {
     })
   })
 
-  if (satisfies(process.version.slice(1), '>=14')) {
-    it('should auto-instrument @opentelemetry/sdk-node', async () => {
-      proc = fork(join(cwd, 'opentelemetry/env-var.js'), {
-        cwd,
-        env: {
-          DD_TRACE_AGENT_PORT: agent.port
-        }
-      })
-      return check(agent, proc, timeout, ({ payload }) => {
-        // Should have a single trace with a single span
-        assert.strictEqual(payload.length, 1)
-        const [trace] = payload
-        assert.strictEqual(trace.length, 1)
-        const [span] = trace
-
-        // Should be the expected otel span
-        assert.strictEqual(span.name, 'otel-sub')
-      })
+  it('should auto-instrument @opentelemetry/sdk-node', async () => {
+    proc = fork(join(cwd, 'opentelemetry/env-var.js'), {
+      cwd,
+      env: {
+        DD_TRACE_AGENT_PORT: agent.port
+      }
     })
-  }
+    return check(agent, proc, timeout, ({ payload }) => {
+      // Should have a single trace with a single span
+      assert.strictEqual(payload.length, 1)
+      const [trace] = payload
+      assert.strictEqual(trace.length, 1)
+      const [span] = trace
+
+      // Should be the expected otel span
+      assert.strictEqual(span.name, 'otel-sub')
+    })
+  })
 })
 
 function isChildOf (childSpan, parentSpan) {

packages/datadog-instrumentations/src/grpc/client.js

@@ -4,8 +4,6 @@ const types = require('./types')
 const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 
-const nodeMajor = parseInt(process.versions.node.split('.')[0])
-
 const patched = new WeakSet()
 const instances = new WeakMap()
 
@@ -245,16 +243,6 @@ function patch (hasPeer = false) {
   }
 }
 
-if (nodeMajor <= 14) {
-  addHook({ name: 'grpc', versions: ['>=1.24.3'] }, patch(true))
-
-  addHook({ name: 'grpc', versions: ['>=1.24.3'], file: 'src/client.js' }, client => {
-    shimmer.wrap(client, 'makeClientConstructor', createWrapMakeClientConstructor(true))
-
-    return client
-  })
-}
-
 addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3 <1.1.4'] }, patch(false))
 
 addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3 <1.1.4'], file: 'build/src/make-client.js' }, client => {

packages/datadog-instrumentations/src/grpc/server.js

@@ -4,8 +4,6 @@ const types = require('./types')
 const { channel, addHook } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 
-const nodeMajor = parseInt(process.versions.node.split('.')[0])
-
 const startChannel = channel('apm:grpc:server:request:start')
 const asyncStartChannel = channel('apm:grpc:server:request:asyncStart')
 const errorChannel = channel('apm:grpc:server:request:error')
@@ -152,14 +150,6 @@ function isEmitter (obj) {
   return typeof obj.emit === 'function' && typeof obj.once === 'function'
 }
 
-if (nodeMajor <= 14) {
-  addHook({ name: 'grpc', versions: ['>=1.24.3'], file: 'src/server.js' }, server => {
-    shimmer.wrap(server.Server.prototype, 'register', wrapRegister)
-
-    return server
-  })
-}
-
 addHook({ name: '@grpc/grpc-js', versions: ['>=1.0.3'], file: 'build/src/server.js' }, server => {
   shimmer.wrap(server.Server.prototype, 'register', wrapRegister)
 

packages/datadog-instrumentations/src/helpers/hooks.js

@@ -103,7 +103,6 @@ module.exports = {
   nyc: () => require('../nyc'),
   oracledb: () => require('../oracledb'),
   openai: { esmFirst: true, fn: () => require('../openai') },
-  paperplane: () => require('../paperplane'),
   passport: () => require('../passport'),
   'passport-http': () => require('../passport-http'),
   'passport-local': () => require('../passport-local'),

packages/datadog-instrumentations/src/helpers/instrument.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const dc = require('dc-polyfill')
-const satisfies = require('semifies')
 const instrumentations = require('./instrumentations')
 const { AsyncResource } = require('async_hooks')
 
@@ -34,43 +33,4 @@ exports.addHook = function addHook ({ name, versions, file, filePattern }, hook)
   }
 }
 
-// AsyncResource.bind exists and binds `this` properly only from 17.8.0 and up.
-// https://nodejs.org/api/async_context.html#asyncresourcebindfn-thisarg
-if (satisfies(process.versions.node, '>=17.8.0')) {
-  exports.AsyncResource = AsyncResource
-} else {
-  exports.AsyncResource = class extends AsyncResource {
-    static bind (fn, type, thisArg) {
-      type = type || fn.name
-      return (new exports.AsyncResource(type || 'bound-anonymous-fn')).bind(fn, thisArg)
-    }
-
-    bind (fn, thisArg) {
-      let bound
-      if (thisArg === undefined) {
-        const resource = this
-        bound = function (...args) {
-          args.unshift(fn, this)
-          return Reflect.apply(resource.runInAsyncScope, resource, args)
-        }
-      } else {
-        bound = this.runInAsyncScope.bind(this, fn, thisArg)
-      }
-      Object.defineProperties(bound, {
-        length: {
-          configurable: true,
-          enumerable: false,
-          value: fn.length,
-          writable: false
-        },
-        asyncResource: {
-          configurable: true,
-          enumerable: true,
-          value: this,
-          writable: true
-        }
-      })
-      return bound
-    }
-  }
-}
+exports.AsyncResource = AsyncResource

packages/datadog-instrumentations/src/paperplane.js

@@ -3,7 +3,6 @@
 const { promisify } = require('util')
 const agent = require('../../dd-trace/test/plugins/agent')
 const dc = require('dc-polyfill')
-const { NODE_MAJOR } = require('../../../version')
 
 describe('child process', () => {
   const modules = ['child_process', 'node:child_process']
@@ -494,32 +493,28 @@ describe('child process', () => {
                   }
                 })
 
-                if (methodName !== 'execFileSync' || NODE_MAJOR > 16) {
-                  // when a process return an invalid code, in node <=16, in execFileSync with shell:true
-                  // an exception is not thrown
-                  it('should execute error callback with `exit 1` command with shell: true', () => {
-                    let childError
-                    try {
-                      childProcess[methodName]('node -e "process.exit(1)"', { shell: true })
-                    } catch (error) {
-                      childError = error
-                    } finally {
-                      const expectedContext = {
-                        command: 'node -e "process.exit(1)"',
-                        file: 'node -e "process.exit(1)"',
-                        shell: true
-                      }
-                      expect(start).to.have.been.calledOnceWith({
-                        ...expectedContext,
-                        abortController: sinon.match.instanceOf(AbortController)
-                      })
-                      expect(finish).to.have.been.calledOnceWith({
-                        ...expectedContext,
-                        error: childError
-                      })
+                it('should execute error callback with `exit 1` command with shell: true', () => {
+                  let childError
+                  try {
+                    childProcess[methodName]('node -e "process.exit(1)"', { shell: true })
+                  } catch (error) {
+                    childError = error
+                  } finally {
+                    const expectedContext = {
+                      command: 'node -e "process.exit(1)"',
+                      file: 'node -e "process.exit(1)"',
+                      shell: true
                     }
-                  })
-                }
+                    expect(start).to.have.been.calledOnceWith({
+                      ...expectedContext,
+                      abortController: sinon.match.instanceOf(AbortController)
+                    })
+                    expect(finish).to.have.been.calledOnceWith({
+                      ...expectedContext,
+                      error: childError
+                    })
+                  }
+                })
               }
             })
           })