dd-trace 5.53.0 → 5.54.0

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]
 }

package/packages/dd-trace/src/llmobs/plugins/bedrockruntime.js

@@ -9,7 +9,7 @@ const {
   parseModelId
 } = require('../../../../datadog-plugin-aws-sdk/src/services/bedrockruntime/utils')
 
-const ENABLED_OPERATIONS = ['invokeModel']
+const ENABLED_OPERATIONS = new Set(['invokeModel'])
 
 const requestIdsToTokens = {}
 
@@ -21,7 +21,7 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
       const request = response.request
       const operation = request.operation
       // avoids instrumenting other non supported runtime operations
-      if (!ENABLED_OPERATIONS.includes(operation)) {
+      if (!ENABLED_OPERATIONS.has(operation)) {
         return
       }
       const { modelProvider, modelName } = parseModelId(request.params.modelId)
@@ -40,8 +40,8 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
       const outputTokenCount = headers['x-amzn-bedrock-output-token-count']
 
       requestIdsToTokens[requestId] = {
-        inputTokensFromHeaders: inputTokenCount && parseInt(inputTokenCount),
-        outputTokensFromHeaders: outputTokenCount && parseInt(outputTokenCount)
+        inputTokensFromHeaders: inputTokenCount && Number.parseInt(inputTokenCount),
+        outputTokensFromHeaders: outputTokenCount && Number.parseInt(outputTokenCount)
       }
     })
   }
@@ -64,8 +64,8 @@ class BedrockRuntimeLLMObsPlugin extends BaseLLMObsPlugin {
 
     // add metadata tags
     this._tagger.tagMetadata(span, {
-      temperature: parseFloat(requestParams.temperature) || 0.0,
-      max_tokens: parseInt(requestParams.maxTokens) || 0
+      temperature: Number.parseFloat(requestParams.temperature) || 0,
+      max_tokens: Number.parseInt(requestParams.maxTokens) || 0
     })
 
     // add I/O tags

package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chain.js

@@ -5,16 +5,12 @@ const { spanHasError } = require('../../../util')
 
 class LangChainLLMObsChainHandler extends LangChainLLMObsHandler {
   setMetaTags ({ span, inputs, results }) {
-    let input, output
+    let input
     if (inputs) {
       input = this.formatIO(inputs)
     }
 
-    if (!results || spanHasError(span)) {
-      output = ''
-    } else {
-      output = this.formatIO(results)
-    }
+    const output = !results || spanHasError(span) ? '' : this.formatIO(results)
 
     // chain spans will always be workflows
     this._tagger.tagTextIO(span, input, output)

package/packages/dd-trace/src/llmobs/plugins/langchain/handlers/chat_model.js

@@ -61,12 +61,12 @@ class LangChainLLMObsChatModelHandler extends LangChainLLMObsHandler {
 
         if (!isWorkflow && !tokensSetTopLevel) {
           const { tokens, runId } = this.checkTokenUsageFromAIMessage(chatCompletionMessage)
-          if (!tokensPerRunId[runId]) {
-            tokensPerRunId[runId] = tokens
-          } else {
+          if (tokensPerRunId[runId]) {
             tokensPerRunId[runId].inputTokens += tokens.inputTokens
             tokensPerRunId[runId].outputTokens += tokens.outputTokens
             tokensPerRunId[runId].totalTokens += tokens.totalTokens
+          } else {
+            tokensPerRunId[runId] = tokens
           }
         }
       }

package/packages/dd-trace/src/llmobs/plugins/langchain/index.js

@@ -9,8 +9,8 @@ const ANTHROPIC_PROVIDER_NAME = 'anthropic'
 const BEDROCK_PROVIDER_NAME = 'amazon_bedrock'
 const OPENAI_PROVIDER_NAME = 'openai'
 
-const SUPPORTED_INTEGRATIONS = ['openai']
-const LLM_SPAN_TYPES = ['llm', 'chat_model', 'embedding']
+const SUPPORTED_INTEGRATIONS = new Set(['openai'])
+const LLM_SPAN_TYPES = new Set(['llm', 'chat_model', 'embedding'])
 const LLM = 'llm'
 const WORKFLOW = 'workflow'
 const EMBEDDING = 'embedding'
@@ -94,18 +94,18 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
       span?.context()._tags[`langchain.request.${provider}.parameters.model_kwargs.max_tokens`]
 
     if (temperature) {
-      metadata.temperature = parseFloat(temperature)
+      metadata.temperature = Number.parseFloat(temperature)
     }
 
     if (maxTokens) {
-      metadata.maxTokens = parseInt(maxTokens)
+      metadata.maxTokens = Number.parseInt(maxTokens)
     }
 
     this._tagger.tagMetadata(span, metadata)
   }
 
   getKind (type, provider) {
-    if (LLM_SPAN_TYPES.includes(type)) {
+    if (LLM_SPAN_TYPES.has(type)) {
       const llmobsIntegration = this.getIntegrationName(type, provider)
 
       if (!this.isLLMIntegrationEnabled(llmobsIntegration)) {
@@ -129,7 +129,7 @@ class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
   }
 
   isLLMIntegrationEnabled (integration) {
-    return SUPPORTED_INTEGRATIONS.includes(integration) && pluginManager?._pluginsByName[integration]?.llmobs?._enabled
+    return SUPPORTED_INTEGRATIONS.has(integration) && pluginManager?._pluginsByName[integration]?.llmobs?._enabled
   }
 }
 

package/packages/dd-trace/src/llmobs/plugins/openai.js

@@ -105,7 +105,7 @@ class OpenAiLLMObsPlugin extends LLMObsPlugin {
     const embeddingInput = embeddingInputs.map(input => ({ text: input }))
 
     if (error) {
-      this._tagger.tagEmbeddingIO(span, embeddingInput, undefined)
+      this._tagger.tagEmbeddingIO(span, embeddingInput)
       return
     }
 

package/packages/dd-trace/src/llmobs/sdk.js

@@ -121,7 +121,7 @@ class LLMObs extends NoopLLMObs {
     }
 
     const kind = validateKind(options.kind) // will throw if kind is undefined or not an expected kind
-    let name = options.name || (fn?.name ? fn.name : undefined) || kind
+    let name = options.name || fn?.name || kind
 
     if (!name) {
       logger.warn('No span name provided for `wrap`. Defaulting to "unnamed-anonymous-function".')
@@ -285,7 +285,7 @@ class LLMObs extends NoopLLMObs {
       }
       if (!(span instanceof Span)) {
         err = 'invalid_span'
-        throw new Error('Span must be a valid Span object.')
+        throw new TypeError('Span must be a valid Span object.')
       }
       if (!LLMObsTagger.tagMap.has(span)) {
         err = 'invalid_span'