dd-trace 5.84.0 → 5.85.0

package/packages/dd-trace/src/plugins/util/web.js

@@ -74,7 +74,7 @@ const web = {
       hooks,
       filter,
       middleware,
-      queryStringObfuscation
+      queryStringObfuscation,
     }
   },
 
@@ -188,7 +188,7 @@ const web = {
     analyticsSampler.sample(span, config.measured)
 
     span.addTags({
-      [RESOURCE_NAME]: middleware._name || middleware.name || '<anonymous>'
+      [RESOURCE_NAME]: middleware._name || middleware.name || '<anonymous>',
     })
 
     context.middleware.push(span)
@@ -218,7 +218,7 @@ const web = {
         span.addTags({
           [ERROR_TYPE]: error.name,
           [ERROR_MESSAGE]: error.message,
-          [ERROR_STACK]: error.stack
+          [ERROR_STACK]: error.stack,
         })
       }
 
@@ -250,7 +250,7 @@ const web = {
       paths: [],
       middleware: [],
       beforeEnd: [],
-      config: {}
+      config: {},
     }
 
     contexts.set(req, context)
@@ -406,9 +406,9 @@ const web = {
       },
       set (value) {
         ends.set(this, scope.bind(value, context.span))
-      }
+      },
     })
-  }
+  },
 }
 
 function addAllowHeaders (req, res, headers) {
@@ -420,7 +420,7 @@ function addAllowHeaders (req, res, headers) {
     'x-datadog-sampled', // Deprecated, but still accept it in case it's sent.
     'x-datadog-sampling-priority',
     'x-datadog-trace-id',
-    'x-datadog-tags'
+    'x-datadog-tags',
   ]
 
   for (const header of contextHeaders) {
@@ -462,7 +462,7 @@ function addRequestTags (context, spanType) {
     [HTTP_METHOD]: req.method,
     [SPAN_KIND]: SERVER,
     [SPAN_TYPE]: spanType,
-    [HTTP_USERAGENT]: req.headers['user-agent']
+    [HTTP_USERAGENT]: req.headers['user-agent'],
   })
 
   // if client ip has already been set by appsec, no need to run it again
@@ -493,10 +493,10 @@ function addResponseTags (context) {
   }
 
   span.addTags({
-    [HTTP_STATUS_CODE]: res.statusCode
+    [HTTP_STATUS_CODE]: res.statusCode,
   })
   inferredProxySpan?.addTags({
-    [HTTP_STATUS_CODE]: res.statusCode
+    [HTTP_STATUS_CODE]: res.statusCode,
   })
 
   web.addStatusError(req, res.statusCode)
@@ -518,7 +518,7 @@ function addResourceTag (context) {
 function addHeaders (context) {
   const { req, res, config, span, inferredProxySpan } = context
 
-  config.headers.forEach(([key, tag]) => {
+  for (const [key, tag] of config.headers) {
     const reqHeader = req.headers[key]
     const resHeader = res.getHeader(key)
 
@@ -531,7 +531,7 @@ function addHeaders (context) {
       span.setTag(tag || `${HTTP_RESPONSE_HEADERS}.${key}`, resHeader)
       inferredProxySpan?.setTag(tag || `${HTTP_RESPONSE_HEADERS}.${key}`, resHeader)
     }
-  })
+  }
 }
 
 function getHeadersToRecord (config) {

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

@@ -5,14 +5,14 @@ const {
     MANUAL_KEEP,
     MANUAL_DROP,
     SAMPLING_PRIORITY,
-    SERVICE_NAME
+    SERVICE_NAME,
   },
   priority: {
     AUTO_REJECT,
     AUTO_KEEP,
     USER_REJECT,
-    USER_KEEP
-  }
+    USER_KEEP,
+  },
 } = require('../../../ext')
 const log = require('./log')
 const RateLimiter = require('./rate_limiter')
@@ -30,7 +30,7 @@ const {
   SAMPLING_RULE_DECISION,
   SAMPLING_LIMIT_DECISION,
   SAMPLING_AGENT_DECISION,
-  DECISION_MAKER_KEY
+  DECISION_MAKER_KEY,
 } = require('./constants')
 
 const DEFAULT_KEY = 'service:,env:'

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

@@ -32,7 +32,7 @@ function getProcessTags () {
     ['entrypoint.workdir', path.basename(CURRENT_WORKING_DIRECTORY) || undefined],
 
     // the .name field from the application's package.json
-    ['package.json.name', pkg.name || undefined]
+    ['package.json.name', pkg.name || undefined],
   ]
 
   const tagsArray = []
@@ -52,7 +52,7 @@ function getProcessTags () {
     tags,
     serialized,
     tagsObject,
-    tagsArray
+    tagsArray,
   }
 }
 

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

