dd-trace 5.81.0 → 5.82.0

package/index.d.ts

@@ -191,6 +191,7 @@ interface Plugins {
   "azure-event-hubs": tracer.plugins.azure_event_hubs;
   "azure-functions": tracer.plugins.azure_functions;
   "azure-service-bus": tracer.plugins.azure_service_bus;
+  "bullmq": tracer.plugins.bullmq;
   "bunyan": tracer.plugins.bunyan;
   "cassandra-driver": tracer.plugins.cassandra_driver;
   "child_process": tracer.plugins.child_process;
@@ -1757,6 +1758,12 @@ declare namespace tracer {
      * [logInjection](interfaces/traceroptions.html#logInjection) option is enabled
      * on the tracer.
      */
+    /**
+     * This plugin automatically instruments the
+     * [bullmq](https://github.com/npmjs/package/bullmq) message queue library.
+     */
+    interface bullmq extends Instrumentation {}
+
     interface bunyan extends Integration {}
 
     /**

package/loader-hook.mjs

@@ -1,8 +1,9 @@
-import regexpEscapeModule from './vendor/dist/escape-string-regexp/index.js'
 import * as iitm from 'import-in-the-middle/hook.mjs'
+import regexpEscapeModule from './vendor/dist/escape-string-regexp/index.js'
 import hooks from './packages/datadog-instrumentations/src/helpers/hooks.js'
 import configHelper from './packages/dd-trace/src/config-helper.js'
 import * as rewriterLoader from './packages/datadog-instrumentations/src/helpers/rewriter/loader.mjs'
+import { isRelativeRequire } from './packages/datadog-instrumentations/src/helpers/shared-utils.js'
 
 const regexpEscape = regexpEscapeModule.default
 
@@ -28,7 +29,11 @@ function addInstrumentations (data) {
   const instrumentations = Object.keys(hooks)
 
   for (const moduleName of instrumentations) {
-    data.include.push(new RegExp(`node_modules/${moduleName}/(?!node_modules).+`), moduleName)
+    // Skip instrumentation hooks with relative module names
+    // since there is no current business need of instrumenting imports outside of the node_modules folder
+    if (!isRelativeRequire(moduleName)) {
+      data.include.push(new RegExp(`node_modules/${moduleName}/(?!node_modules).+`), moduleName)
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.81.0",
+  "version": "5.82.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -28,8 +28,8 @@
     "test:debugger": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/dd-trace/test/debugger/**/*.spec.js'",
     "test:debugger:ci": "nyc --no-clean --include 'packages/dd-trace/src/debugger/**/*.js' -- npm run test:debugger",
     "test:eslint-rules": "node eslint-rules/*.test.mjs",
-    "test:trace:core": "tap packages/dd-trace/test/*.spec.js \"packages/dd-trace/test/{ci-visibility,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote_config,service-naming,standalone,telemetry,external-logger}/**/*.spec.js\"",
-    "test:trace:core:ci": "npm run test:trace:core -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/**/*.js\"",
+    "test:trace:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 --require packages/dd-trace/test/setup/mocha.js -- \"packages/dd-trace/test/*.spec.js\" \"packages/dd-trace/test/{ci-visibility,config,datastreams,encode,exporters,opentelemetry,opentracing,plugins,remote_config,service-naming,standalone,telemetry,external-logger}/**/*.spec.js\"",
+    "test:trace:core:ci": "nyc --no-clean --include \"packages/dd-trace/src/**/*.js\" -- npm run test:trace:core",
     "test:trace:guardrails": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/guardrails/**/*.spec.js\"",
     "test:trace:guardrails:ci": "nyc --no-clean --include \"packages/dd-trace/src/guardrails/**/*.js\" -- npm run test:trace:guardrails",
     "test:esbuild": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-esbuild/test/**/*.spec.js\"",
@@ -38,8 +38,8 @@
     "test:instrumentations:ci": "yarn services && nyc --no-clean --include \"packages/datadog-instrumentations/src/@($(echo $PLUGINS)).js\" --include \"packages/datadog-instrumentations/src/@($(echo $PLUGINS))/**/*.js\" -- npm run test:instrumentations",
     "test:instrumentations:misc": "mocha -r 'packages/dd-trace/test/setup/mocha.js' 'packages/datadog-instrumentations/test/*/**/*.spec.js'",
     "test:instrumentations:misc:ci": "nyc --no-clean --include 'packages/datadog-instrumentations/src/**/*.js' -- npm run test:instrumentations:misc",
-    "test:core": "tap \"packages/datadog-core/test/**/*.spec.js\"",
-    "test:core:ci": "npm run test:core -- --coverage --nyc-arg=--include=\"packages/datadog-core/src/**/*.js\"",
+    "test:core": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 -- \"packages/datadog-core/test/**/*.spec.js\"",
+    "test:core:ci": "nyc --no-clean --include \"packages/datadog-core/src/**/*.js\" -- npm run test:core",
     "test:lambda": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/lambda/**/*.spec.js\"",
     "test:lambda:ci": "nyc --no-clean --include \"packages/dd-trace/src/lambda/**/*.js\" -- npm run test:lambda",
     "test:llmobs:sdk": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" --exclude \"packages/dd-trace/test/llmobs/plugins/**/*.spec.js\" \"packages/dd-trace/test/llmobs/**/*.spec.js\" ",
@@ -48,12 +48,12 @@
     "test:llmobs:plugins:ci": "yarn services && nyc --no-clean --include \"packages/dd-trace/src/llmobs/**/*.js\" -- npm run test:llmobs:plugins",
     "test:openfeature": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/dd-trace/test/openfeature/*.spec.js\"",
     "test:openfeature:ci": "nyc --no-clean --include \"packages/dd-trace/src/openfeature/**/*.js\" -- npm run test:openfeature",
-    "test:plugins": "mocha -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/@($(echo ${SPEC:-'*'})).spec.js\"",
+    "test:plugins": "mocha --expose-gc -r \"packages/dd-trace/test/setup/mocha.js\" \"packages/datadog-plugin-@($(echo $PLUGINS))/test/**/@($(echo ${SPEC:-'*'}))*.spec.js\"",
     "test:plugins:ci": "yarn services && nyc --no-clean --include \"packages/datadog-plugin-@($(echo $PLUGINS))/src/**/*.js\" -- npm run test:plugins",
     "test:plugins:ci:flaky": "yarn services && nyc --no-clean --include \"packages/datadog-plugin-@($(echo $PLUGINS))/src/**/*.js\" -- npm run test:plugins -- --bail --retries 2",
     "test:plugins:upstream": "node ./packages/dd-trace/test/plugins/suite.js",
-    "test:profiler": "tap \"packages/dd-trace/test/profiling/**/*.spec.js\"",
-    "test:profiler:ci": "npm run test:profiler -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/profiling/**/*.js\"",
+    "test:profiler": "node scripts/mocha-parallel-files.js --expose-gc --timeout 30000 --require packages/dd-trace/test/setup/mocha.js -- \"packages/dd-trace/test/profiling/**/*.spec.js\"",
+    "test:profiler:ci": "nyc --no-clean --include \"packages/dd-trace/src/profiling/**/*.js\" -- npm run test:profiler",
     "test:integration": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/*.spec.js\"",
     "test:integration:aiguard": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/aiguard/*.spec.js\"",
     "test:integration:appsec": "mocha --timeout 60000 -r \"packages/dd-trace/test/setup/core.js\" \"integration-tests/appsec/*.spec.js\"",
@@ -95,7 +95,7 @@
   },
   "homepage": "https://github.com/DataDog/dd-trace-js#readme",
   "engines": {
-    "node": ">=18"
+    "node": ">=18 <26"
   },
   "files": [
     "/package.json",
@@ -127,7 +127,7 @@
   ],
   "dependencies": {
     "dc-polyfill": "^0.1.10",
-    "import-in-the-middle": "^1.14.2"
+    "import-in-the-middle": "2.0.0"
   },
   "optionalDependencies": {
     "@datadog/libdatadog": "0.7.0",
@@ -135,7 +135,7 @@
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",
     "@datadog/openfeature-node-server": "^0.2.0",
-    "@datadog/pprof": "5.12.0",
+    "@datadog/pprof": "5.13.1",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0"
@@ -148,16 +148,13 @@
     "@openfeature/core": "^1.8.1",
     "@openfeature/server-sdk": "~1.20.0",
     "@stylistic/eslint-plugin": "^5.5.0",
-    "@types/chai": "^4.3.16",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.106",
     "@types/sinon": "^21.0.0",
-    "@types/tap": "^15.0.12",
     "axios": "^1.12.2",
     "benchmark": "^2.1.4",
     "body-parser": "^2.2.0",
     "bun": "1.3.3",
-    "chai": "^4.5.0",
     "eslint": "^9.39.0",
     "eslint-plugin-cypress": "^5.2.0",
     "eslint-plugin-import": "^2.32.0",
@@ -176,16 +173,14 @@
     "mocha-multi-reporters": "^1.5.1",
     "multer": "^2.0.2",
     "nock": "^13.5.6",
-    "nyc": "^15.1.0",
+    "nyc": "^17.1.0",
     "octokit": "^5.0.3",
     "opentracing": ">=0.14.7",
     "proxyquire": "^2.1.3",
     "retry": "^0.13.1",
     "semifies": "^1.0.0",
     "semver": "^7.7.2",
-    "sinon": "^21.0.0",
-    "sinon-chai": "^3.7.0",
-    "tap": "^16.3.10",
+    "sinon": "^21.0.1",
     "tiktoken": "^1.0.21",
     "typescript": "^5.9.2",
     "workerpool": "^10.0.0",

package/packages/datadog-core/src/utils/src/parse-tags.js

@@ -8,7 +8,7 @@ const digitRegex = /^\d+$/
  * Also supports array-keys. For example:
  *   { 'a.0.b': 'value' } -> { a: [{ b: 'value' }] }
  *
- * @param {Object} tags - Key/value pairs of tags
+ * @param {object} tags - Key/value pairs of tags
  * @returns Object - Parsed tags
  */
 module.exports = function parseTags (tags) {

package/packages/datadog-esbuild/index.js

@@ -2,13 +2,18 @@
 
 /* eslint-disable no-console */
 
+const { execSync } = require('child_process')
+const fs = require('fs')
+const RAW_BUILTINS = require('module').builtinModules
+const path = require('path')
+const { pathToFileURL, fileURLToPath } = require('url')
+
 const instrumentations = require('../datadog-instrumentations/src/helpers/instrumentations.js')
-const hooks = require('../datadog-instrumentations/src/helpers/hooks.js')
+
 const extractPackageAndModulePath = require(
   '../datadog-instrumentations/src/helpers/extract-package-and-module-path.js'
 )
-
-const { pathToFileURL, fileURLToPath } = require('url')
+const hooks = require('../datadog-instrumentations/src/helpers/hooks.js')
 const { processModule, isESMFile } = require('./src/utils.js')
 
 const ESM_INTERCEPTED_SUFFIX = '._dd_esbuild_intercepted'
@@ -36,11 +41,7 @@ for (const instrumentation of Object.values(instrumentations)) {
   }
 }
 
-const RAW_BUILTINS = require('module').builtinModules
 const CHANNEL = 'dd-trace:bundler:load'
-const path = require('path')
-const fs = require('fs')
-const { execSync } = require('child_process')
 
 const builtins = new Set()
 

package/packages/datadog-esbuild/src/utils.js

@@ -7,8 +7,20 @@ const path = require('node:path')
 const { NODE_MAJOR, NODE_MINOR } = require('../../../version.js')
 
 const getExportsImporting = (url) => import(url).then(Object.keys)
+let getExportsModulePromise
+
+const loadGetExportsModule = () => {
+  if (!getExportsModulePromise) {
+    getExportsModulePromise = import('import-in-the-middle/lib/get-exports.mjs')
+  }
+  return getExportsModulePromise
+}
+
 const getExports = NODE_MAJOR >= 20 || (NODE_MAJOR === 18 && NODE_MINOR >= 19)
-  ? require('import-in-the-middle/lib/get-exports.js')
+  ? async (srcUrl, context, getSource) => {
+    const mod = await loadGetExportsModule()
+    return mod.getExports(srcUrl, context, getSource)
+  }
   : getExportsImporting
 
 function isStarExportLine (line) {
@@ -168,7 +180,7 @@ async function processModule ({ path, internal, context, excludeDefault }) {
  *
  * @param {string} fullPathToModule File to analize
  * @param {string} [modulePackageJsonPath] Path of the package.json
- * @param {Object} [packageJson] The content of the module package.json
+ * @param {object} [packageJson] The content of the module package.json
  * @returns {boolean}
  */
 function isESMFile (fullPathToModule, modulePackageJsonPath, packageJson = {}) {

package/packages/datadog-instrumentations/src/aerospike.js

@@ -1,11 +1,12 @@
 'use strict'
 
+const tracingChannel = require('dc-polyfill').tracingChannel
+
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
-const tracingChannel = require('dc-polyfill').tracingChannel
 const ch = tracingChannel('apm:aerospike:command')
 
 function wrapCreateCommand (createCommand) {

package/packages/datadog-instrumentations/src/ai.js

@@ -1,9 +1,9 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
+const { channel, tracingChannel } = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
-const { channel, tracingChannel } = require('dc-polyfill')
 const toolCreationChannel = channel('dd-trace:vercel-ai:tool')
 
 const TRACED_FUNCTIONS = {

package/packages/datadog-instrumentations/src/amqp10.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: 'amqp10', file: 'lib/sender_link.js', versions: ['>=3'] }, SenderLink => {
   const startCh = channel('apm:amqp10:send:start')

package/packages/datadog-instrumentations/src/amqplib.js

@@ -1,13 +1,13 @@
 'use strict'
 
-const {
-  channel,
-  addHook
-} = require('./helpers/instrument')
 const kebabCase = require('../../datadog-core/src/utils/src/kebabcase')
 const shimmer = require('../../datadog-shimmer')
 
 const { NODE_MAJOR, NODE_MINOR } = require('../../../version')
+const {
+  channel,
+  addHook
+} = require('./helpers/instrument')
 const MIN_VERSION = ((NODE_MAJOR > 22) || (NODE_MAJOR === 22 && NODE_MINOR >= 2)) ? '>=0.5.3' : '>=0.5.0'
 
 const commandStartCh = channel('apm:amqplib:command:start')

package/packages/datadog-instrumentations/src/anthropic.js

@@ -1,8 +1,8 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 const { channel, tracingChannel } = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
 const anthropicTracingChannel = tracingChannel('apm:anthropic:request')
 const onStreamedChunkCh = channel('apm:anthropic:request:chunk')

package/packages/datadog-instrumentations/src/apollo-server-core.js

@@ -1,8 +1,8 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
 const requestChannel = dc.tracingChannel('datadog:apollo-server-core:request')
 

package/packages/datadog-instrumentations/src/apollo-server.js

@@ -2,8 +2,8 @@
 
 const dc = require('dc-polyfill')
 
-const { addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { addHook } = require('./helpers/instrument')
 
 const graphqlMiddlewareChannel = dc.tracingChannel('datadog:apollo:middleware')
 const apolloHttpServerChannel = dc.tracingChannel('datadog:apollo:httpserver')

package/packages/datadog-instrumentations/src/apollo.js

@@ -1,11 +1,12 @@
 'use strict'
 
+const tracingChannel = require('dc-polyfill').tracingChannel
+
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook,
   channel
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-const tracingChannel = require('dc-polyfill').tracingChannel
 
 const CHANNELS = {
   'gateway.request': tracingChannel('apm:apollo:gateway:request'),

package/packages/datadog-instrumentations/src/avsc.js

@@ -1,9 +1,9 @@
 'use strict'
 
+const dc = require('dc-polyfill')
 const shimmer = require('../../datadog-shimmer')
 const { addHook } = require('./helpers/instrument')
 
-const dc = require('dc-polyfill')
 const serializeChannel = dc.channel('apm:avsc:serialize-start')
 const deserializeChannel = dc.channel('apm:avsc:deserialize-end')
 

package/packages/datadog-instrumentations/src/aws-sdk.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 const patchedClientConfigProtocols = new WeakSet()
 

package/packages/datadog-instrumentations/src/azure-event-hubs.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-const dc = require('dc-polyfill')
 
 const producerCh = dc.tracingChannel('apm:azure-event-hubs:send')
 
@@ -13,6 +13,7 @@ addHook({
   versions: ['>=6.0.0']
 }, obj => {
   const EventHubProducerClient = obj.EventHubProducerClient
+
   shimmer.wrap(EventHubProducerClient.prototype, 'createBatch',
     createBatch => async function () {
       const batch = await createBatch.apply(this, arguments)
@@ -20,7 +21,7 @@ addHook({
         tryAdd => function (eventData) {
           const config = this._context.config
           const functionName = tryAdd.name
-          return producerCh.tracePromise(
+          return producerCh.traceSync(
             tryAdd,
             { functionName, eventData, batch: this, config },
             this, ...arguments)

package/packages/datadog-instrumentations/src/azure-functions.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-const dc = require('dc-polyfill')
 
 const azureFunctionsChannel = dc.tracingChannel('datadog:azure:functions:invoke')
 

package/packages/datadog-instrumentations/src/azure-service-bus.js

@@ -1,12 +1,11 @@
 'use strict'
 
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
 
-const shimmer = require('../../datadog-shimmer')
-const dc = require('dc-polyfill')
-
 const producerCh = dc.tracingChannel('apm:azure-service-bus:send')
 const isItDefault = new WeakSet()
 
@@ -38,7 +37,7 @@ addHook({ name: '@azure/service-bus', versions: ['>=7.9.2'] }, (obj) => {
           shimmer.wrap(batch, 'tryAddMessage', tryAddMessage => function (msg) {
             const functionName = tryAddMessage.name
             const config = this._context.config
-            return producerCh.tracePromise(
+            return producerCh.traceSync(
               tryAddMessage, { config, functionName, batch, msg }, this, ...arguments)
           })
           return batch

package/packages/datadog-instrumentations/src/bluebird.js

@@ -1,8 +1,8 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const { addHook } = require('./helpers/instrument')
 const { wrapThen } = require('./helpers/promise')
-const shimmer = require('../../datadog-shimmer')
 
 function createGetNewLibraryCopyWrap (originalLib) {
   return function wrapGetNewLibraryCopy (getNewLibraryCopy) {

package/packages/datadog-instrumentations/src/bullmq.js

@@ -0,0 +1,11 @@
+// AUTO-GENERATED by dd-compile
+// Orchestrion rewriter handles the actual instrumentation via JSON config.
+// This file registers the module hooks for the rewriter to process.
+
+'use strict'
+
+const { addHook, getHooks } = require('./helpers/instrument')
+
+for (const hook of getHooks('bullmq')) {
+  addHook(hook, exports => exports)
+}

package/packages/datadog-instrumentations/src/bunyan.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: 'bunyan', versions: ['>=1'] }, Logger => {
   const logCh = channel('apm:bunyan:log')

package/packages/datadog-instrumentations/src/cassandra-driver.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const startCh = channel('apm:cassandra-driver:query:start')
 const finishCh = channel('apm:cassandra-driver:query:finish')

package/packages/datadog-instrumentations/src/child_process.js

@@ -3,11 +3,11 @@
 const { errorMonitor } = require('events')
 const util = require('util')
 
+const dc = require('dc-polyfill')
+const shimmer = require('../../datadog-shimmer')
 const {
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-const dc = require('dc-polyfill')
 
 const childProcessChannel = dc.tracingChannel('datadog:child_process:execution')
 

package/packages/datadog-instrumentations/src/confluentinc-kafka-javascript.js

@@ -1,12 +1,12 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
+
+const log = require('../../dd-trace/src/log')
 const {
   addHook,
   channel
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
-
-const log = require('../../dd-trace/src/log')
 
 // Create channels for Confluent Kafka JavaScript
 const channels = {

package/packages/datadog-instrumentations/src/couchbase.js

@@ -1,11 +1,11 @@
 'use strict'
 
 const { errorMonitor } = require('events')
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 function findCallbackIndex (args, lowerbound = 2) {
   for (let i = args.length - 1; i >= lowerbound; i--) {

package/packages/datadog-instrumentations/src/crypto.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const cryptoHashCh = channel('datadog:crypto:hashing:start')
 const cryptoCipherCh = channel('datadog:crypto:cipher:start')

package/packages/datadog-instrumentations/src/cucumber.js

@@ -1,10 +1,20 @@
 'use strict'
-const { createCoverageMap } = require('../../../vendor/dist/istanbul-lib-coverage')
 
-const { addHook, channel } = require('./helpers/instrument')
+const { createCoverageMap } = require('../../../vendor/dist/istanbul-lib-coverage')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const {
+  getCoveredFilenamesFromCoverage,
+  resetCoverage,
+  mergeCoverage,
+  fromCoverageMapToCoverage,
+  getTestSuitePath,
+  CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
+  getIsFaultyEarlyFlakeDetection
+} = require('../../dd-trace/src/plugins/util/test')
+const satisfies = require('../../../vendor/dist/semifies')
+const { addHook, channel } = require('./helpers/instrument')
 
 const testStartCh = channel('ci:cucumber:test:start')
 const testRetryCh = channel('ci:cucumber:test:retry')
@@ -34,17 +44,6 @@ const itrSkippedSuitesCh = channel('ci:cucumber:itr:skipped-suites')
 
 const getCodeCoverageCh = channel('ci:nyc:get-coverage')
 
-const {
-  getCoveredFilenamesFromCoverage,
-  resetCoverage,
-  mergeCoverage,
-  fromCoverageMapToCoverage,
-  getTestSuitePath,
-  CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
-  getIsFaultyEarlyFlakeDetection
-} = require('../../dd-trace/src/plugins/util/test')
-const satisfies = require('../../../vendor/dist/semifies')
-
 const isMarkedAsUnskippable = (pickle) => {
   return pickle.tags.some(tag => tag.name === '@datadog:unskippable')
 }

package/packages/datadog-instrumentations/src/cypress.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { addHook } = require('./helpers/instrument')
 const { DD_MAJOR } = require('../../../version')
+const { addHook } = require('./helpers/instrument')
 
 // No handler because this is only useful for testing.
 // Cypress plugin does not patch any library.

package/packages/datadog-instrumentations/src/dns.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { channel, addHook } = require('./helpers/instrument')
 const shimmer = require('../../datadog-shimmer')
+const { channel, addHook } = require('./helpers/instrument')
 
 const rrtypes = {
   resolveAny: 'ANY',

package/packages/datadog-instrumentations/src/elasticsearch.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 addHook({ name: '@elastic/transport', file: 'lib/Transport.js', versions: ['>=8'] }, (exports) => {
   shimmer.wrap(exports.default.prototype, 'request', createWrapRequest('elasticsearch'))

package/packages/datadog-instrumentations/src/express-mongo-sanitize.js

@@ -1,10 +1,10 @@
 'use strict'
 
+const shimmer = require('../../datadog-shimmer')
 const {
   channel,
   addHook
 } = require('./helpers/instrument')
-const shimmer = require('../../datadog-shimmer')
 
 const sanitizeMethodFinished = channel('datadog:express-mongo-sanitize:sanitize:finish')
 const sanitizeMiddlewareFinished = channel('datadog:express-mongo-sanitize:filter:finish')

package/packages/datadog-instrumentations/src/express.js

@@ -1,7 +1,7 @@
 'use strict'
 
-const { createWrapRouterMethod } = require('./router')
 const shimmer = require('../../datadog-shimmer')
+const { createWrapRouterMethod } = require('./router')
 const { addHook, channel, tracingChannel } = require('./helpers/instrument')
 const {
   setRouterMountPath,