dd-trace 5.84.0 → 5.86.0

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

@@ -16,11 +16,11 @@ const entityReg = new RegExp(String.raw`.*(${uuidSource}|${containerSource}|${ta
 
 let inode = 0
 let cgroup = ''
-let entityId
+let containerId
 
 try {
   cgroup = fs.readFileSync('/proc/self/cgroup', 'utf8').trim()
-  entityId = cgroup.match(entityReg)?.[1]
+  containerId = cgroup.match(entityReg)?.[1]
 } catch { /* Ignore error */ }
 
 const inodePath = cgroup.match(lineReg)?.[3]
@@ -32,17 +32,21 @@ if (inodePath) {
   } catch { /* Ignore error */ }
 }
 
+const entityId = containerId ? `ci-${containerId}` : inode && `in-${inode}`
+
 module.exports = {
+  entityId,
+
   inject (carrier) {
-    if (entityId) {
-      carrier['Datadog-Container-Id'] = entityId
-      carrier['Datadog-Entity-ID'] = `ci-${entityId}`
+    if (containerId) {
+      carrier['Datadog-Container-Id'] = containerId
+      carrier['Datadog-Entity-ID'] = entityId
     } else if (inode) {
-      carrier['Datadog-Entity-ID'] = `in-${inode}`
+      carrier['Datadog-Entity-ID'] = entityId
     }
 
     if (DD_EXTERNAL_ENV) {
       carrier['Datadog-External-Env'] = DD_EXTERNAL_ENV
     }
-  }
+  },
 }

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

@@ -69,7 +69,7 @@ function request (data, options, callback) {
 
   options.agent = isSecure ? httpsAgent : httpAgent
 
-  const onResponse = res => {
+  const onResponse = (res, finalize) => {
     const chunks = []
 
     res.setTimeout(timeout)
@@ -77,8 +77,9 @@ function request (data, options, callback) {
     res.on('data', chunk => {
       chunks.push(chunk)
     })
+
     res.once('end', () => {
-      activeRequests--
+      finalize()
       const buffer = Buffer.concat(chunks)
 
       if (res.statusCode >= 200 && res.statusCode <= 299) {
@@ -127,31 +128,50 @@ function request (data, options, callback) {
 
     activeRequests++
 
-    const store = storage('legacy').getStore()
-
-    storage('legacy').enterWith({ noop: true })
+    storage('legacy').run({ noop: true }, () => {
+      let finished = false
+      const finalize = () => {
+        if (finished) return
+        finished = true
+        activeRequests--
+      }
 
-    const req = client.request(options, onResponse)
+      const req = client.request(options, (res) => onResponse(res, finalize))
 
-    req.once('error', err => {
-      activeRequests--
-      onError(err)
-    })
+      req.once('close', finalize)
+      req.once('timeout', finalize)
 
-    req.setTimeout(timeout, req.abort)
+      req.once('error', err => {
+        finalize()
+        onError(err)
+      })
 
-    if (isReadable) {
-      data.pipe(req) // TODO: Validate whether this is actually retriable.
-    } else {
-      dataArray.forEach(buffer => req.write(buffer))
-      req.end()
-    }
+      req.setTimeout(timeout, () => {
+        try {
+          if (typeof req.abort === 'function') {
+            req.abort()
+          } else {
+            req.destroy()
+          }
+        } catch {
+          // ignore
+        }
+      })
 
-    storage('legacy').enterWith(store)
+      if (isReadable) {
+        data.pipe(req) // TODO: Validate whether this is actually retriable.
+      } else {
+        for (const buffer of dataArray) req.write(buffer)
+        req.end()
+      }
+    })
   }
 
-  // TODO: Figure out why setTimeout is needed to avoid losing the async context
-  // in the retry request before socket.connect() is called.
+  // The setTimeout is needed to avoid losing the async context in the retry
+  // request before socket.connect() is called. This is a workaround for the
+  // issue that the AsyncLocalStorage.run() method does not call the
+  // AsyncLocalStorage.enterWith() method when not using AsyncContextFrame.
+  //
   // TODO: Test that this doesn't trace itself on retry when the diagnostics
   // channel events are available in the agent exporter.
   makeRequest(() => setTimeout(() => makeRequest(callback)))
@@ -164,7 +184,7 @@ function byteLength (data) {
 Object.defineProperty(request, 'writable', {
   get () {
     return activeRequests < maxActiveRequests
-  }
+  },
 })
 
 module.exports = request

package/packages/dd-trace/src/exporters/common/url-to-http-options-polyfill.js

@@ -18,7 +18,7 @@ module.exports = {
       search,
       pathname,
       path: `${pathname || ''}${search || ''}`,
-      href: url.href
+      href: url.href,
     }
     if (port !== '') {
       options.port = Number(port)
@@ -27,5 +27,5 @@ module.exports = {
       options.auth = `${decodeURIComponent(username)}:${decodeURIComponent(password)}`
     }
     return options
-  }
+  },
 }

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

@@ -26,10 +26,12 @@ class Writer {
 
   append (payload) {
     if (!request.writable) {
+      // eslint-disable-next-line eslint-rules/eslint-log-printf-style
       log.debug(() => `Maximum number of active requests reached. Payload discarded: ${safeJSONStringify(payload)}`)
       return
     }
 
+    // eslint-disable-next-line eslint-rules/eslint-log-printf-style
     log.debug(() => `Encoding payload: ${safeJSONStringify(payload)}`)
 
     this._encode(payload)

package/packages/dd-trace/src/exporters/span-stats/index.js

@@ -16,5 +16,5 @@ class SpanStatsExporter {
 }
 
 module.exports = {
-  SpanStatsExporter
+  SpanStatsExporter,
 }

package/packages/dd-trace/src/exporters/span-stats/writer.js

@@ -35,11 +35,11 @@ function makeRequest (data, url, cb) {
     headers: {
       'Datadog-Meta-Lang': 'javascript',
       'Datadog-Meta-Tracer-Version': pkg.version,
-      'Content-Type': 'application/msgpack'
+      'Content-Type': 'application/msgpack',
     },
     protocol: url.protocol,
     hostname: url.hostname,
-    port: url.port
+    port: url.port,
   }
 
   log.debug('Request to the intake: %j', options)
@@ -50,5 +50,5 @@ function makeRequest (data, url, cb) {
 }
 
 module.exports = {
-  Writer
+  Writer,
 }

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

@@ -6,7 +6,7 @@ const tracerLogger = require('../../log')// path to require tracer logger
 class ExternalLogger {
   // Note: these attribute names match the corresponding entry in the JSON payload.
   constructor ({
-    ddsource, hostname, service, apiKey, site = 'datadoghq.com', interval = 10_000, timeout = 2000, limit = 1000
+    ddsource, hostname, service, apiKey, site = 'datadoghq.com', interval = 10_000, timeout = 2000, limit = 1000,
   }) {
     this.enabled = !!apiKey
 
@@ -22,7 +22,7 @@ class ExternalLogger {
     this.intake = `http-intake.logs.${this.site}`
     this.headers = {
       'DD-API-KEY': apiKey,
-      'Content-Type': 'application/json'
+      'Content-Type': 'application/json',
     }
     this.timer = setInterval(() => {
       this.flush()
@@ -56,7 +56,7 @@ class ExternalLogger {
       hostname: log.hostname || this.hostname,
       ddsource: log.ddsource || this.ddsource,
       service: log.service || this.service,
-      ddtags: logTags || undefined
+      ddtags: logTags || undefined,
     }
 
     this.enqueue(payload)
@@ -104,7 +104,7 @@ class ExternalLogger {
       path: this.endpoint,
       method: 'POST',
       headers: this.headers,
-      timeout: this.timeout
+      timeout: this.timeout,
     }
 
     const req = https.request(options, (res) => {

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

@@ -19,7 +19,7 @@ const logger = {
   debug: (msg) => recordLog(msg),
   info: (msg) => recordLog(msg),
   warn: (msg) => recordLog(msg),
-  error: (err) => recordLog(err.stack)
+  error: (err) => recordLog(err.stack),
 }
 
 const flare = {
@@ -80,13 +80,13 @@ const flare = {
       port: tracerConfig.port,
       method: 'POST',
       path: '/tracer_flare/v1',
-      headers: form.getHeaders()
+      headers: form.getHeaders(),
     }, (err) => {
       if (err) {
         log.error('Error sending flare payload', err)
       }
     })
-  }
+  },
 }
 
 function recordLog (msg) {

package/packages/dd-trace/src/guardrails/telemetry.js

@@ -74,7 +74,7 @@ function sendTelemetry (name, tags, resultMetadata) {
     }
   }
 
-  var proc = spawn(process.env.DD_TELEMETRY_FORWARDER_PATH, ['library_entrypoint'], {
+  var proc = spawn(telemetryForwarderPath, ['library_entrypoint'], {
     stdio: 'pipe'
   })
   proc.on('error', function () {

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

@@ -54,5 +54,5 @@ module.exports = {
     } catch (e) {
       log.error('Failed to write heap snapshots to %s.', destination, e)
     }
-  }
+  },
 }

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

@@ -204,7 +204,7 @@ function pseudoRandom () {
     data[offset + 4],
     data[offset + 5],
     data[offset + 6],
-    data[offset + 7]
+    data[offset + 7],
   ]
 }
 
@@ -243,5 +243,5 @@ function writeUInt32BE (buffer, value, offset) {
  * @returns {Identifier}
  */
 module.exports = function createIdentifier (value, radix) {
-  return new Identifier(value, radix)
+  return new Identifier(value ?? '', radix)
 }

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

@@ -8,7 +8,7 @@ addHook((name, namespace) => {
   if (moduleLoadStartChannel.hasSubscribers) {
     moduleLoadStartChannel.publish({
       filename: name,
-      module: namespace
+      module: namespace,
     })
   }
 })

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

@@ -0,0 +1,27 @@
+'use strict'
+
+const log = require('../log')
+
+/**
+ * Extracts the context from the given Lambda handler arguments.
+ *
+ * It is possible for users to define a lambda function without specifying a
+ * context arg. In these cases, this function returns null instead of throwing
+ * an error.
+ *
+ * @param {unknown[]} args any amount of arguments
+ * @returns {object | null}
+ */
+exports.extractContext = function extractContext (args) {
+  let context = null
+  for (let i = 0; i < args.length && i < 3; i++) {
+    if (args[i] && typeof args[i].getRemainingTimeInMillis === 'function') {
+      context = args[i]
+      break
+    }
+  }
+  if (!context) {
+    log.debug('Unable to extract context object from Lambda handler arguments')
+  }
+  return context
+}

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

@@ -5,6 +5,7 @@ const { channel } = require('../../../datadog-instrumentations/src/helpers/instr
 const { ERROR_MESSAGE, ERROR_TYPE } = require('../constants')
 const { getValueFromEnvSources } = require('../config/helper')
 const { ImpendingTimeout } = require('./runtime/errors')
+const { extractContext } = require('./context')
 
 const globalTracer = global._ddtrace
 const tracer = globalTracer._tracer
@@ -50,7 +51,7 @@ function crashFlush () {
     const error = new ImpendingTimeout('Datadog detected an impending timeout')
     activeSpan.addTags({
       [ERROR_MESSAGE]: error.message,
-      [ERROR_TYPE]: error.name
+      [ERROR_TYPE]: error.name,
     })
   }
 
@@ -60,23 +61,6 @@ function crashFlush () {
   }
 }
 
-/**
- * Extracts the context from the given Lambda handler arguments.
- *
- * @param {unknown[]} args any amount of arguments
- * @returns the context, if extraction was succesful.
- */
-function extractContext (args) {
-  let context = args.length > 1 ? args[1] : undefined
-  if (context === undefined || context.getRemainingTimeInMillis === undefined) {
-    context = args.length > 2 ? args[2] : undefined
-    if (context === undefined || context.getRemainingTimeInMillis === undefined) {
-      throw new Error('Could not extract context')
-    }
-  }
-  return context
-}
-
 /**
  * Patches your AWS Lambda handler function to add some tracing support.
  *
@@ -86,7 +70,10 @@ exports.datadog = function datadog (lambdaHandler) {
   return (...args) => {
     const context = extractContext(args)
 
-    checkTimeout(context)
+    if (context) {
+      checkTimeout(context)
+    }
+
     const result = lambdaHandler.apply(this, args)
     if (result && typeof result.then === 'function') {
       return result.then((res) => {

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

@@ -16,5 +16,5 @@ class ImpendingTimeout extends ExtendedError {}
 ImpendingTimeout.prototype.name = 'Impending Timeout'
 
 module.exports = {
-  ImpendingTimeout
+  ImpendingTimeout,
 }

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

@@ -15,7 +15,7 @@ const Hook = require('../../../../datadog-instrumentations/src/helpers/hook')
 const instrumentations = require('../../../../datadog-instrumentations/src/helpers/instrumentations')
 const {
   filename,
-  pathSepExpr
+  pathSepExpr,
 } = require('../../../../datadog-instrumentations/src/helpers/register')
 
 /**
@@ -69,7 +69,7 @@ function _getLambdaFilePaths (lambdaStylePath) {
   return [
     `${lambdaStylePath}.js`,
     `${lambdaStylePath}.mjs`,
-    `${lambdaStylePath}.cjs`
+    `${lambdaStylePath}.cjs`,
   ]
 }
 
@@ -129,5 +129,5 @@ module.exports = {
   _extractModuleRootAndHandler,
   _extractModuleNameAndHandlerPath,
   _getLambdaFilePaths,
-  registerLambdaHook
+  registerLambdaHook,
 }

package/packages/dd-trace/src/llmobs/constants/tags.js

@@ -49,5 +49,5 @@ module.exports = {
   INSTRUMENTATION_METHOD_UNKNOWN: 'unknown',
 
   ROUTING_API_KEY: '_dd.llmobs.routing.api_key',
-  ROUTING_SITE: '_dd.llmobs.routing.site'
+  ROUTING_SITE: '_dd.llmobs.routing.site',
 }

package/packages/dd-trace/src/llmobs/constants/text.js

@@ -2,5 +2,5 @@
 
 module.exports = {
   DROPPED_VALUE_TEXT: "[This value has been dropped because this span's size exceeds the 1MB size limit.]",
-  UNSERIALIZABLE_VALUE_TEXT: 'Unserializable value'
+  UNSERIALIZABLE_VALUE_TEXT: 'Unserializable value',
 }

package/packages/dd-trace/src/llmobs/constants/writers.js

@@ -13,5 +13,5 @@ module.exports = {
   EVALUATIONS_ENDPOINT: '/api/intake/llm-obs/v1/eval-metric',
 
   EVP_PAYLOAD_SIZE_LIMIT: 5 << 20, // 5MB (actual limit is 5.1MB)
-  EVP_EVENT_SIZE_LIMIT: (1 << 20) - 1024 // 999KB (actual limit is 1MB)
+  EVP_EVENT_SIZE_LIMIT: (1 << 20) - 1024, // 999KB (actual limit is 1MB)
 }

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

@@ -1,14 +1,12 @@
 'use strict'
 
-const util = require('node:util')
-
 const { channel } = require('dc-polyfill')
 
 const log = require('../log')
 const {
   ML_APP,
   PROPAGATED_ML_APP_KEY,
-  PROPAGATED_PARENT_ID_KEY
+  PROPAGATED_PARENT_ID_KEY,
 } = require('./constants/tags')
 const { storage } = require('./storage')
 const telemetry = require('./telemetry')
@@ -78,7 +76,7 @@ function enable (config) {
     spanWriter?.setAgentless(useAgentless)
 
     telemetry.recordLLMObsEnabled(startTime, config)
-    log.debug(`[LLMObs] Enabled LLM Observability with configuration: ${util.inspect(config.llmobs)}`)
+    log.debug('[LLMObs] Enabled LLM Observability with configuration: %o', config.llmobs)
   })
 }
 

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

@@ -39,7 +39,7 @@ class NoopLLMObs {
     const llmobs = this
     return function (target, ctxOrPropertyKey, descriptor) {
       if (!ctxOrPropertyKey) return target
-      if (typeof ctxOrPropertyKey === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
+      if (typeof ctxOrPropertyKey === 'object') {
         const ctx = ctxOrPropertyKey
         if (ctx.kind !== 'method') return target
 
@@ -59,7 +59,7 @@ class NoopLLMObs {
       const original = target[propertyKey]
       Object.defineProperty(target, propertyKey, {
         ...Object.getOwnPropertyDescriptor(target, propertyKey),
-        value: llmobs.wrap({ name: propertyKey, _decorator: true, ...options }, original)
+        value: llmobs.wrap({ name: propertyKey, _decorator: true, ...options }, original),
       })
 
       return target

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

@@ -17,7 +17,7 @@ const {
   getGenerationMetadata,
   getToolNameFromTags,
   getToolCallResultContent,
-  getLlmObsSpanName
+  getLlmObsSpanName,
 } = require('./util')
 
 /**
@@ -67,7 +67,7 @@ const SPAN_NAME_TO_KIND_MAPPING = {
   doGenerate: 'llm',
   doStream: 'llm',
   // tools
-  toolCall: 'tool'
+  toolCall: 'tool',
 }
 
 class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
@@ -217,7 +217,7 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
     const usage = tags['ai.usage.tokens']
     this._tagger.tagMetrics(span, {
       inputTokens: usage,
-      totalTokens: usage
+      totalTokens: usage,
     })
   }
 
@@ -304,14 +304,14 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
         arguments: toolCallArgs,
         name,
         toolId: toolCall.toolCallId,
-        type: toolCall.toolCallType ?? 'function'
+        type: toolCall.toolCallType ?? 'function',
       })
     }
 
     return {
       role: 'assistant',
       content: outputMessageText,
-      toolCalls: formattedToolCalls
+      toolCalls: formattedToolCalls,
     }
   }
 
@@ -358,14 +358,14 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
             arguments: part.args ?? part.input,
             name,
             toolId: part.toolCallId,
-            type: 'function'
+            type: 'function',
           })
         }
       }
 
       const finalMessage = {
         role,
-        content: finalContent
+        content: finalContent,
       }
 
       if (toolCalls.length) {
@@ -382,7 +382,7 @@ class VercelAILLMObsPlugin extends BaseLLMObsPlugin {
           finalMessages.push({
             role,
             content: safeResult,
-            toolId: part.toolCallId
+            toolId: part.toolCallId,
           })
         }
       }

package/packages/dd-trace/src/llmobs/plugins/ai/util.js

@@ -7,7 +7,7 @@ const MODEL_METADATA_KEYS = new Set([
   'temperature',
   'top_p',
   'top_k',
-  'stop_sequences'
+  'stop_sequences',
 ])
 
 /**
@@ -214,5 +214,5 @@ module.exports = {
   getGenerationMetadata,
   getToolNameFromTags,
   getToolCallResultContent,
-  getLlmObsSpanName
+  getLlmObsSpanName,
 }

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

@@ -114,7 +114,7 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
     return {
       kind: 'llm',
       modelName: model,
-      modelProvider: 'anthropic'
+      modelProvider: 'anthropic',
     }
   }
 
@@ -162,7 +162,7 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
             name,
             arguments: input,
             toolId: id,
-            type
+            type,
           }
 
           inputMessages.push({ content: text ?? '', role, toolCalls: [toolCall] })
@@ -172,7 +172,7 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
           const toolResult = {
             result: formattedContent,
             toolId: block.tool_use_id,
-            type: 'tool_result'
+            type: 'tool_result',
           }
 
           inputMessages.push({ content: '', role, toolResults: [toolResult] })
@@ -210,7 +210,7 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
           name: block.name,
           arguments: input,
           toolId: block.id,
-          type: block.type
+          type: block.type,
         }
 
         outputMessages.push({ content: text ?? '', role, toolCalls: [toolCall] })
@@ -243,7 +243,7 @@ class AnthropicLLMObsPlugin extends LLMObsPlugin {
     const cacheReadTokens = usage.cache_read_input_tokens
 
     const metrics = {
-      inputTokens: (inputTokens ?? 0) + (cacheWriteTokens ?? 0) + (cacheReadTokens ?? 0)
+      inputTokens: (inputTokens ?? 0) + (cacheWriteTokens ?? 0) + (cacheReadTokens ?? 0),
     }
 
     if (outputTokens) metrics.outputTokens = outputTokens

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

@@ -46,7 +46,7 @@ class LLMObsPlugin extends TracingPlugin {
       this._tagger.registerLLMObsSpan(span, {
         parent: parentStore?.span,
         integration: this.constructor.integration,
-        ...registerOptions
+        ...registerOptions,
       })
     }
   }