@@ -13,5 +13,5 @@ module.exports = {
 
   stop: () => {
     profiler.stop()
-  }
+  },
 }

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

@@ -47,7 +47,7 @@ class Config {
       DD_PROFILING_UPLOAD_TIMEOUT,
       DD_PROFILING_V8_PROFILER_BUG_WORKAROUND,
       DD_PROFILING_WALLTIME_ENABLED,
-      DD_TAGS
+      DD_TAGS,
     } = getProfilingEnvValues()
 
     const host = os.hostname()
@@ -71,7 +71,7 @@ class Config {
         host,
         service: this.service,
         version: this.version,
-        functionname: AWS_LAMBDA_FUNCTION_NAME
+        functionname: AWS_LAMBDA_FUNCTION_NAME,
       }),
       getAzureTagsFromMetadata(getIsAzureFunction() ? getAzureFunctionMetadata() : getAzureAppMetadata())
     )
@@ -117,7 +117,7 @@ class Config {
     this.libraryInjected = options.libraryInjected
     this.activation = options.activation
     this.exporters = ensureExporters(options.exporters || [
-      new AgentExporter(this)
+      new AgentExporter(this),
     ], this)
 
     // OOM monitoring does not work well on Windows, so it is disabled by default.
@@ -141,13 +141,13 @@ class Config {
       heapLimitExtensionSize,
       maxHeapExtensionCount,
       exportStrategies,
-      exportCommand
+      exportCommand,
     }
 
     const profilers = options.profilers || getProfilers({
       DD_PROFILING_HEAP_ENABLED,
       DD_PROFILING_WALLTIME_ENABLED,
-      DD_PROFILING_PROFILERS
+      DD_PROFILING_PROFILERS,
     })
 
     this.timelineEnabled = isTrue(
@@ -261,7 +261,7 @@ class Config {
       timelineEnabled: this.timelineEnabled,
       timelineSamplingEnabled: this.timelineSamplingEnabled,
       uploadCompression: { ...this.uploadCompression },
-      v8ProfilerBugWorkaroundEnabled: this.v8ProfilerBugWorkaroundEnabled
+      v8ProfilerBugWorkaroundEnabled: this.v8ProfilerBugWorkaroundEnabled,
     }
     delete report.oomMonitoring.exportCommand
     return report
@@ -271,7 +271,7 @@ class Config {
 module.exports = { Config }
 
 function getProfilers ({
-  DD_PROFILING_HEAP_ENABLED, DD_PROFILING_WALLTIME_ENABLED, DD_PROFILING_PROFILERS
+  DD_PROFILING_HEAP_ENABLED, DD_PROFILING_WALLTIME_ENABLED, DD_PROFILING_PROFILERS,
 }) {
   // First consider "legacy" DD_PROFILING_PROFILERS env variable, defaulting to space + wall
   // Use a Set to avoid duplicates
@@ -476,6 +476,6 @@ function getProfilingEnvValues () {
     DD_PROFILING_WALLTIME_ENABLED:
       getValueFromEnvSources('DD_PROFILING_WALLTIME_ENABLED'),
     DD_TAGS:
-      getValueFromEnvSources('DD_TAGS')
+      getValueFromEnvSources('DD_TAGS'),
   }
 }

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

@@ -107,7 +107,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 +123,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 +132,7 @@ class AgentExporter extends EventSerializer {
         randomize: true,
         minTimeout: this._backoffTime,
         retries: this._backoffTries,
-        unref: true
+        unref: true,
       })
 
       operation.attempt((attempt) => {
@@ -148,9 +148,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,7 @@ class Profiler extends EventEmitter {
       tags,
       repositoryUrl,
       commitSHA,
-      injectionEnabled
+      injectionEnabled,
     } = config
     const { enabled, sourceMap, exporters } = config.profiling
     const { heartbeatInterval } = config.telemetry
@@ -91,7 +85,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 +111,7 @@ class Profiler extends EventEmitter {
       commitSHA,
       libraryInjected,
       activation,
-      heartbeatInterval
+      heartbeatInterval,
     }
 
     return this._start(options).catch((err) => {
@@ -151,13 +145,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 +163,7 @@ class Profiler extends EventEmitter {
           this.#compressionFn = promisify(zlib.gzip)
           if (clevel !== undefined) {
             this.#compressionOptions = {
-              level: clevel
+              level: clevel,
             }
           }
           break
@@ -178,8 +175,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 +197,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 +222,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 +292,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,
 }