dd-trace 5.82.0 → 5.84.0

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

@@ -1,8 +1,7 @@
 'use strict'
 
 const { workerData: { config: parentConfig, parentThreadId, configPort } } = require('node:worker_threads')
-const { format } = require('node:url')
-const defaults = require('../../config_defaults')
+const { getAgentUrl } = require('../../agent/url')
 const log = require('./log')
 
 const config = module.exports = {
@@ -19,11 +18,7 @@ configPort.on('messageerror', (err) =>
 )
 
 function updateUrl (updates) {
-  config.url = updates.url || format({
-    protocol: 'http:',
-    hostname: updates.hostname || defaults.hostname,
-    port: updates.port
-  })
+  config.url = getAgentUrl(updates)
 
   config.dynamicInstrumentation.captureTimeoutNs = BigInt(updates.dynamicInstrumentation.captureTimeoutMs) * 1_000_000n
 }

package/packages/dd-trace/src/debugger/devtools_client/json-buffer.js

@@ -11,26 +11,25 @@ class JSONBuffer {
     this.#maxSize = size
     this.#timeout = timeout
     this.#onFlush = onFlush
-    this.#reset()
-  }
-
-  #reset () {
-    clearTimeout(this.#timer)
-    this.#timer = undefined
-    this.#partialJson = undefined
   }
 
   #flush () {
     const json = `${this.#partialJson}]`
-    this.#reset()
+    this.#partialJson = undefined
     this.#onFlush(json)
   }
 
   write (str, size = Buffer.byteLength(str)) {
-    if (this.#timer === undefined) {
+    if (this.#partialJson === undefined) {
       this.#partialJson = `[${str}`
-      this.#timer = setTimeout(() => this.#flush(), this.#timeout)
-    } else if (Buffer.byteLength(/** @type {string} */ (this.#partialJson)) + size + 2 > this.#maxSize) {
+      if (this.#timer === undefined) {
+        this.#timer = setTimeout(() => this.#flush(), this.#timeout)
+      } else {
+        this.#timer.refresh()
+      }
+    } else if (Buffer.byteLength(this.#partialJson) + size + 2 > this.#maxSize) {
+      clearTimeout(this.#timer)
+      this.#timer = undefined
       this.#flush()
       this.write(str, size)
     } else {

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

@@ -6,7 +6,7 @@ const { stringify } = require('querystring')
 const request = require('../../exporters/common/request')
 const { GIT_COMMIT_SHA, GIT_REPOSITORY_URL } = require('../../plugins/util/tags')
 const { version } = require('../../../../../package.json')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 const log = require('./log')
 const JSONBuffer = require('./json-buffer')
 const config = require('./config')
@@ -23,8 +23,8 @@ const hostname = getHostname()
 const service = config.service
 
 const ddtags = [
-  ['env', getEnvironmentVariable('DD_ENV')],
-  ['version', getEnvironmentVariable('DD_VERSION')],
+  ['env', getValueFromEnvSources('DD_ENV')],
+  ['version', getValueFromEnvSources('DD_VERSION')],
   ['debugger_version', version],
   ['host_name', hostname],
   [GIT_COMMIT_SHA, config.commitSHA],

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../../config-helper')
+const { getEnvironmentVariable } = require('../../../config/helper')
 
 const largeObjectSkipThreshold = Number(
   getEnvironmentVariable('_DD_DYNAMIC_INSTRUMENTATION_EXPERIMENTAL_LARGE_OBJECT_SKIP_THRESHOLD')

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

@@ -10,26 +10,49 @@ const getDebuggerConfig = require('./config')
 let worker = null
 let configChannel = null
 let ackId = 0
+let rcAckCallbacks = null
+let rc = null
 
 // eslint-disable-next-line eslint-rules/eslint-process-env
 const { NODE_OPTIONS, ...env } = process.env
 
 module.exports = {
+  isStarted,
   start,
-  configure
+  configure,
+  stop
 }
 
-function start (config, rc) {
+/**
+ * Check if the Debugger worker is currently running
+ *
+ * @returns {boolean} True if the worker is started, false otherwise
+ */
+function isStarted () {
+  return worker !== null
+}
+
+/**
+ * Start the Debugger worker thread.
+ * Creates a worker thread, sets up message channels, and registers
+ * the LIVE_DEBUGGING product handler with remote config.
+ * Does nothing if the worker is already started.
+ *
+ * @param {object} config - The tracer configuration object
+ * @param {object} rcInstance - The RemoteConfig instance
+ */
+function start (config, rcInstance) {
   if (worker !== null) return
 
   log.debug('[debugger] Starting Dynamic Instrumentation client...')
 
-  const rcAckCallbacks = new Map()
+  rc = rcInstance
+  rcAckCallbacks = new Map()
   const probeChannel = new MessageChannel()
   const logChannel = new MessageChannel()
   configChannel = new MessageChannel()
 
-  process[Symbol.for('datadog:node:util:types')] = types
+  globalThis[Symbol.for('dd-trace')].utilTypes = types
 
   readProbeFile(config.dynamicInstrumentation.probeFile, (probes) => {
     const action = 'apply'
@@ -84,19 +107,10 @@ function start (config, rc) {
   worker.on('error', (err) => log.error('[debugger] worker thread error', err))
   worker.on('messageerror', (err) => log.error('[debugger] received "messageerror" from worker', err))
 
-  worker.on('exit', (code) => {
+  worker.once('exit', (code) => {
     const error = new Error(`Dynamic Instrumentation worker thread exited unexpectedly with code ${code}`)
-
     log.error('[debugger] worker thread exited unexpectedly', error)
-
-    // Be nice, clean up now that the worker thread encountered an issue and we can't continue
-    rc.removeProductHandler('LIVE_DEBUGGING')
-    worker.removeAllListeners()
-    configChannel = null
-    for (const ackId of rcAckCallbacks.keys()) {
-      rcAckCallbacks.get(ackId)(error)
-      rcAckCallbacks.delete(ackId)
-    }
+    cleanup(error) // Be nice, clean up now that the worker thread encountered an issue and we can't continue
   })
 
   worker.unref()
@@ -108,11 +122,65 @@ function start (config, rc) {
   configChannel.port2.unref()
 }
 
+/**
+ * Reconfigure the Debugger worker with updated settings.
+ * Sends the new configuration to the worker thread via the config channel.
+ * Does nothing if the worker is not started.
+ *
+ * @param {object} config - The updated tracer configuration object
+ */
 function configure (config) {
   if (configChannel === null) return
   configChannel.port2.postMessage(getDebuggerConfig(config))
 }
 
+/**
+ * Stop the Debugger worker thread.
+ * Terminates the worker and cleans up resources.
+ * Safe to call even if the worker is not started.
+ */
+function stop () {
+  if (worker === null) return
+
+  log.debug('[debugger] Stopping Dynamic Instrumentation client...')
+
+  try {
+    worker.terminate()
+    cleanup() // Graceful shutdown - termination succeeded
+  } catch (err) {
+    log.error('[debugger] Error terminating worker', err)
+    cleanup(err) // Cleanup with error - termination failed
+  }
+}
+
+/**
+ * Internal cleanup function to reset all debugger resources.
+ * Called when stopping the debugger or when the worker exits unexpectedly.
+ *
+ * @param {Error} [error] - Optional error to pass to pending ack callbacks (for unexpected exits)
+ */
+function cleanup (error) {
+  if (rc) {
+    rc.removeProductHandler('LIVE_DEBUGGING')
+    rc = null
+  }
+  if (worker) {
+    worker.removeAllListeners()
+    worker = null
+  }
+  configChannel = null
+
+  // Call any pending ack callbacks
+  // Pass error for unexpected exits, or undefined for graceful shutdown
+  if (rcAckCallbacks) {
+    for (const ackId of rcAckCallbacks.keys()) {
+      rcAckCallbacks.get(ackId)(error)
+      rcAckCallbacks.delete(ackId)
+    }
+    rcAckCallbacks = null
+  }
+}
+
 function readProbeFile (path, cb) {
   if (!path) return
 

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

@@ -3,12 +3,12 @@
 const lookup = require('dns').lookup // cache to avoid instrumentation
 const dgram = require('dgram')
 const isIP = require('net').isIP
-const { URL, format } = require('url')
 
 const request = require('./exporters/common/request')
 const log = require('./log')
 const Histogram = require('./histogram')
-const defaults = require('./config_defaults')
+const defaults = require('./config/defaults')
+const { getAgentUrl } = require('./agent/url')
 
 const MAX_BUFFER_SIZE = 1024 // limit from the agent
 
@@ -179,14 +179,8 @@ class DogStatsDClient {
       tags
     }
 
-    if (config.url) {
-      clientConfig.metricsProxyUrl = config.url
-    } else if (config.port) {
-      clientConfig.metricsProxyUrl = new URL(format({
-        protocol: 'http:',
-        hostname: config.hostname || defaults.hostname,
-        port: config.port
-      }))
+    if (config.url || config.port) {
+      clientConfig.metricsProxyUrl = getAgentUrl(config)
     }
 
     return clientConfig
@@ -360,7 +354,7 @@ class CustomMetrics {
     // TODO(bengl) this magic number should be configurable
     setInterval(flush, 10 * 1000).unref()
 
-    process.once('beforeExit', flush)
+    globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(flush)
   }
 
   increment (stat, value = 1, tags) {

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

@@ -4,7 +4,7 @@ const { MsgpackChunk, MsgpackEncoder } = require('../msgpack')
 const log = require('../log')
 const { isTrue } = require('../util')
 const { memoize } = require('../log/utils')
-const { getEnvironmentVariable } = require('../config-helper')
+const { getValueFromEnvSources } = require('../config/helper')
 const { truncateSpan, normalizeSpan } = require('./tags-processors')
 
 const SOFT_LIMIT = 8 * 1024 * 1024 // 8MB
@@ -31,7 +31,7 @@ class AgentEncoder {
     this._stringBytes = new MsgpackChunk()
     this._writer = writer
     this._reset()
-    this._debugEncoding = isTrue(getEnvironmentVariable('DD_TRACE_ENCODING_DEBUG'))
+    this._debugEncoding = isTrue(getValueFromEnvSources('DD_TRACE_ENCODING_DEBUG'))
     this._config = this._writer?._config
   }
 

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

@@ -2,7 +2,7 @@
 
 const fs = require('fs')
 const exporters = require('../../../ext/exporters')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const constants = require('./constants')
 
 module.exports = function getExporter (name) {

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const { URL, format } = require('url')
+const { URL } = require('url')
 const log = require('../../log')
-const defaults = require('../../config_defaults')
+const { getAgentUrl } = require('../../agent/url')
 const Writer = require('./writer')
 
 class AgentExporter {
@@ -10,12 +10,8 @@ class AgentExporter {
 
   constructor (config, prioritySampler) {
     this._config = config
-    const { url, hostname = defaults.hostname, port, lookup, protocolVersion, stats = {}, apmTracingEnabled } = config
-    this._url = url || new URL(format({
-      protocol: 'http:',
-      hostname,
-      port
-    }))
+    const { lookup, protocolVersion, stats = {}, apmTracingEnabled } = config
+    this._url = getAgentUrl(config)
 
     const headers = {}
     if (stats.enabled || apmTracingEnabled === false) {
@@ -31,9 +27,7 @@ class AgentExporter {
       config
     })
 
-    process.once('beforeExit', () => {
-      this.flush()
-    })
+    globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(this.flush.bind(this))
   }
 
   setUrl (url) {

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

@@ -1,5 +1,7 @@
 'use strict'
 
+const { inspect } = require('util')
+
 const request = require('../common/request')
 const { startupLog } = require('../../startup-log')
 const runtimeMetrics = require('../../runtime_metrics')
@@ -10,8 +12,9 @@ const BaseWriter = require('../common/writer')
 const METRIC_PREFIX = 'datadog.tracer.node.exporter.agent'
 
 class AgentWriter extends BaseWriter {
-  constructor ({ prioritySampler, lookup, protocolVersion, headers, config = {} }) {
-    super(...arguments)
+  constructor (...args) {
+    super(...args)
+    const { prioritySampler, lookup, protocolVersion, headers, config = {} } = args[0]
     const AgentEncoder = getEncoder(protocolVersion)
 
     this._prioritySampler = prioritySampler
@@ -26,7 +29,10 @@ class AgentWriter extends BaseWriter {
     runtimeMetrics.increment(`${METRIC_PREFIX}.requests`, true)
 
     const { _headers, _lookup, _protocolVersion, _url } = this
-    makeRequest(_protocolVersion, data, count, _url, _headers, _lookup, true, (err, res, status) => {
+    makeRequest(_protocolVersion, data, count, _url, _headers, _lookup, (err, res, status) => {
+      // Note that logging will only happen once, regardless of how many times this is called.
+      startupLog(status !== 404 && status !== 200 ? { status, message: err?.message ?? inspect(err) } : undefined)
+
       if (status) {
         runtimeMetrics.increment(`${METRIC_PREFIX}.responses`, true)
         runtimeMetrics.increment(`${METRIC_PREFIX}.responses.by.status`, `status:${status}`, true)
@@ -39,8 +45,6 @@ class AgentWriter extends BaseWriter {
         }
       }
 
-      startupLog({ agentError: err })
-
       if (err) {
         log.errorWithoutTelemetry('Error sending payload to the agent (status code: %s)', err.status, err)
         done()
@@ -68,7 +72,7 @@ function getEncoder (protocolVersion) {
     : require('../../encode/0.4').AgentEncoder
 }
 
-function makeRequest (version, data, count, url, headers, lookup, needsStartupLog, cb) {
+function makeRequest (version, data, count, url, headers, lookup, cb) {
   const options = {
     path: `/v${version}/traces`,
     method: 'PUT',
@@ -79,7 +83,7 @@ function makeRequest (version, data, count, url, headers, lookup, needsStartupLo
       'X-Datadog-Trace-Count': String(count),
       'Datadog-Meta-Lang': 'nodejs',
       'Datadog-Meta-Lang-Version': process.version,
-      'Datadog-Meta-Lang-Interpreter': process.jsEngine || 'v8'
+      'Datadog-Meta-Lang-Interpreter': process.versions.bun ? 'JavaScriptCore' : 'v8'
     },
     lookup,
     url
@@ -87,15 +91,7 @@ function makeRequest (version, data, count, url, headers, lookup, needsStartupLo
 
   log.debug('Request to the agent: %j', options)
 
-  request(data, options, (err, res, status) => {
-    if (needsStartupLog) {
-      // Note that logging will only happen once, regardless of how many times this is called.
-      startupLog({
-        agentError: status !== 404 && status !== 200 ? err : undefined
-      })
-    }
-    cb(err, res, status)
-  })
+  request(data, options, cb)
 }
 
 module.exports = AgentWriter

package/packages/dd-trace/src/exporters/common/{agent-info-exporter.js → buffering-exporter.js}

@@ -1,47 +1,20 @@
 'use strict'
 
-const { URL, format } = require('url')
-
-const defaults = require('../../config_defaults')
 const { incrementCountMetric, TELEMETRY_EVENTS_ENQUEUED_FOR_SERIALIZATION } = require('../../ci-visibility/telemetry')
-const request = require('./request')
-
-function fetchAgentInfo (url, callback) {
-  request('', {
-    path: '/info',
-    url
-  }, (err, res) => {
-    if (err) {
-      return callback(err)
-    }
-    try {
-      const response = JSON.parse(res)
-      return callback(null, response)
-    } catch (e) {
-      return callback(e)
-    }
-  })
-}
+const { getAgentUrl } = require('../../agent/url')
 
 /**
- * Exporter that exposes a way to query /info endpoint from the agent and gives you the response.
- * While this._writer is not initialized, exported traces are stored as is.
+ * Base exporter that buffers traces until a writer is initialized.
+ * Provides common export logic with flush intervals.
  */
-class AgentInfoExporter {
+class BufferingExporter {
+  _traceBuffer = []
+  _isInitialized = false
+  _writer
+
   constructor (tracerConfig) {
     this._config = tracerConfig
-    const { url, hostname = defaults.hostname, port } = this._config
-    this._url = url || new URL(format({
-      protocol: 'http:',
-      hostname,
-      port
-    }))
-    this._traceBuffer = []
-    this._isInitialized = false
-  }
-
-  getAgentInfo (onReceivedInfo) {
-    fetchAgentInfo(this._url, onReceivedInfo)
+    this._url = getAgentUrl(tracerConfig)
   }
 
   export (trace) {
@@ -86,4 +59,4 @@ class AgentInfoExporter {
   }
 }
 
-module.exports = AgentInfoExporter
+module.exports = BufferingExporter

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

@@ -1,9 +1,9 @@
 'use strict'
 
 const fs = require('fs')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 
-const DD_EXTERNAL_ENV = getEnvironmentVariable('DD_EXTERNAL_ENV')
+const DD_EXTERNAL_ENV = getValueFromEnvSources('DD_EXTERNAL_ENV')
 
 // The second part is the PCF / Garden regexp. We currently assume no suffix($) to avoid matching pod UIDs
 // See https://github.com/DataDog/datadog-agent/blob/7.40.x/pkg/util/cgroups/reader.go#L50

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

@@ -77,7 +77,7 @@ function request (data, options, callback) {
     res.on('data', chunk => {
       chunks.push(chunk)
     })
-    res.on('end', () => {
+    res.once('end', () => {
       activeRequests--
       const buffer = Buffer.concat(chunks)
 

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

@@ -1,12 +1,12 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 
 function safeJSONStringify (value) {
   return JSON.stringify(
     value,
     (key, value) => key === 'dd-api-key' ? undefined : value,
-    getEnvironmentVariable('DD_TRACE_BEAUTIFUL_LOGS') ? 2 : undefined
+    getValueFromEnvSources('DD_TRACE_BEAUTIFUL_LOGS') ? 2 : undefined
   )
 }
 

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

@@ -1,19 +1,12 @@
 'use strict'
 
-const { URL, format } = require('url')
-
-const defaults = require('../../config_defaults')
+const { getAgentUrl } = require('../../agent/url')
 const { Writer } = require('./writer')
 
 class SpanStatsExporter {
   constructor (config) {
-    const { hostname = defaults.hostname, port = defaults.port, tags, url } = config
-    this._url = url || new URL(format({
-      protocol: 'http:',
-      hostname,
-      port
-    }))
-    this._writer = new Writer({ url: this._url, tags })
+    this._url = getAgentUrl(config)
+    this._writer = new Writer({ url: this._url })
   }
 
   export (payload) {

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

@@ -64,7 +64,7 @@ const flare = {
   },
 
   _sendFile (task, file, filename) {
-    if (!file) return
+    if (!file || file.length === 0) return
 
     const form = new FormData()
 

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

@@ -80,7 +80,7 @@ function sendTelemetry (name, tags, resultMetadata) {
   proc.on('error', function () {
     log.error('Failed to spawn telemetry forwarder')
   })
-  proc.on('exit', function (code) {
+  proc.once('exit', function (code) {
     if (code !== 0) {
       log.error('Telemetry forwarder exited with code', code)
     }

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

@@ -1,14 +1,14 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getValueFromEnvSources } = require('./config/helper')
 const { isFalse } = require('./util')
 
 // Global `jest` is only present in Jest workers.
 const inJestWorker = typeof jest !== 'undefined'
 
-const ddTraceDisabled = getEnvironmentVariable('DD_TRACE_ENABLED')
-  ? isFalse(getEnvironmentVariable('DD_TRACE_ENABLED'))
-  : String(getEnvironmentVariable('OTEL_TRACES_EXPORTER')).toLowerCase() === 'none'
+const ddTraceDisabled = getValueFromEnvSources('DD_TRACE_ENABLED')
+  ? isFalse(getValueFromEnvSources('DD_TRACE_ENABLED'))
+  : String(getValueFromEnvSources('OTEL_TRACES_EXPORTER')).toLowerCase() === 'none'
 
 module.exports = ddTraceDisabled || inJestWorker
   ? require('./noop/proxy')

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

@@ -3,7 +3,7 @@
 const log = require('../log')
 const { channel } = require('../../../datadog-instrumentations/src/helpers/instrument')
 const { ERROR_MESSAGE, ERROR_TYPE } = require('../constants')
-const { getEnvironmentVariable } = require('../config-helper')
+const { getValueFromEnvSources } = require('../config/helper')
 const { ImpendingTimeout } = require('./runtime/errors')
 
 const globalTracer = global._ddtrace
@@ -26,7 +26,7 @@ let __lambdaTimeout
 function checkTimeout (context) {
   const remainingTimeInMillis = context.getRemainingTimeInMillis()
 
-  let apmFlushDeadline = Number.parseInt(getEnvironmentVariable('DD_APM_FLUSH_DEADLINE_MILLISECONDS')) || 100
+  let apmFlushDeadline = Number.parseInt(getValueFromEnvSources('DD_APM_FLUSH_DEADLINE_MILLISECONDS')) || 100
   apmFlushDeadline = apmFlushDeadline < 0 ? 100 : apmFlushDeadline
 
   __lambdaTimeout = setTimeout(() => {

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

@@ -1,13 +1,13 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../config-helper')
+const { getValueFromEnvSources } = require('../config/helper')
 const { registerLambdaHook } = require('./runtime/ritm')
 
 /**
  * It is safe to do it this way, since customers will never be expected to disable
  * this specific instrumentation through the init config object.
  */
-const _DD_TRACE_DISABLED_INSTRUMENTATIONS = getEnvironmentVariable('DD_TRACE_DISABLED_INSTRUMENTATIONS') || ''
+const _DD_TRACE_DISABLED_INSTRUMENTATIONS = getValueFromEnvSources('DD_TRACE_DISABLED_INSTRUMENTATIONS') || ''
 const _disabledInstrumentations = new Set(
   _DD_TRACE_DISABLED_INSTRUMENTATIONS ? _DD_TRACE_DISABLED_INSTRUMENTATIONS.split(',') : []
 )

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

@@ -5,7 +5,7 @@ const path = require('path')
 const { datadog } = require('../handler')
 const { addHook } = require('../../../../datadog-instrumentations/src/helpers/instrument')
 const shimmer = require('../../../../datadog-shimmer')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../../config/helper')
 const { _extractModuleNameAndHandlerPath, _extractModuleRootAndHandler, _getLambdaFilePaths } = require('./ritm')
 
 /**
@@ -59,7 +59,7 @@ function patchLambdaHandler (lambdaHandler) {
 }
 
 const lambdaTaskRoot = getEnvironmentVariable('LAMBDA_TASK_ROOT')
-const originalLambdaHandler = getEnvironmentVariable('DD_LAMBDA_HANDLER')
+const originalLambdaHandler = getValueFromEnvSources('DD_LAMBDA_HANDLER')
 
 if (originalLambdaHandler === undefined) {
   // Instrumentation is done manually.

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

@@ -10,7 +10,7 @@
 const path = require('path')
 
 const log = require('../../log')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../../config/helper')
 const Hook = require('../../../../datadog-instrumentations/src/helpers/hook')
 const instrumentations = require('../../../../datadog-instrumentations/src/helpers/instrumentations')
 const {
@@ -79,7 +79,7 @@ function _getLambdaFilePaths (lambdaStylePath) {
  */
 const registerLambdaHook = () => {
   const lambdaTaskRoot = getEnvironmentVariable('LAMBDA_TASK_ROOT')
-  const originalLambdaHandler = getEnvironmentVariable('DD_LAMBDA_HANDLER')
+  const originalLambdaHandler = getValueFromEnvSources('DD_LAMBDA_HANDLER')
 
   if (originalLambdaHandler !== undefined && lambdaTaskRoot !== undefined) {
     const [moduleRoot, moduleAndHandler] = _extractModuleRootAndHandler(originalLambdaHandler)