dd-trace 5.66.0 → 5.68.0

package/LICENSE-3rdparty.csv

@@ -16,7 +16,6 @@ require,import-in-the-middle,Apache license 2.0,Copyright 2021 Datadog Inc.
 require,istanbul-lib-coverage,BSD-3-Clause,Copyright 2012-2015 Yahoo! Inc.
 require,jest-docblock,MIT,Copyright Meta Platforms, Inc. and affiliates.
 require,jsonpath-plus,MIT,Copyright (c) 2011-2019 Stefan Goessner, Subbu Allamaraju, Mike Brevoort, Robert Krahn, Brett Zamir, Richard Schneider
-require,koalas,MIT,Copyright 2013-2017 Brian Woodward
 require,limiter,MIT,Copyright 2011 John Hurliman
 require,lodash.sortby,MIT,Copyright JS Foundation and other contributors
 require,lru-cache,ISC,Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
@@ -51,7 +50,6 @@ dev,eslint-plugin-n,MIT,Copyright 2015 Toru Nagashima
 dev,eslint-plugin-promise,ISC,jden and other contributors
 dev,eslint-plugin-unicorn,MIT,Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 dev,express,MIT,Copyright 2009-2014 TJ Holowaychuk 2013-2014 Roman Shtylman 2014-2015 Douglas Christopher Wilson
-dev,get-port,MIT,Copyright Sindre Sorhus
 dev,glob,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,globals,MIT,Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 dev,graphql,MIT,Copyright 2015 Facebook Inc.
@@ -62,7 +60,6 @@ dev,nock,MIT,Copyright 2017 Pedro Teixeira and other contributors
 dev,nyc,ISC,Copyright 2015 Contributors
 dev,octokit,MIT,Copyright 2023 Octokit contributors
 dev,proxyquire,MIT,Copyright 2013 Thorsten Lorenz
-dev,rimraf,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,semver,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,sinon,BSD-3-Clause,Copyright 2010-2017 Christian Johansen
 dev,sinon-chai,WTFPL and BSD-2-Clause,Copyright 2004 Sam Hocevar 2012–2017 Domenic Denicola

package/README.md

