dd-trace 5.52.0 → 5.54.0

package/packages/dd-trace/src/debugger/devtools_client/snapshot/processor.js

@@ -238,16 +238,14 @@ function toArrayBuffer (type, bytes, maxLength) {
 
   const size = bytes.length
 
-  if (size > maxLength) {
-    return {
-      type,
-      value: arrayBufferToString(bytes, maxLength),
-      truncated: true,
-      size: bytes.length
-    }
-  } else {
-    return { type, value: arrayBufferToString(bytes, size) }
-  }
+  return size > maxLength
+    ? {
+        type,
+        value: arrayBufferToString(bytes, maxLength),
+        truncated: true,
+        size: bytes.length
+      }
+    : { type, value: arrayBufferToString(bytes, size) }
 }
 
 function arrayBufferToString (bytes, size) {

package/packages/dd-trace/src/debugger/devtools_client/snapshot/redaction.js

@@ -2,8 +2,8 @@
 
 const config = require('../config')
 
-const excludedIdentifiers = config.dynamicInstrumentation.redactionExcludedIdentifiers
-  .map((name) => normalizeName(name))
+const excludedIdentifiers = new Set(config.dynamicInstrumentation.redactionExcludedIdentifiers
+  .map((name) => normalizeName(name)))
 
 const REDACTED_IDENTIFIERS = new Set(
   [
@@ -98,7 +98,7 @@ const REDACTED_IDENTIFIERS = new Set(
     ...config.dynamicInstrumentation.redactedIdentifiers
   ]
     .map((name) => normalizeName(name))
-    .filter((name) => excludedIdentifiers.includes(name) === false)
+    .filter((name) => excludedIdentifiers.has(name) === false)
 )
 
 function normalizeName (name, isSymbol) {

package/packages/dd-trace/src/debugger/devtools_client/source-maps.js

@@ -4,7 +4,6 @@ const { join, dirname } = require('path')
 const { readFileSync } = require('fs')
 const { readFile } = require('fs/promises')
 const { SourceMapConsumer } = require('source-map')
-const { NODE_MAJOR } = require('../../../../../version')
 
 const cache = new Map()
 let cacheTimer = null
@@ -35,14 +34,7 @@ const self = module.exports = {
   }
 }
 
-// The version check inside this function is to guard against a bug Node.js version 18, in which calls to `setTimeout`
-// might throw an uncatchable error from within `AsyncLocalStorage._propagate` with the following error message:
-//
-//     TypeError: Cannot read properties of undefined (reading 'Symbol(kResourceStore)')
-//
-// Source: https://github.com/nodejs/node/blob/v18.20.6/lib/async_hooks.js#L312
 function cacheIt (key, value) {
-  if (NODE_MAJOR < 20) return value
   cacheTime = Date.now()
   setCacheTTL()
   cache.set(key, value)
@@ -54,7 +46,7 @@ function setCacheTTL () {
 
   cacheTimer = setTimeout(function () {
     cacheTimer = null
-    if (Date.now() - cacheTime < 2_500) {
+    if (Date.now() - cacheTime < 2500) {
       // If the last cache entry was added recently, keep the cache alive
       setCacheTTL()
     } else {
@@ -62,7 +54,7 @@ function setCacheTTL () {
       // Clear cache a few seconds after it was last used
       cache.clear()
     }
-  }, 5_000).unref()
+  }, 5000).unref()
 }
 
 function loadInlineSourceMap (data) {

package/packages/dd-trace/src/debugger/devtools_client/state.js

@@ -1,6 +1,7 @@
 'use strict'
 
 const { join, dirname } = require('path')
+const { normalize } = require('source-map/lib/util')
 const { loadSourceMapSync } = require('./source-maps')
 const session = require('./session')
 const log = require('../../log')
@@ -9,12 +10,16 @@ const WINDOWS_DRIVE_LETTER_REGEX = /[a-zA-Z]/
 
 const loadedScripts = []
 const scriptUrls = new Map()
+let reEvaluateProbesTimer = null
 
 module.exports = {
   locationToBreakpoint: new Map(),
   breakpointToProbes: new Map(),
   probeToLocation: new Map(),
 
+  _loadedScripts: loadedScripts, // Only exposed for testing
+  _scriptUrls: scriptUrls, // Only exposed for testing
+
   /**
    * Find the script to inspect based on a partial or absolute path. Handles both Windows and POSIX paths.
    *
@@ -88,13 +93,17 @@ module.exports = {
       }
     }
 
-    return maxMatchLength !== -1 ? bestMatch : null
+    return maxMatchLength === -1 ? null : bestMatch
   },
 
   getStackFromCallFrames (callFrames) {
     return callFrames.map((frame) => {
+      // TODO: Possible race condition: If the breakpoint is in the process of being removed, and this is the last
+      // breakpoint, it will also stop the debugging session, which in turn will clear the state, which means clearing
+      // the `scriptUrls` map. That might result in this the `scriptUrls.get` call above returning `undefined`, which
+      // will throw when `startsWith` is called on it.
       let fileName = scriptUrls.get(frame.location.scriptId)
-      if (fileName.startsWith('file://')) fileName = fileName.substr(7) // TODO: This might not be required
+      if (fileName.startsWith('file://')) fileName = fileName.slice(7) // TODO: This might not be required
       return {
         fileName,
         function: frame.functionName,
@@ -102,6 +111,14 @@ module.exports = {
         columnNumber: frame.location.columnNumber + 1 // Beware! columnNumber is zero-indexed
       }
     })
+  },
+
+  // The maps locationToBreakpoint, breakpointToProbes, and probeToLocation are always updated when breakpoints are
+  // removed. Therefore they do not need to get manually cleared. Only the state internal to this file needs to be
+  // cleared.
+  clearState () {
+    loadedScripts.length = 0
+    scriptUrls.clear()
   }
 }
 
@@ -112,7 +129,6 @@ module.exports = {
 // Unknown params.url values:
 // - `structured-stack` - Not sure what this is, but should just be ignored
 // - `` - Not sure what this is, but should just be ignored
-// TODO: Event fired for all files, every time debugger is enabled. So when we disable it, we need to reset the state
 session.on('Debugger.scriptParsed', ({ params }) => {
   scriptUrls.set(params.scriptId, params.url)
   if (params.url.startsWith('file:')) {
@@ -136,11 +152,22 @@ session.on('Debugger.scriptParsed', ({ params }) => {
           ...params,
           sourceUrl: params.url,
           url: new URL(join(dir, source), 'file:').href,
-          source
+          // The source url provided by V8 unfortunately doesn't always match the source url used internally in the
+          // `source-map` dependency. Both read the same source maps, but the `source-map` dependency iterates over all
+          // the `sources` and normalize them using an internal `normalize` function. If these two strings don't match,
+          // the `source-map` dependency will not be able to find the generated position. Below we use the same
+          // internal `normalize` function, to ensure compatibility.
+          // TODO: Consider swapping out the `source-map` dependency for something better so we don't have to do this.
+          source: normalize(source)
         })
       }
     } else {
       loadedScripts.push(params)
     }
+
+    clearTimeout(reEvaluateProbesTimer)
+    reEvaluateProbesTimer = setTimeout(() => {
+      session.emit('scriptLoadingStabilized')
+    }, 500)
   }
 })

package/packages/dd-trace/src/dogstatsd.js

@@ -94,13 +94,13 @@ class DogStatsDClient {
   }
 
   _sendUdp (queue) {
-    if (this._family !== 0) {
-      this._sendUdpFromQueue(queue, this._host, this._family)
-    } else {
+    if (this._family === 0) {
       lookup(this._host, (err, address, family) => {
         if (err) return log.error('DogStatsDClient: Host not found', err)
         this._sendUdpFromQueue(queue, address, family)
       })
+    } else {
+      this._sendUdpFromQueue(queue, this._host, this._family)
     }
   }
 
@@ -116,7 +116,8 @@ class DogStatsDClient {
   _add (stat, value, type, tags) {
     const message = `${this._prefix + stat}:${value}|${type}`
 
-    tags = tags ? this._tags.concat(tags) : this._tags
+    // Don't manipulate this._tags as it is still used
+    tags = tags ? [...this._tags, ...tags] : this._tags
 
     if (tags.length > 0) {
       this._write(`${message}|#${tags.join(',')}\n`)
@@ -392,6 +393,8 @@ class CustomMetrics {
    * These are translated into [ 'tagName:tagValue' ] for internal use
    */
   static tagTranslator (objTags) {
+    if (Array.isArray(objTags)) return objTags
+
     const arrTags = []
 
     if (!objTags) return arrTags

package/packages/dd-trace/src/encode/0.4.js

@@ -13,11 +13,11 @@ function formatSpan (span, config) {
   span = normalizeSpan(truncateSpan(span, false))
   if (span.span_events) {
     // ensure span events are encoded as tags if agent doesn't support native top level span events
-    if (!config?.trace?.nativeSpanEvents) {
+    if (config?.trace?.nativeSpanEvents) {
+      formatSpanEvents(span)
+    } else {
       span.meta.events = JSON.stringify(span.span_events)
       delete span.span_events
-    } else {
-      formatSpanEvents(span)
     }
   }
   return span
@@ -175,7 +175,7 @@ class AgentEncoder {
 
     id = id.toArray()
 
-    bytes.buffer[offset] = 0xcf
+    bytes.buffer[offset] = 0xCF
     bytes.buffer[offset + 1] = id[0]
     bytes.buffer[offset + 2] = id[1]
     bytes.buffer[offset + 3] = id[2]
@@ -266,7 +266,7 @@ class AgentEncoder {
 
     // we should do it after encoding the object to know the real length
     const length = bytes.length - offset - prefixLength
-    bytes.buffer[offset] = 0xc6
+    bytes.buffer[offset] = 0xC6
     bytes.buffer[offset + 1] = length >> 24
     bytes.buffer[offset + 2] = length >> 16
     bytes.buffer[offset + 3] = length >> 8
@@ -326,7 +326,7 @@ class AgentEncoder {
   }
 
   _writeArrayPrefix (buffer, offset, count) {
-    buffer[offset++] = 0xdd
+    buffer[offset++] = 0xDD
     buffer.writeUInt32BE(count, offset)
 
     return offset + 4
@@ -351,10 +351,10 @@ function formatSpanEvents (span) {
     if (spanEvent.attributes) {
       for (const [key, value] of Object.entries(spanEvent.attributes)) {
         const newValue = convertSpanEventAttributeValues(key, value)
-        if (newValue !== undefined) {
-          spanEvent.attributes[key] = newValue
-        } else {
+        if (newValue === undefined) {
           delete spanEvent.attributes[key] // delete from attributes if undefined
+        } else {
+          spanEvent.attributes[key] = newValue
         }
       }
       if (Object.keys(spanEvent.attributes).length === 0) {

package/packages/dd-trace/src/encode/0.5.js

@@ -4,7 +4,7 @@ const { truncateSpan, normalizeSpan } = require('./tags-processors')
 const { AgentEncoder: BaseEncoder } = require('./0.4')
 
 const ARRAY_OF_TWO = 0x92
-const ARRAY_OF_TWELVE = 0x9c
+const ARRAY_OF_TWELVE = 0x9C
 
 function formatSpan (span) {
   span = normalizeSpan(truncateSpan(span, false))

package/packages/dd-trace/src/encode/agentless-ci-visibility.js

@@ -11,7 +11,7 @@ const {
 } = require('../ci-visibility/telemetry')
 
 const ENCODING_VERSION = 1
-const ALLOWED_CONTENT_TYPES = ['test_session_end', 'test_module_end', 'test_suite_end', 'test']
+const ALLOWED_CONTENT_TYPES = new Set(['test_session_end', 'test_module_end', 'test_suite_end', 'test'])
 
 const TEST_SUITE_KEYS_LENGTH = 12
 const TEST_MODULE_KEYS_LENGTH = 11
@@ -26,7 +26,7 @@ function formatSpan (span) {
     encodingVersion = 2
   }
   return {
-    type: ALLOWED_CONTENT_TYPES.includes(span.type) ? span.type : 'span',
+    type: ALLOWED_CONTENT_TYPES.has(span.type) ? span.type : 'span',
     version: encodingVersion,
     content: normalizeSpan(truncateSpan(span))
   }
@@ -292,7 +292,7 @@ class AgentlessCiVisibilityEncoder extends AgentEncoder {
     const eventsOffset = this._eventsOffset
     const eventsCount = this._eventCount
 
-    bytes.buffer[eventsOffset] = 0xdd
+    bytes.buffer[eventsOffset] = 0xDD
     bytes.buffer[eventsOffset + 1] = eventsCount >> 24
     bytes.buffer[eventsOffset + 2] = eventsCount >> 16
     bytes.buffer[eventsOffset + 3] = eventsCount >> 8

package/packages/dd-trace/src/encode/coverage-ci-visibility.js

@@ -92,7 +92,7 @@ class CoverageCIVisibilityEncoder extends AgentEncoder {
     const coveragesCount = this._coveragesCount
 
     // update with number of coverages
-    bytes.buffer[coveragesOffset] = 0xdd
+    bytes.buffer[coveragesOffset] = 0xDD
     bytes.buffer[coveragesOffset + 1] = coveragesCount >> 24
     bytes.buffer[coveragesOffset + 2] = coveragesCount >> 16
     bytes.buffer[coveragesOffset + 3] = coveragesCount >> 8

package/packages/dd-trace/src/encode/tags-processors.js

@@ -6,7 +6,7 @@ const MAX_RESOURCE_NAME_LENGTH = 5000
 // MAX_META_KEY_LENGTH the maximum length of metadata key
 const MAX_META_KEY_LENGTH = 200
 // MAX_META_VALUE_LENGTH the maximum length of metadata value
-const MAX_META_VALUE_LENGTH = 25000
+const MAX_META_VALUE_LENGTH = 25_000
 // MAX_METRIC_KEY_LENGTH the maximum length of a metric name key
 const MAX_METRIC_KEY_LENGTH = MAX_META_KEY_LENGTH
 

package/packages/dd-trace/src/exporter.js

@@ -4,10 +4,7 @@ const exporters = require('../../../ext/exporters')
 const fs = require('fs')
 const constants = require('./constants')
 
-module.exports = name => {
-  const inAWSLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined
-  const usingLambdaExtension = inAWSLambda && fs.existsSync(constants.DATADOG_LAMBDA_EXTENSION_PATH)
-
+module.exports = function getExporter (name) {
   switch (name) {
     case exporters.LOG:
       return require('./exporters/log')
@@ -22,7 +19,10 @@ module.exports = name => {
     case exporters.MOCHA_WORKER:
     case exporters.PLAYWRIGHT_WORKER:
       return require('./ci-visibility/exporters/test-worker')
-    default:
-      return inAWSLambda && !usingLambdaExtension ? require('./exporters/log') : require('./exporters/agent')
+    default: {
+      const inAWSLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined
+      const usingLambdaExtension = inAWSLambda && fs.existsSync(constants.DATADOG_LAMBDA_EXTENSION_PATH)
+      return require(inAWSLambda && !usingLambdaExtension ? './exporters/log' : './exporters/agent')
+    }
   }
 }

package/packages/dd-trace/src/exporters/agent/writer.js

@@ -69,11 +69,7 @@ function setHeader (headers, key, value) {
 }
 
 function getEncoder (protocolVersion) {
-  if (protocolVersion === '0.5') {
-    return require('../../encode/0.5').AgentEncoder
-  } else {
-    return require('../../encode/0.4').AgentEncoder
-  }
+  return require(`../../encode/${protocolVersion === '0.5' ? '0.5' : '0.4'}`).AgentEncoder
 }
 
 function makeRequest (version, data, count, url, headers, lookup, needsStartupLog, cb) {

package/packages/dd-trace/src/exporters/common/docker.js

@@ -9,7 +9,7 @@ const { DD_EXTERNAL_ENV } = process.env
 const uuidSource =
 '[0-9a-f]{8}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{12}|[0-9a-f]{8}(?:-[0-9a-f]{4}){4}$'
 const containerSource = '[0-9a-f]{64}'
-const taskSource = '[0-9a-f]{32}-\\d+'
+const taskSource = String.raw`[0-9a-f]{32}-\d+`
 const lineReg = /^(\d+):([^:]*):(.+)$/m
 const entityReg = new RegExp(`.*(${uuidSource}|${containerSource}|${taskSource})(?:\\.scope)?$`, 'm')
 

package/packages/dd-trace/src/exporters/common/form-data.js

@@ -38,10 +38,12 @@ class FormData extends Readable {
   }
 
   _appendFile (key, value, { filename, contentType = 'application/octet-stream' }) {
-    this._data.push(`Content-Disposition: form-data; name="${key}"; filename="${filename}"\r\n`)
-    this._data.push(`Content-Type: ${contentType}\r\n\r\n`)
-    this._data.push(value)
-    this._data.push('\r\n')
+    this._data.push(
+      `Content-Disposition: form-data; name="${key}"; filename="${filename}"\r\n`,
+      `Content-Type: ${contentType}\r\n\r\n`,
+      value,
+      '\r\n'
+    )
   }
 
   _read () {

package/packages/dd-trace/src/exporters/common/request.js

@@ -100,7 +100,7 @@ function request (data, options, callback) {
             options.url || options.hostname || `http://localhost:${options.port}`
           ).href
           errorMessage = `Error from ${fullUrl}: ${res.statusCode} ${http.STATUS_CODES[res.statusCode]}.`
-        } catch (e) {
+        } catch {
           // ignore error
         }
         const responseData = buffer.toString()

package/packages/dd-trace/src/exporters/common/util.js

@@ -1,7 +1,7 @@
 function safeJSONStringify (value) {
   return JSON.stringify(
     value,
-    (key, value) => key !== 'dd-api-key' ? value : undefined,
+    (key, value) => key === 'dd-api-key' ? undefined : value,
     process.env.DD_TRACE_BEAUTIFUL_LOGS ? 2 : undefined
   )
 }

package/packages/dd-trace/src/external-logger/src/index.js

@@ -5,7 +5,7 @@ const https = require('https')
 class ExternalLogger {
   // Note: these attribute names match the corresponding entry in the JSON payload.
   constructor ({
-    ddsource, hostname, service, apiKey, site = 'datadoghq.com', interval = 10000, timeout = 2000, limit = 1000
+    ddsource, hostname, service, apiKey, site = 'datadoghq.com', interval = 10_000, timeout = 2000, limit = 1000
   }) {
     this.enabled = !!apiKey
 
@@ -128,10 +128,10 @@ class ExternalLogger {
 }
 
 class NoopExternalLogger {
-  log () { }
-  enqueue () { }
-  shutdown () { }
-  flush () { }
+  log () {}
+  enqueue () {}
+  shutdown () {}
+  flush () {}
 }
 
 module.exports.ExternalLogger = ExternalLogger

package/packages/dd-trace/src/flare/file.js

@@ -22,11 +22,7 @@ class FlareFile extends Writable {
 
     this._reserve(length)
 
-    if (Buffer.isBuffer(chunk)) {
-      this.length += chunk.copy(this._buffer, this.length)
-    } else {
-      this.length += this._buffer.write(chunk, encoding)
-    }
+    this.length += Buffer.isBuffer(chunk) ? chunk.copy(this._buffer, this.length) : this._buffer.write(chunk, encoding)
 
     callback()
   }

package/packages/dd-trace/src/format.js

@@ -224,7 +224,7 @@ function addTag (meta, metrics, key, value, nested) {
       meta[key] = value
       break
     case 'number':
-      if (isNaN(value)) break
+      if (Number.isNaN(value)) break
       metrics[key] = value
       break
     case 'boolean':

package/packages/dd-trace/src/git_properties.js

@@ -9,7 +9,7 @@ function removeUserSensitiveInfo (repositoryUrl) {
       return `${parsedUrl.origin}${parsedUrl.pathname}`
     }
     return repositoryUrl
-  } catch (e) {
+  } catch {
     // if protocol isn't https, no password will be used
     return repositoryUrl
   }

package/packages/dd-trace/src/id.js

@@ -2,7 +2,7 @@
 
 const { randomFillSync } = require('crypto')
 
-const UINT_MAX = 4294967296
+const UINT_MAX = 4_294_967_296
 
 const data = new Uint8Array(8 * 8192)
 const zeroId = new Uint8Array(8)
@@ -26,6 +26,10 @@ class Identifier {
       : toNumberString(this._buffer, radix)
   }
 
+  toBigInt () {
+    return Buffer.from(this._buffer).readBigUInt64BE(0)
+  }
+
   toBuffer () {
     return this._buffer
   }
@@ -61,12 +65,12 @@ function createBuffer (value) {
 
   const size = Math.ceil(value.length / 16) * 16
   const bytes = size / 2
-  const buffer = new Array(bytes)
+  const buffer = []
 
   value = value.padStart(size, '0')
 
   for (let i = 0; i < bytes; i++) {
-    buffer[i] = parseInt(value.substring(i * 2, i * 2 + 2), 16)
+    buffer[i] = Number.parseInt(value.slice(i * 2, i * 2 + 2), 16)
   }
 
   return buffer
@@ -86,7 +90,7 @@ function fromString (str, raddix) {
   const sign = pos
 
   while (pos < len) {
-    const chr = parseInt(str[pos++], raddix)
+    const chr = Number.parseInt(str[pos++], raddix)
 
     if (!(chr >= 0)) break // NaN
 
@@ -161,7 +165,7 @@ function pseudoRandom () {
 
 // Read a buffer to unsigned integer bytes.
 function readInt32 (buffer, offset) {
-  return (buffer[offset + 0] * 16777216) +
+  return (buffer[offset + 0] * 16_777_216) +
     (buffer[offset + 1] << 16) +
     (buffer[offset + 2] << 8) +
     buffer[offset + 3]
@@ -178,4 +182,6 @@ function writeUInt32BE (buffer, value, offset) {
   buffer[0 + offset] = value & 255
 }
 
-module.exports = (value, radix) => new Identifier(value, radix)
+module.exports = function createIdentifier (value, radix) {
+  return new Identifier(value, radix)
+}

package/packages/dd-trace/src/iitm.js

@@ -1,27 +1,15 @@
 'use strict'
 
-const satisfies = require('semifies')
-const logger = require('./log')
 const { addHook } = require('import-in-the-middle')
 const dc = require('dc-polyfill')
 
-if (satisfies(process.versions.node, '>=14.13.1')) {
-  const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
-  addHook((name, namespace) => {
-    if (moduleLoadStartChannel.hasSubscribers) {
-      moduleLoadStartChannel.publish({
-        filename: name,
-        module: namespace
-      })
-    }
-  })
-  module.exports = require('import-in-the-middle')
-} else {
-  logger.warn('ESM is not fully supported by this version of Node.js, ' +
-    'so dd-trace will not intercept ESM loading.')
-  module.exports = () => ({
-    unhook: () => {}
-  })
-  module.exports.addHook = () => {}
-  module.exports.removeHook = () => {}
-}
+const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
+addHook((name, namespace) => {
+  if (moduleLoadStartChannel.hasSubscribers) {
+    moduleLoadStartChannel.publish({
+      filename: name,
+      module: namespace
+    })
+  }
+})
+module.exports = require('import-in-the-middle')

package/packages/dd-trace/src/lambda/handler.js

@@ -25,11 +25,11 @@ let __lambdaTimeout
 function checkTimeout (context) {
   const remainingTimeInMillis = context.getRemainingTimeInMillis()
 
-  let apmFlushDeadline = parseInt(process.env.DD_APM_FLUSH_DEADLINE_MILLISECONDS) || 100
+  let apmFlushDeadline = Number.parseInt(process.env.DD_APM_FLUSH_DEADLINE_MILLISECONDS) || 100
   apmFlushDeadline = apmFlushDeadline < 0 ? 100 : apmFlushDeadline
 
   __lambdaTimeout = setTimeout(() => {
-    timeoutChannel.publish(undefined)
+    timeoutChannel.publish()
   }, remainingTimeInMillis - apmFlushDeadline)
 }
 
@@ -43,14 +43,14 @@ function checkTimeout (context) {
  */
 function crashFlush () {
   const activeSpan = tracer.scope().active()
-  if (activeSpan !== null) {
+  if (activeSpan === null) {
+    log.debug('An impending timeout was reached, but no root span was found. No error will be tagged.')
+  } else {
     const error = new ImpendingTimeout('Datadog detected an impending timeout')
     activeSpan.addTags({
       [ERROR_MESSAGE]: error.message,
       [ERROR_TYPE]: error.name
     })
-  } else {
-    log.debug('An impending timeout was reached, but no root span was found. No error will be tagged.')
   }
 
   tracer._processor.killAll()
@@ -70,7 +70,7 @@ function extractContext (args) {
   if (context === undefined || context.getRemainingTimeInMillis === undefined) {
     context = args.length > 2 ? args[2] : undefined
     if (context === undefined || context.getRemainingTimeInMillis === undefined) {
-      throw Error('Could not extract context')
+      throw new Error('Could not extract context')
     }
   }
   return context

package/packages/dd-trace/src/lambda/runtime/patch.js

@@ -60,7 +60,10 @@ function patchLambdaHandler (lambdaHandler) {
 const lambdaTaskRoot = process.env.LAMBDA_TASK_ROOT
 const originalLambdaHandler = process.env.DD_LAMBDA_HANDLER
 
-if (originalLambdaHandler !== undefined) {
+if (originalLambdaHandler === undefined) {
+  // Instrumentation is done manually.
+  addHook({ name: 'datadog-lambda-js' }, patchDatadogLambdaModule)
+} else {
   const [moduleRoot, moduleAndHandler] = _extractModuleRootAndHandler(originalLambdaHandler)
   const [_module, handlerPath] = _extractModuleNameAndHandlerPath(moduleAndHandler)
 
@@ -70,7 +73,4 @@ if (originalLambdaHandler !== undefined) {
   for (const lambdaFilePath of lambdaFilePaths) {
     addHook({ name: lambdaFilePath }, patchLambdaModule(handlerPath))
   }
-} else {
-  // Instrumentation is done manually.
-  addHook({ name: 'datadog-lambda-js' }, patchDatadogLambdaModule)
 }

package/packages/dd-trace/src/lambda/runtime/ritm.js

@@ -31,7 +31,7 @@ const {
  */
 function _extractModuleRootAndHandler (fullHandler) {
   const handlerString = path.basename(fullHandler)
-  const moduleRoot = fullHandler.substring(0, fullHandler.indexOf(handlerString))
+  const moduleRoot = fullHandler.slice(0, Math.max(0, fullHandler.indexOf(handlerString)))
 
   return [moduleRoot, handlerString]
 }