dd-trace 5.84.0 → 5.86.0

package/packages/dd-trace/src/profiling/constants.js

@@ -3,13 +3,13 @@
 const snapshotKinds = Object.freeze({
   PERIODIC: 'periodic',
   ON_SHUTDOWN: 'on_shutdown',
-  ON_OUT_OF_MEMORY: 'on_oom'
+  ON_OUT_OF_MEMORY: 'on_oom',
 })
 
 const oomExportStrategies = Object.freeze({
   PROCESS: 'process',
   ASYNC_CALLBACK: 'async',
-  LOGS: 'logs'
+  LOGS: 'logs',
 })
 
 module.exports = { snapshotKinds, oomExportStrategies }

package/packages/dd-trace/src/profiling/exporter_cli.js

@@ -30,7 +30,7 @@ function exporterFromURL (url) {
     logger,
     uploadTimeout: timeoutMs,
     libraryInjected,
-    activation
+    activation,
   })
 }
 
@@ -49,11 +49,11 @@ async function exportProfile (urls, tags, profileType, profile) {
 
     await exporter.export({
       profiles: {
-        [profileType]: encodedProfile
+        [profileType]: encodedProfile,
       },
       start,
       end: start,
-      tags
+      tags,
     })
   }))
 }

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

@@ -38,32 +38,31 @@ function countStatusCode (statusCode) {
 function sendRequest (options, form, callback) {
   const request = options.protocol === 'https:' ? httpsRequest : httpRequest
 
-  const store = storage('legacy').getStore()
-  storage('legacy').enterWith({ noop: true })
-  requestCounter.inc()
-  const start = perf.now()
-  const req = request(options, res => {
-    durationDistribution.track(perf.now() - start)
-    countStatusCode(res.statusCode)
-    if (res.statusCode >= 400) {
-      statusCodeErrorCounter.inc()
-      const error = new Error(`HTTP Error ${res.statusCode}`)
-      error.status = res.statusCode
-      callback(error)
-    } else {
-      callback(null, res)
-    }
-  })
+  storage('legacy').run({ noop: true }, () => {
+    requestCounter.inc()
+    const start = perf.now()
+    const req = request(options, res => {
+      durationDistribution.track(perf.now() - start)
+      countStatusCode(res.statusCode)
+      if (res.statusCode >= 400) {
+        statusCodeErrorCounter.inc()
+        const error = new Error(`HTTP Error ${res.statusCode}`)
+        error.status = res.statusCode
+        callback(error)
+      } else {
+        callback(null, res)
+      }
+    })
 
-  req.on('error', (err) => {
-    networkErrorCounter.inc()
-    callback(err)
+    req.on('error', (err) => {
+      networkErrorCounter.inc()
+      callback(err)
+    })
+    if (form) {
+      sizeDistribution.track(form.size())
+      form.pipe(req)
+    }
   })
-  if (form) {
-    sizeDistribution.track(form.size())
-    form.pipe(req)
-  }
-  storage('legacy').enterWith(store)
 }
 
 function getBody (stream, callback) {
@@ -107,7 +106,7 @@ class AgentExporter extends EventSerializer {
     const event = this.getEventJSON(exportSpec)
     fields.push(['event', event, {
       filename: 'event.json',
-      contentType: 'application/json'
+      contentType: 'application/json',
     }])
 
     this._logger.debug(() => {
@@ -123,7 +122,7 @@ class AgentExporter extends EventSerializer {
       const filename = this.typeToFile(type)
       fields.push([filename, buffer, {
         filename,
-        contentType: 'application/octet-stream'
+        contentType: 'application/octet-stream',
       }])
     }
 
@@ -132,7 +131,7 @@ class AgentExporter extends EventSerializer {
         randomize: true,
         minTimeout: this._backoffTime,
         retries: this._backoffTries,
-        unref: true
+        unref: true,
       })
 
       operation.attempt((attempt) => {
@@ -148,9 +147,9 @@ class AgentExporter extends EventSerializer {
           headers: {
             'DD-EVP-ORIGIN': 'dd-trace-js',
             'DD-EVP-ORIGIN-VERSION': version,
-            ...form.getHeaders()
+            ...form.getHeaders(),
           },
-          timeout: this._backoffTime * 2 ** attempt
+          timeout: this._backoffTime * 2 ** attempt,
         }
 
         docker.inject(options.headers)

package/packages/dd-trace/src/profiling/exporters/event_serializer.js

@@ -38,7 +38,7 @@ class EventSerializer {
         `process_id:${process.pid}`,
         `profiler_version:${version}`,
         'format:pprof',
-        ...Object.entries(tags).map(([key, value]) => `${key}:${value}`)
+        ...Object.entries(tags).map(([key, value]) => `${key}:${value}`),
       ].join(','),
       endpoint_counts: endpointCounts,
       info: {
@@ -46,21 +46,21 @@ class EventSerializer {
           env: this._env,
           service: this._service,
           start_time: new Date(perf.nodeTiming.nodeStart + perf.timeOrigin).toISOString(),
-          version: this._appVersion
+          version: this._appVersion,
         },
         platform: {
           hostname: this._host,
           kernel_name: os.type(),
           kernel_release: os.release(),
-          kernel_version: os.version()
+          kernel_version: os.version(),
         },
         profiler: {
           activation: this._activation,
           ssi: {
-            mechanism: this._libraryInjected ? 'injected_agent' : 'none'
+            mechanism: this._libraryInjected ? 'injected_agent' : 'none',
           },
           version,
-          ...infos
+          ...infos,
         },
         runtime: {
           available_processors: availableParallelism(),
@@ -75,9 +75,9 @@ class EventSerializer {
           // We'll keep it like this as we want cross-engine consistency. We
           // also aren't changing the format of the existing tag as we don't want
           // to break it.
-          version: process.version.slice(1)
-        }
-      }
+          version: process.version.slice(1),
+        },
+      },
     }
 
     if (processTags.serialized) {

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

@@ -16,5 +16,5 @@ module.exports = {
   FileExporter,
   WallProfiler,
   SpaceProfiler,
-  ConsoleLogger
+  ConsoleLogger,
 }

package/packages/dd-trace/src/profiling/libuv-size.js

@@ -45,5 +45,5 @@ module.exports = {
   libuvThreadPoolSize,
   // Only used for testing
   getLibuvThreadPoolSize,
-  getEffectiveLibuvThreadCount
+  getEffectiveLibuvThreadCount,
 }

package/packages/dd-trace/src/profiling/loggers/console.js

@@ -7,7 +7,7 @@ const mapping = {
   error: 3,
   warn: 4,
   info: 6,
-  debug: 7
+  debug: 7,
 }
 
 class ConsoleLogger {

package/packages/dd-trace/src/profiling/profiler.js

@@ -14,13 +14,6 @@ const { isWebServerSpan, endpointNameFromTags, getStartedSpans } = require('./we
 const profileSubmittedChannel = dc.channel('datadog:profiling:profile-submitted')
 const spanFinishedChannel = dc.channel('dd-trace:span:finish')
 
-function maybeSourceMap (sourceMap, SourceMapper, debug) {
-  if (!sourceMap) return
-  return SourceMapper.create([
-    process.cwd()
-  ], debug)
-}
-
 function logError (logger, ...args) {
   if (logger) {
     logger.error(...args)
@@ -57,6 +50,7 @@ class Profiler extends EventEmitter {
   #logger
   #profileSeq = 0
   #spanFinishListener
+  #sourceMapCount = 0
   #timer
 
   constructor () {
@@ -81,7 +75,8 @@ class Profiler extends EventEmitter {
       tags,
       repositoryUrl,
       commitSHA,
-      injectionEnabled
+      injectionEnabled,
+      reportHostname,
     } = config
     const { enabled, sourceMap, exporters } = config.profiling
     const { heartbeatInterval } = config.telemetry
@@ -91,7 +86,7 @@ class Profiler extends EventEmitter {
       debug (message) { log.debug(message) },
       info (message) { log.info(message) },
       warn (message) { log.warn(message) },
-      error (...args) { log.error(...args) }
+      error (...args) { log.error(...args) },
     }
 
     const libraryInjected = injectionEnabled.length > 0
@@ -117,7 +112,8 @@ class Profiler extends EventEmitter {
       commitSHA,
       libraryInjected,
       activation,
-      heartbeatInterval
+      heartbeatInterval,
+      reportHostname,
     }
 
     return this._start(options).catch((err) => {
@@ -151,13 +147,16 @@ class Profiler extends EventEmitter {
       const { setLogger, SourceMapper } = require('@datadog/pprof')
       setLogger(config.logger)
 
-      mapper = await maybeSourceMap(config.sourceMap, SourceMapper, config.debugSourceMaps)
-      if (config.sourceMap && config.debugSourceMaps) {
-        this.#logger.debug(() => {
-          return mapper.infoMap.size === 0
-            ? 'Found no source maps'
-            : `Found source maps for following files: [${[...mapper.infoMap.keys()].join(', ')}]`
-        })
+      if (config.sourceMap) {
+        mapper = await SourceMapper.create([process.cwd()], config.debugSourceMaps)
+        this.#sourceMapCount = mapper.infoMap.size
+        if (config.debugSourceMaps) {
+          this.#logger.debug(() => {
+            return this.#sourceMapCount === 0
+              ? 'Found no source maps'
+              : `Found source maps for following files: [${[...mapper.infoMap.keys()].join(', ')}]`
+          })
+        }
       }
 
       const clevel = config.uploadCompression.level
@@ -166,7 +165,7 @@ class Profiler extends EventEmitter {
           this.#compressionFn = promisify(zlib.gzip)
           if (clevel !== undefined) {
             this.#compressionOptions = {
-              level: clevel
+              level: clevel,
             }
           }
           break
@@ -178,8 +177,8 @@ class Profiler extends EventEmitter {
               this.#compressionOptions = {
                 params: {
                   // eslint-disable-next-line n/no-unsupported-features/node-builtins
-                  [zlib.constants.ZSTD_c_compressionLevel]: clevel
-                }
+                  [zlib.constants.ZSTD_c_compressionLevel]: clevel,
+                },
               }
             }
           } else {
@@ -200,7 +199,7 @@ class Profiler extends EventEmitter {
         // TODO: move this out of Profiler when restoring sourcemap support
         profiler.start({
           mapper,
-          nearOOMCallback
+          nearOOMCallback,
         })
         this.#logger.debug(`Started ${profiler.type} profiler in ${threadNamePrefix} thread`)
       }
@@ -225,7 +224,7 @@ class Profiler extends EventEmitter {
     const infos = this.#createInitialInfos()
     processInfo(infos, info, profileType)
     this.#submit({
-      [profileType]: encodedProfile
+      [profileType]: encodedProfile,
     }, infos, start, end, snapshotKinds.ON_OUT_OF_MEMORY)
   }
 
@@ -295,7 +294,8 @@ class Profiler extends EventEmitter {
   #createInitialInfos () {
     return {
       serverless: this.serverless,
-      settings: this.#config.systemInfoReport
+      settings: this.#config.systemInfoReport,
+      sourceMapCount: this.#sourceMapCount,
     }
   }
 

package/packages/dd-trace/src/profiling/profilers/event_plugins/event.js

@@ -44,7 +44,7 @@ class EventPlugin extends TracingPlugin {
     const event = {
       entryType: this.#entryType,
       startTime,
-      duration
+      duration,
     }
 
     if (!this.#eventFilter(event)) {

package/packages/dd-trace/src/profiling/profilers/event_plugins/fs.js

@@ -15,7 +15,7 @@ const allowedParams = new Set([
   'newPath', 'offset', 'oldPath',
   'operation', 'options', 'path',
   'position', 'prefix', 'src',
-  'target', 'type', 'uid'
+  'target', 'type', 'uid',
 ])
 
 class FilesystemPlugin extends EventPlugin {
@@ -32,11 +32,11 @@ class FilesystemPlugin extends EventPlugin {
 
   extendEvent (event, detail) {
     const d = { ...detail }
-    Object.entries(d).forEach(([k, v]) => {
+    for (const [k, v] of Object.entries(d)) {
       if (!(allowedParams.has(k) && (typeof v === 'string' || typeof v === 'number'))) {
         delete d[k]
       }
-    })
+    }
     event.detail = d
 
     return event

package/packages/dd-trace/src/profiling/profilers/events.js

@@ -9,7 +9,7 @@ const {
   Profile,
   Sample,
   StringTable,
-  ValueType
+  ValueType,
 } = require('../../../../../vendor/dist/pprof-format')
 const { availableParallelism, effectiveLibuvThreadCount } = require('../libuv-size')
 const { END_TIMESTAMP_LABEL, SPAN_ID_LABEL, LOCAL_ROOT_SPAN_ID_LABEL, encodeProfileAsync } = require('./shared')
@@ -183,15 +183,15 @@ class FilesystemDecorator {
   decorateSample (sampleInput, item) {
     const labels = sampleInput.label
     const stringTable = this.stringTable
-    Object.entries(item.detail).forEach(([k, v]) => {
-      switch (typeof v) {
+    for (const [key, value] of Object.entries(item.detail)) {
+      switch (typeof value) {
         case 'string':
-          labels.push(labelFromStrStr(stringTable, k, v))
+          labels.push(labelFromStrStr(stringTable, key, value))
           break
         case 'number':
-          labels.push(new Label({ key: stringTable.dedup(k), num: v }))
+          labels.push(new Label({ key: stringTable.dedup(key), num: value }))
       }
-    })
+    }
   }
 }
 
@@ -201,7 +201,7 @@ const decoratorTypes = {
   fs: FilesystemDecorator,
   dns: DNSDecorator,
   gc: GCDecorator,
-  net: NetDecorator
+  net: NetDecorator,
 }
 
 // Translates performance entries into pprof samples.
@@ -274,7 +274,7 @@ class EventSerializer {
     const endTime = startTime + duration
     const label = [
       decorator.eventTypeLabel,
-      new Label({ key: this.timestampLabelKey, num: dateOffset + BigInt(Math.round(endTime * MS_TO_NS)) })
+      new Label({ key: this.timestampLabelKey, num: dateOffset + BigInt(Math.round(endTime * MS_TO_NS)) }),
     ]
     if (_ddSpanId) {
       label.push(
@@ -287,7 +287,7 @@ class EventSerializer {
     const sampleInput = {
       value: [Math.round(duration * MS_TO_NS)],
       locationId: this.locationId,
-      label
+      label,
     }
     decorator.decorateSample(sampleInput, item)
     return new Sample(sampleInput)
@@ -296,7 +296,7 @@ class EventSerializer {
   createProfile (startDate, endDate) {
     const timeValueType = new ValueType({
       type: this.stringTable.dedup(pprofValueType),
-      unit: this.stringTable.dedup(pprofValueUnit)
+      unit: this.stringTable.dedup(pprofValueUnit),
     })
 
     return new Profile({
@@ -308,7 +308,7 @@ class EventSerializer {
       sample: this.samples,
       location: this.locations,
       function: this.functions,
-      stringTable: this.stringTable
+      stringTable: this.stringTable,
     })
   }
 }
@@ -354,7 +354,7 @@ class DatadogInstrumentationEventSource {
       require('./event_plugins/dns_resolve'),
       require('./event_plugins/dns_reverse'),
       require('./event_plugins/fs'),
-      require('./event_plugins/net')
+      require('./event_plugins/net'),
     ]
     this.plugins = plugins.map((Plugin) => {
       return new Plugin(eventHandler, eventFilter)
@@ -365,14 +365,18 @@ class DatadogInstrumentationEventSource {
 
   start () {
     if (!this.started) {
-      this.plugins.forEach(p => p.configure({ enabled: true }))
+      for (const plugin of this.plugins) {
+        plugin.configure({ enabled: true })
+      }
       this.started = true
     }
   }
 
   stop () {
     if (this.started) {
-      this.plugins.forEach(p => p.configure({ enabled: false }))
+      for (const plugin of this.plugins) {
+        plugin.configure({ enabled: false })
+      }
       this.started = false
     }
   }
@@ -382,7 +386,7 @@ function createPoissonProcessSamplingFilter (samplingIntervalMillis) {
   const poissonFilter = new PoissonProcessSamplingFilter({
     samplingInterval: samplingIntervalMillis,
     resetInterval: samplingIntervalMillis * POISSON_RESET_FACTOR,
-    now: performance.now.bind(performance)
+    now: performance.now.bind(performance),
   })
   return poissonFilter.filter.bind(poissonFilter)
 }
@@ -423,16 +427,20 @@ class EventsProfiler {
         ]
       // Use Node API instrumentation to collect events without span IDs
       : [
-          new NodeApiEventSource(filteringEventHandler)
+          new NodeApiEventSource(filteringEventHandler),
         ]
   }
 
   start () {
-    this.#eventSources.forEach(s => s.start())
+    for (const source of this.#eventSources) {
+      source.start()
+    }
   }
 
   stop () {
-    this.#eventSources.forEach(s => s.stop())
+    for (const source of this.#eventSources) {
+      source.stop()
+    }
   }
 
   profile (restart, startDate, endDate) {
@@ -446,7 +454,7 @@ class EventsProfiler {
 
   getInfo () {
     return {
-      maxSamples: this.#maxSamples
+      maxSamples: this.#maxSamples,
     }
   }
 

package/packages/dd-trace/src/profiling/profilers/shared.js

@@ -18,7 +18,7 @@ function getThreadLabels () {
   return {
     [THREAD_NAME_LABEL]: eventLoopThreadName,
     [THREAD_ID_LABEL]: `${threadId}`,
-    [OS_THREAD_ID_LABEL]: `${nativeThreadId}`
+    [OS_THREAD_ID_LABEL]: `${nativeThreadId}`,
   }
 }
 
@@ -51,5 +51,5 @@ module.exports = {
   eventLoopThreadName,
   getNonJSThreadsLabels,
   getThreadLabels: cacheThreadLabels(),
-  encodeProfileAsync
+  encodeProfileAsync,
 }

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -13,7 +13,7 @@ const {
   LOCAL_ROOT_SPAN_ID_LABEL,
   getNonJSThreadsLabels,
   getThreadLabels,
-  encodeProfileAsync
+  encodeProfileAsync,
 } = require('./shared')
 const TRACE_ENDPOINT_LABEL = 'trace endpoint'
 
@@ -183,7 +183,7 @@ class NativeWallProfiler {
       sourceMapper: this.#mapper,
       useCPED: this.#asyncContextFrameEnabled,
       withContexts: this.#withContexts,
-      workaroundV8Bug: this.#v8ProfilerBugWorkaroundEnabled
+      workaroundV8Bug: this.#v8ProfilerBugWorkaroundEnabled,
     })
 
     if (this.#withContexts) {
@@ -298,7 +298,7 @@ class NativeWallProfiler {
   #setNewContext () {
     this.#pprof.time.setContext(
       this._currentContext = {
-        ref: {}
+        ref: {},
       }
     )
   }
@@ -414,7 +414,7 @@ class NativeWallProfiler {
     const { totalAsyncContextCount, usedAsyncContextCount } = this.#pprof.time.getMetrics()
     return {
       totalAsyncContextCount,
-      usedAsyncContextCount
+      usedAsyncContextCount,
     }
   }
 

package/packages/dd-trace/src/profiling/tagger.js

@@ -34,7 +34,7 @@ const tagger = {
       default:
         return {}
     }
-  }
+  },
 }
 
 module.exports = { tagger }

package/packages/dd-trace/src/profiling/webspan-utils.js

@@ -10,7 +10,7 @@ function isWebServerSpan (tags) {
 function endpointNameFromTags (tags) {
   return tags[RESOURCE_NAME] || [
     tags[HTTP_METHOD],
-    tags[HTTP_ROUTE]
+    tags[HTTP_ROUTE],
   ].filter(Boolean).join(' ')
 }
 
@@ -21,5 +21,5 @@ function getStartedSpans (context) {
 module.exports = {
   isWebServerSpan,
   endpointNameFromTags,
-  getStartedSpans
+  getStartedSpans,
 }

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

@@ -12,12 +12,13 @@ const telemetry = require('./telemetry')
 const nomenclature = require('./service-naming')
 const PluginManager = require('./plugin_manager')
 const NoopDogStatsDClient = require('./noop/dogstatsd')
+const { IS_SERVERLESS } = require('./serverless')
 const {
   setBaggageItem,
   getBaggageItem,
   getAllBaggageItems,
   removeBaggageItem,
-  removeAllBaggageItems
+  removeAllBaggageItems,
 } = require('./baggage')
 
 class LazyModule {
@@ -35,11 +36,11 @@ class LazyModule {
   }
 }
 
-function lazyProxy (obj, property, config, getClass, ...args) {
-  if (config?._isInServerlessEnvironment?.() === false) {
-    defineEagerly(obj, property, getClass, ...args)
+function lazyProxy (...args) {
+  if (IS_SERVERLESS === false) {
+    defineEagerly(...args)
   } else {
-    defineLazily(obj, property, getClass, ...args)
+    defineLazily(...args)
   }
 }
 
@@ -60,7 +61,7 @@ function defineLazily (obj, property, getClass, ...args) {
       return value
     },
     configurable: true,
-    enumerable: true
+    enumerable: true,
   })
 }
 
@@ -86,7 +87,7 @@ class Tracer extends NoopProxy {
       iast: new LazyModule(() => require('./appsec/iast')),
       llmobs: new LazyModule(() => require('./llmobs')),
       rewriter: new LazyModule(() => require('./appsec/iast/taint-tracking/rewriter')),
-      openfeature: new LazyModule(() => require('./openfeature'))
+      openfeature: new LazyModule(() => require('./openfeature')),
     }
   }
 
@@ -113,7 +114,7 @@ class Tracer extends NoopProxy {
 
       if (config.dogstatsd) {
         // Custom Metrics
-        lazyProxy(this, 'dogstatsd', config, () => require('./dogstatsd').CustomMetrics, config)
+        lazyProxy(this, 'dogstatsd', () => require('./dogstatsd').CustomMetrics, config)
       }
 
       if (config.spanLeakDebug > 0) {
@@ -260,17 +261,16 @@ class Tracer extends NoopProxy {
           : undefined
         this._tracer = new DatadogTracer(config, prioritySampler)
         this.dataStreamsCheckpointer = this._tracer.dataStreamsCheckpointer
-        lazyProxy(this, 'appsec', config, () => require('./appsec/sdk'), this._tracer, config)
-        lazyProxy(this, 'llmobs', config, () => require('./llmobs/sdk'), this._tracer, this._modules.llmobs, config)
+        lazyProxy(this, 'appsec', () => require('./appsec/sdk'), this._tracer, config)
+        lazyProxy(this, 'llmobs', () => require('./llmobs/sdk'), this._tracer, this._modules.llmobs, config)
         if (config.experimental?.aiguard?.enabled) {
-          lazyProxy(this, 'aiguard', config, () => require('./aiguard/sdk'), this._tracer, config)
+          lazyProxy(this, 'aiguard', () => require('./aiguard/sdk'), this._tracer, config)
         }
         this._tracingInitialized = true
       }
       if (config.experimental.flaggingProvider.enabled) {
         this._modules.openfeature.enable(config)
-        lazyProxy(this, 'openfeature', config, () =>
-          require('./openfeature/flagging_provider'), this._tracer, config)
+        lazyProxy(this, 'openfeature', () => require('./openfeature/flagging_provider'), this._tracer, config)
       }
       if (config.iast.enabled) {
         this._modules.iast.enable(config, this._tracer)

package/packages/dd-trace/src/remote_config/apply_states.js

@@ -3,5 +3,5 @@
 module.exports = {
   UNACKNOWLEDGED: 1,
   ACKNOWLEDGED: 2,
-  ERROR: 3
+  ERROR: 3,
 }