@@ -97,5 +97,3 @@ Please refer to the [SECURITY.md](https://github.com/DataDog/dd-trace-js/blob/ma
 ## Datadog With OpenTelemetery
 
 Please refer to the [Node.js Custom Instrumentation using OpenTelemetry API](https://docs.datadoghq.com/tracing/trace_collection/custom_instrumentation/nodejs/otel/) document. It includes information on how to use the OpenTelemetry API with dd-trace-js.
-
-Note that our internal implementation of the OpenTelemetry API is currently set within the version range `>=1.0.0 <1.9.0`. This range will be updated at a regular cadence therefore, we recommend updating your tracer to the latest release to ensure up to date support.

package/ci/init.js

@@ -6,80 +6,78 @@ const { isTrue, isFalse } = require('../packages/dd-trace/src/util')
 const log = require('../packages/dd-trace/src/log')
 const { getEnvironmentVariable } = require('../packages/dd-trace/src/config-helper')
 
-const isJestWorker = !!getEnvironmentVariable('JEST_WORKER_ID')
-const isCucumberWorker = !!getEnvironmentVariable('CUCUMBER_WORKER_ID')
-const isMochaWorker = !!getEnvironmentVariable('MOCHA_WORKER_ID')
-
-const isPlaywrightWorker = !!getEnvironmentVariable('DD_PLAYWRIGHT_WORKER')
+const PACKAGE_MANAGERS = ['npm', 'yarn', 'pnpm']
+const DEFAULT_FLUSH_INTERVAL = 5000
+const JEST_FLUSH_INTERVAL = 0
+const EXPORTER_MAP = {
+  jest: 'jest_worker',
+  cucumber: 'cucumber_worker',
+  mocha: 'mocha_worker',
+  playwright: 'playwright_worker',
+  vitest: 'vitest_worker'
+}
 
-const packageManagers = [
-  'npm',
-  'yarn',
-  'pnpm'
-]
+function isPackageManager () {
+  return PACKAGE_MANAGERS.some(packageManager =>
+    process.argv[1]?.includes(`bin/${packageManager}`)
+  )
+}
 
-const isPackageManager = () => {
-  return packageManagers.some(packageManager => process.argv[1]?.includes(`bin/${packageManager}`))
+function detectTestWorkerType () {
+  if (getEnvironmentVariable('JEST_WORKER_ID')) return 'jest'
+  if (getEnvironmentVariable('CUCUMBER_WORKER_ID')) return 'cucumber'
+  if (getEnvironmentVariable('MOCHA_WORKER_ID')) return 'mocha'
+  if (getEnvironmentVariable('DD_PLAYWRIGHT_WORKER')) return 'playwright'
+  if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) return 'vitest'
+  return null
 }
 
-const options = {
+const testWorkerType = detectTestWorkerType()
+const isTestWorker = testWorkerType !== null
+const isJestWorker = testWorkerType === 'jest'
+
+const baseOptions = {
   startupLogs: false,
   isCiVisibility: true,
-  flushInterval: isJestWorker ? 0 : 5000
+  flushInterval: isJestWorker ? JEST_FLUSH_INTERVAL : DEFAULT_FLUSH_INTERVAL
 }
 
 let shouldInit = !isFalse(getEnvironmentVariable('DD_CIVISIBILITY_ENABLED'))
+const isAgentlessEnabled = isTrue(getEnvironmentVariable('DD_CIVISIBILITY_AGENTLESS_ENABLED'))
 
-if (isPackageManager()) {
+if (!isTestWorker && isPackageManager()) {
   log.debug('dd-trace is not initialized in a package manager.')
   shouldInit = false
 }
 
-const isAgentlessEnabled = isTrue(getEnvironmentVariable('DD_CIVISIBILITY_AGENTLESS_ENABLED'))
-
-if (isAgentlessEnabled) {
-  if (getEnvironmentVariable('DD_API_KEY')) {
-    options.experimental = {
-      exporter: 'datadog'
-    }
-  } else {
-    console.error('DD_CIVISIBILITY_AGENTLESS_ENABLED is set, but neither ' +
-      'DD_API_KEY nor DATADOG_API_KEY are set in your environment, so ' +
-      'dd-trace will not be initialized.')
-    shouldInit = false
+if (isTestWorker) {
+  baseOptions.telemetry = { enabled: false }
+  baseOptions.experimental = {
+    exporter: EXPORTER_MAP[testWorkerType]
   }
 } else {
-  options.experimental = {
-    exporter: 'agent_proxy'
-  }
-}
-
-if (isJestWorker) {
-  options.experimental = {
-    exporter: 'jest_worker'
-  }
-}
-
-if (isCucumberWorker) {
-  options.experimental = {
-    exporter: 'cucumber_worker'
-  }
-}
-
-if (isMochaWorker) {
-  options.experimental = {
-    exporter: 'mocha_worker'
-  }
-}
-
-if (isPlaywrightWorker) {
-  options.experimental = {
-    exporter: 'playwright_worker'
+  if (isAgentlessEnabled) {
+    if (getEnvironmentVariable('DD_API_KEY')) {
+      baseOptions.experimental = {
+        exporter: 'datadog'
+      }
+    } else {
+      console.error(
+        'DD_CIVISIBILITY_AGENTLESS_ENABLED is set, but neither ' +
+        'DD_API_KEY nor DATADOG_API_KEY are set in your environment, so ' +
+        'dd-trace will not be initialized.'
+      )
+      shouldInit = false
+    }
+  } else {
+    baseOptions.experimental = {
+      exporter: 'agent_proxy'
+    }
   }
 }
 
 if (shouldInit) {
-  tracer.init(options)
+  tracer.init(baseOptions)
   tracer.use('fs', false)
   tracer.use('child_process', false)
 }

package/ext/exporters.d.ts

@@ -6,7 +6,8 @@ declare const exporters: {
   JEST_WORKER: 'jest_worker',
   CUCUMBER_WORKER: 'cucumber_worker',
   MOCHA_WORKER: 'mocha_worker',
-  PLAYWRIGHT_WORKER: 'playwright_worker'
+  PLAYWRIGHT_WORKER: 'playwright_worker',
+  VITEST_WORKER: 'vitest_worker'
 }
 
 export = exporters

package/ext/exporters.js

@@ -7,5 +7,6 @@ module.exports = {
   JEST_WORKER: 'jest_worker',
   CUCUMBER_WORKER: 'cucumber_worker',
   MOCHA_WORKER: 'mocha_worker',
-  PLAYWRIGHT_WORKER: 'playwright_worker'
+  PLAYWRIGHT_WORKER: 'playwright_worker',
+  VITEST_WORKER: 'vitest_worker'
 }

package/index.d.ts

@@ -253,7 +253,7 @@ declare namespace tracer {
     /**
      * An array of span links
      */
-    links?: Array<{ context: SpanContext, attributes?: Object }>
+    links?: { context: SpanContext, attributes?: Object }[]
   }
 
   /**
@@ -268,11 +268,34 @@ declare namespace tracer {
 
     /**
      * Causally links another span to the current span
+     *
+     * @deprecated In favor of addLink(link: { context: SpanContext, attributes?: Object }).
+     * This will be removed in the next major version.
      * @param {SpanContext} context The context of the span to link to.
      * @param {Object} attributes An optional key value pair of arbitrary values.
      * @returns {void}
      */
     addLink (context: SpanContext, attributes?: Object): void;
+
+    /**
+     * Adds a single link to the span.
+     *
+     * Links added after the creation will not affect the sampling decision.
+     * It is preferred span links be added at span creation.
+     *
+     * @param link the link to add.
+     */
+    addLink (link: { context: SpanContext, attributes?: Object }): void;
+
+    /**
+     * Adds multiple links to the span.
+     *
+     * Links added after the creation will not affect the sampling decision.
+     * It is preferred span links be added at span creation.
+     *
+     * @param links the links to add.
+     */
+    addLinks (links: { context: SpanContext, attributes?: Object }[]): void;
   }
 
   /**
@@ -404,7 +427,7 @@ declare namespace tracer {
 
     /**
      * The address of the trace agent that the tracer will submit to.
-     * @default 'localhost'
+     * @default '127.0.0.1'
      */
     hostname?: string;
 
@@ -2311,11 +2334,33 @@ declare namespace tracer {
 
       /**
        * Causally links another span to the current span
+       *
+       * @deprecated In favor of addLink(link: otel.Link). This will be removed in the next major version.
        * @param {otel.SpanContext} context The context of the span to link to.
        * @param {SpanAttributes} attributes An optional key value pair of arbitrary values.
        * @returns {void}
        */
       addLink(context: otel.SpanContext, attributes?: SpanAttributes): void;
+
+      /**
+       * Adds a single link to the span.
+       *
+       * Links added after the creation will not affect the sampling decision.
+       * It is preferred span links be added at span creation.
+       *
+       * @param link the link to add.
+       */
+      addLink(link: otel.Link): this;
+
+      /**
+       * Adds multiple links to the span.
+       *
+       * Links added after the creation will not affect the sampling decision.
+       * It is preferred span links be added at span creation.
+       *
+       * @param links the links to add.
+       */
+      addLinks(links: otel.Link[]): this;
     }
 
     /**
@@ -2566,6 +2611,25 @@ declare namespace tracer {
       annotate (options: llmobs.AnnotationOptions): void
       annotate (span: tracer.Span | undefined, options: llmobs.AnnotationOptions): void
 
+      /**
+       * Register a processor to be called on each LLMObs span.
+       *
+       * This can be used to modify the span before it is sent to LLMObs. For example, you can modify the input/output.
+       * You can also return `null` to omit the span entirely from being sent to LLM Observability.
+       *
+       * Otherwise, if the return value from the processor is not an instance of `LLMObservabilitySpan`, the span will be dropped.
+       *
+       * To deregister the processor, call `llmobs.deregisterProcessor()`
+       * @param processor A function that will be called for each span.
+       * @throws {Error} If a processor is already registered.
+       */
+      registerProcessor (processor: ((span: LLMObservabilitySpan) => LLMObservabilitySpan | null)): void
+
+      /**
+       * Deregister a processor.
+       */
+      deregisterProcessor (): void
+
       /**
        * Submits a custom evaluation metric for a given span ID and trace ID.
        * @param spanContext The span context of the span to submit the evaluation metric for.
@@ -2579,6 +2643,25 @@ declare namespace tracer {
       flush (): void
     }
 
+    interface LLMObservabilitySpan {
+      /**
+       * The input content associated with the span.
+       */
+      input: { content: string, role?: string }[]
+
+      /**
+       * The output content associated with the span.
+       */
+      output: { content: string, role?: string }[]
+
+      /**
+       * Get a tag from the span.
+       * @param key The key of the tag to get.
+       * @returns The value of the tag, or `undefined` if the tag does not exist.
+       */
+      getTag (key: string): string | undefined
+    }
+
     interface EvaluationOptions {
       /**
        * The name of the evaluation metric

package/initialize.mjs

@@ -36,7 +36,7 @@ ${result.source}`
 const [NODE_MAJOR, NODE_MINOR] = process.versions.node.split('.').map(Number)
 
 const brokenLoaders = NODE_MAJOR === 18 && NODE_MINOR === 0
-const iitmExclusions = [/langsmith/, /openai\/_shims/, /openai\/resources\/chat\/completions\/messages/]
+const iitmExclusions = [/langsmith/, /openai\/_shims/, /openai\/resources\/chat\/completions\/messages/, /openai\/agents-core\/dist\/shims/]
 
 export async function load (url, context, nextLoad) {
   const iitmExclusionsMatch = iitmExclusions.some((exclusion) => exclusion.test(url))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.66.0",
+  "version": "5.68.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -121,8 +121,8 @@
     "@datadog/sketches-js": "2.1.1",
     "@datadog/wasm-js-rewriter": "4.0.1",
     "@isaacs/ttlcache": "^1.4.1",
-    "@opentelemetry/api": "1.8.0",
-    "@opentelemetry/core": "^1.14.0",
+    "@opentelemetry/api": ">=1.0.0 <1.10.0",
+    "@opentelemetry/core": ">=1.14.0 <1.31.0",
     "crypto-randomuuid": "^1.0.0",
     "dc-polyfill": "^0.1.10",
     "ignore": "^7.0.5",
@@ -130,7 +130,6 @@
     "istanbul-lib-coverage": "^3.2.2",
     "jest-docblock": "^29.7.0",
     "jsonpath-plus": "^10.3.0",
-    "koalas": "^1.0.2",
     "limiter": "^1.1.5",
     "lodash.sortby": "^4.7.0",
     "lru-cache": "^10.4.3",
@@ -155,20 +154,19 @@
     "@msgpack/msgpack": "^3.1.2",
     "@stylistic/eslint-plugin": "^5.0.0",
     "@types/node": "^18.19.106",
-    "axios": "^1.11.0",
+    "axios": "^1.12.2",
     "benchmark": "^2.1.4",
     "body-parser": "^2.2.0",
     "chai": "^4.5.0",
     "eslint": "^9.29.0",
     "eslint-plugin-cypress": "^5.1.0",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-mocha": "^10.5.0",
+    "eslint-plugin-mocha": "^11.1.0",
     "eslint-plugin-n": "^17.20.0",
     "eslint-plugin-promise": "^7.2.1",
-    "eslint-plugin-unicorn": "^60.0.0",
+    "eslint-plugin-unicorn": "^61.0.2",
     "express": "^5.1.0",
-    "get-port": "^5.1.1",
-    "glob": "^7.2.3",
+    "glob": "^10.4.5",
     "globals": "^16.3.0",
     "graphql": "*",
     "jszip": "^3.10.1",
@@ -178,9 +176,8 @@
     "nyc": "^15.1.0",
     "octokit": "^5.0.3",
     "proxyquire": "^2.1.3",
-    "rimraf": "^3.0.2",
     "semver": "^7.7.2",
-    "sinon": "^18.0.1",
+    "sinon": "^21.0.0",
     "sinon-chai": "^3.7.0",
     "tap": "^16.3.10",
     "tiktoken": "^1.0.21",

package/packages/datadog-esbuild/index.js

@@ -33,6 +33,7 @@ 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()
 
@@ -61,6 +62,39 @@ function isESMBuild (build) {
   return format === 'esm' || outputFile?.endsWith('.mjs') || outExtension === '.mjs'
 }
 
+function getGitMetadata () {
+  const gitMetadata = {
+    repositoryURL: null,
+    commitSHA: null
+  }
+
+  try {
+    gitMetadata.repositoryURL = execSync('git config --get remote.origin.url', {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'ignore'],
+      cwd: process.cwd()
+    }).trim()
+  } catch (e) {
+    if (DEBUG) {
+      console.warn('Warning: failed to get git repository URL:', e.message)
+    }
+  }
+
+  try {
+    gitMetadata.commitSHA = execSync('git rev-parse HEAD', {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'ignore'],
+      cwd: process.cwd()
+    }).trim()
+  } catch (e) {
+    if (DEBUG) {
+      console.warn('Warning: failed to get git commit SHA:', e.message)
+    }
+  }
+
+  return gitMetadata
+}
+
 module.exports.setup = function (build) {
   const externalModules = new Set(build.initialOptions.external || [])
   if (isESMBuild(build)) {
@@ -77,6 +111,28 @@ ${build.initialOptions.banner.js}`
     }
   }
 
+  // Get git metadata at build time and add it to the banner for both ESM and CommonJS builds
+  const gitMetadata = getGitMetadata()
+  if (gitMetadata.repositoryURL || gitMetadata.commitSHA) {
+    build.initialOptions.banner ??= {}
+    build.initialOptions.banner.js ??= ''
+
+    build.initialOptions.banner.js = `if (typeof process === 'object' && process !== null &&
+    process.env !== null && typeof process.env === 'object') {
+  ${gitMetadata.repositoryURL ? `process.env.DD_GIT_REPOSITORY_URL = '${gitMetadata.repositoryURL}';` : ''}
+  ${gitMetadata.commitSHA ? `process.env.DD_GIT_COMMIT_SHA = '${gitMetadata.commitSHA}';` : ''}
+}
+${build.initialOptions.banner.js}`
+
+    if (DEBUG) {
+      console.log('Info: automatically injected git metadata:')
+      console.log(`DD_GIT_REPOSITORY_URL: ${gitMetadata.repositoryURL || 'not available'}`)
+      console.log(`DD_GIT_COMMIT_SHA: ${gitMetadata.commitSHA || 'not available'}`)
+    }
+  } else if (DEBUG) {
+    console.warn('Warning: No git metadata available - skipping injection')
+  }
+
   build.onResolve({ filter: /.*/ }, args => {
     if (externalModules.has(args.path)) {
       // Internal Node.js packages will still be instrumented via require()

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

@@ -61,7 +61,6 @@ function wrapSmithySend (send) {
 
     const startCh = channel(`apm:aws:request:start:${channelSuffix}`)
     const regionCh = channel(`apm:aws:request:region:${channelSuffix}`)
-    const completeChannel = channel(`apm:aws:request:complete:${channelSuffix}`)
     const responseStartChannel = channel(`apm:aws:response:start:${channelSuffix}`)
     const responseFinishChannel = channel(`apm:aws:response:finish:${channelSuffix}`)
 
@@ -87,7 +86,7 @@ function wrapSmithySend (send) {
         args[args.length - 1] = shimmer.wrapFunction(cb, cb => function (err, result) {
           addResponse(ctx, err, result)
 
-          completeChannel.publish(ctx)
+          handleCompletion(result, ctx, channelSuffix)
 
           const responseCtx = { request, response: ctx.response }
 
@@ -102,12 +101,12 @@ function wrapSmithySend (send) {
           .then(
             result => {
               addResponse(ctx, null, result)
-              completeChannel.publish(ctx)
+              handleCompletion(result, ctx, channelSuffix)
               return result
             },
             error => {
               addResponse(ctx, error)
-              completeChannel.publish(ctx)
+              handleCompletion(null, ctx, channelSuffix)
               throw error
             }
           )
@@ -118,6 +117,45 @@ function wrapSmithySend (send) {
   }
 }
 
+function handleCompletion (result, ctx, channelSuffix) {
+  const completeChannel = channel(`apm:aws:request:complete:${channelSuffix}`)
+  const streamedChunkChannel = channel(`apm:aws:response:streamed-chunk:${channelSuffix}`)
+
+  const iterator = result?.body?.[Symbol.asyncIterator]
+  if (!iterator) {
+    completeChannel.publish(ctx)
+    return
+  }
+
+  shimmer.wrap(result.body, Symbol.asyncIterator, function (asyncIterator) {
+    return function () {
+      const iterator = asyncIterator.apply(this, arguments)
+      shimmer.wrap(iterator, 'next', function (next) {
+        return function () {
+          return next.apply(this, arguments)
+            .then(result => {
+              const { done, value: chunk } = result
+              streamedChunkChannel.publish({ ctx, chunk, done })
+
+              if (done) {
+                completeChannel.publish(ctx)
+              }
+
+              return result
+            })
+            .catch(err => {
+              addResponse(ctx, err)
+              completeChannel.publish(ctx)
+              throw err
+            })
+        }
+      })
+
+      return iterator
+    }
+  })
+}
+
 function wrapCb (cb, serviceName, ctx) {
   // eslint-disable-next-line n/handle-callback-err
   return shimmer.wrapFunction(cb, cb => function wrappedCb (err, response) {

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

@@ -8,7 +8,7 @@ const dc = require('dc-polyfill')
 
 const azureFunctionsChannel = dc.tracingChannel('datadog:azure:functions:invoke')
 
-addHook({ name: '@azure/functions', versions: ['>=4'] }, azureFunction => {
+addHook({ name: '@azure/functions', versions: ['>=4'], patchDefault: false }, (azureFunction) => {
   const { app } = azureFunction
 
   // Http triggers

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

@@ -11,7 +11,7 @@ const producerStartCh = channel('apm:azure-service-bus:send:start')
 const producerErrorCh = channel('apm:azure-service-bus:send:error')
 const producerFinishCh = channel('apm:azure-service-bus:send:finish')
 
-addHook({ name: '@azure/service-bus', versions: ['>=7.9.2'] }, (obj) => {
+addHook({ name: '@azure/service-bus', versions: ['>=7.9.2'], patchDefault: false }, (obj) => {
   const ServiceBusClient = obj.ServiceBusClient
   shimmer.wrap(ServiceBusClient.prototype, 'createSender', createSender => function (queueOrTopicName) {
     const sender = createSender.apply(this, arguments)

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

@@ -45,7 +45,7 @@ addHook({ name: 'cassandra-driver', versions: ['>=3.0.0'] }, cassandra => {
   return cassandra
 })
 
-addHook({ name: 'cassandra-driver', versions: ['>=4.4'] }, cassandra => {
+addHook({ name: 'cassandra-driver', versions: ['>=4.4'], patchDefault: false }, (cassandra) => {
   shimmer.wrap(cassandra.Client.prototype, '_execute', _execute => function (query, params, execOptions, callback) {
     if (!startCh.hasSubscribers) {
       return _execute.apply(this, arguments)
@@ -68,7 +68,7 @@ const isValid = (args) => {
   return args.length === 4 || typeof args[3] === 'function'
 }
 
-addHook({ name: 'cassandra-driver', versions: ['3 - 4.3'] }, cassandra => {
+addHook({ name: 'cassandra-driver', versions: ['3 - 4.3'], patchDefault: false }, (cassandra) => {
   shimmer.wrap(cassandra.Client.prototype, '_innerExecute', _innerExecute =>
     function (query, params, execOptions, callback) {
       if (!startCh.hasSubscribers) {

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

@@ -102,11 +102,15 @@ function wrapNext (req, next) {
   })
 }
 
-addHook({ name: 'connect', versions: ['>=3'] }, connect => {
+addHook({ name: 'connect', versions: ['>=3.4.0'] }, (connect) => {
   return shimmer.wrapFunction(connect, connect => wrapConnect(connect))
 })
 
-addHook({ name: 'connect', versions: ['2.2.2'] }, connect => {
+addHook({ name: 'connect', versions: ['>=3 <3.4.0'], file: 'lib/connect.js' }, (connect) => {
+  return shimmer.wrapFunction(connect, connect => wrapConnect(connect))
+})
+
+addHook({ name: 'connect', versions: ['2.2.2'], file: 'lib/connect.js' }, connect => {
   shimmer.wrap(connect.proto, 'use', wrapUse)
   shimmer.wrap(connect.proto, 'handle', wrapHandle)