dd-trace 5.92.0 → 5.93.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.92.0",
+  "version": "5.93.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -138,7 +138,7 @@
     "import-in-the-middle": "^3.0.0"
   },
   "optionalDependencies": {
-    "@datadog/libdatadog": "0.8.1",
+    "@datadog/libdatadog": "0.9.2",
     "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -154,6 +154,11 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       })
 
       this.finish(ctx)
+
+      if (IS_SERVERLESS) {
+        const peerStore = storage('peerServerless').getStore()
+        if (peerStore) delete peerStore.peerHostname
+      }
     })
 
     this.addBind(`apm:aws:response:start:${this.serviceIdentifier}`, ctx => {

package/packages/dd-trace/src/config/supported-configurations.json

@@ -744,9 +744,9 @@
     ],
     "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "false",
+        "default": "true",
         "configurationNames": [
           "propagateProcessTags.enabled"
         ]

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

@@ -1,9 +1,15 @@
 'use strict'
 
+const { existsSync } = require('node:fs')
 const { isMainThread } = require('worker_threads')
 const log = require('../log')
 
-if (isMainThread) {
+// libdatadog v29 crashtracker segfaults during init on ARM64 musl (Alpine).
+// The segfault bypasses JS try/catch so we must avoid loading it entirely.
+// See: https://github.com/DataDog/libdatadog-nodejs/issues/114
+const isArm64Musl = process.arch === 'arm64' && existsSync('/etc/alpine-release')
+
+if (isMainThread && !isArm64Musl) {
   try {
     module.exports = require('./crashtracker')
   } catch (e) {

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

@@ -35,6 +35,7 @@ if (inodePath) {
 const entityId = containerId ? `ci-${containerId}` : inode && `in-${inode}`
 
 module.exports = {
+  containerId,
   entityId,
 
   inject (carrier) {

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

@@ -14,9 +14,9 @@ const { urlToHttpOptions } = require('./url-to-http-options-polyfill')
 const docker = require('./docker')
 const { httpAgent, httpsAgent } = require('./agents')
 
-const maxActiveRequests = 8
+const maxActiveBufferSize = 1024 * 1024 * 64
 
-let activeRequests = 0
+let activeBufferSize = 0
 
 function parseUrl (urlObjOrString) {
   if (urlObjOrString !== null && typeof urlObjOrString === 'object') return urlToHttpOptions(urlObjOrString)
@@ -50,7 +50,22 @@ function request (data, options, callback) {
     }
   }
 
-  const isReadable = data instanceof Readable
+  if (data instanceof Readable) {
+    const chunks = []
+
+    data
+      .on('data', (data) => {
+        chunks.push(data)
+      })
+      .on('end', () => {
+        request(Buffer.concat(chunks), options, callback)
+      })
+      .on('error', (err) => {
+        callback(err)
+      })
+
+    return
+  }
 
   // The timeout should be kept low to avoid excessive queueing.
   const timeout = options.timeout || 2000
@@ -58,12 +73,10 @@ function request (data, options, callback) {
   const client = isSecure ? https : http
   let dataArray = data
 
-  if (!isReadable) {
-    if (!Array.isArray(data)) {
-      dataArray = [data]
-    }
-    options.headers['Content-Length'] = byteLength(dataArray)
+  if (!Array.isArray(data)) {
+    dataArray = [data]
   }
+  options.headers['Content-Length'] = byteLength(dataArray)
 
   docker.inject(options.headers)
 
@@ -126,14 +139,14 @@ function request (data, options, callback) {
       return callback(null)
     }
 
-    activeRequests++
+    activeBufferSize += options.headers['Content-Length'] ?? 0
 
     storage('legacy').run({ noop: true }, () => {
       let finished = false
       const finalize = () => {
         if (finished) return
         finished = true
-        activeRequests--
+        activeBufferSize -= options.headers['Content-Length'] ?? 0
       }
 
       const req = client.request(options, (res) => onResponse(res, finalize))
@@ -158,12 +171,8 @@ function request (data, options, callback) {
         }
       })
 
-      if (isReadable) {
-        data.pipe(req) // TODO: Validate whether this is actually retriable.
-      } else {
-        for (const buffer of dataArray) req.write(buffer)
-        req.end()
-      }
+      for (const buffer of dataArray) req.write(buffer)
+      req.end()
     })
   }
 
@@ -183,7 +192,7 @@ function byteLength (data) {
 
 Object.defineProperty(request, 'writable', {
   get () {
-    return activeRequests < maxActiveRequests
+    return activeBufferSize < maxActiveBufferSize
   },
 })
 

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

@@ -37,13 +37,16 @@ const {
 const DEFAULT_KEY = 'service:,env:'
 
 /**
- * Formats a sampling rate as a string with up to 6 significant digits and no trailing zeros.
+ * Formats a sampling rate as a string with up to 6 decimal digits and no trailing zeros.
  *
  * @param {number} rate
- * @returns {string}
  */
 function formatKnuthRate (rate) {
-  return Number(rate.toPrecision(6)).toString()
+  const string = Number(rate).toFixed(6)
+  for (let i = string.length - 1; i > 0; i--) {
+    if (string[i] === '0') continue
+    return string.slice(0, i + (string[i] === '.' ? 0 : 1))
+  }
 }
 
 const defaultSampler = new Sampler(AUTO_KEEP)

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

@@ -1,8 +1,6 @@
 'use strict'
 
 const { EventEmitter } = require('events')
-const { promisify } = require('util')
-const zlib = require('zlib')
 const dc = require('dc-polyfill')
 const crashtracker = require('../crashtracking')
 const log = require('../log')
@@ -34,6 +32,14 @@ function findWebSpan (startedSpans, spanId) {
   return false
 }
 
+const MISSING_SOURCE_MAPS_TOKEN = 'dd:has-missing-map-files'
+
+function profileHasMissingSourceMaps (profile) {
+  const strings = profile?.stringTable?.strings
+  if (!strings) return false
+  return profile.comment?.some(idx => strings[idx] === MISSING_SOURCE_MAPS_TOKEN) ?? false
+}
+
 function processInfo (infos, info, type) {
   if (Object.keys(info).length > 0) {
     infos[type] = info
@@ -42,6 +48,7 @@ function processInfo (infos, info, type) {
 
 class Profiler extends EventEmitter {
   #compressionFn
+  #compressionFnInitialized = false
   #compressionOptions
   #config
   #enabled = false
@@ -50,7 +57,6 @@ class Profiler extends EventEmitter {
   #logger
   #profileSeq = 0
   #spanFinishListener
-  #sourceMapCount = 0
   #timer
 
   constructor () {
@@ -116,11 +122,13 @@ class Profiler extends EventEmitter {
       reportHostname,
     }
 
-    return this._start(options).catch((err) => {
+    try {
+      return this._start(options)
+    } catch (err) {
       logError(logger, 'Error starting profiler. For troubleshooting tips, see ' +
         '<https://dtdg.co/nodejs-profiler-troubleshooting>', err)
       return false
-    })
+    }
   }
 
   get enabled () {
@@ -131,7 +139,50 @@ class Profiler extends EventEmitter {
     logError(this.#logger, err)
   }
 
-  async _start (options) {
+  #getCompressionFn () {
+    if (!this.#compressionFnInitialized) {
+      this.#compressionFnInitialized = true
+      try {
+        const { promisify } = require('util')
+        const zlib = require('zlib')
+        const { method, level: clevel } = this.#config.uploadCompression
+        switch (method) {
+          case 'gzip':
+            this.#compressionFn = promisify(zlib.gzip)
+            if (clevel !== undefined) {
+              this.#compressionOptions = {
+                level: clevel,
+              }
+            }
+            break
+          case 'zstd':
+            // eslint-disable-next-line n/no-unsupported-features/node-builtins
+            if (typeof zlib.zstdCompress === 'function') {
+              // eslint-disable-next-line n/no-unsupported-features/node-builtins
+              this.#compressionFn = promisify(zlib.zstdCompress)
+              if (clevel !== undefined) {
+                this.#compressionOptions = {
+                  params: {
+                    // eslint-disable-next-line n/no-unsupported-features/node-builtins
+                    [zlib.constants.ZSTD_c_compressionLevel]: clevel,
+                  },
+                }
+              }
+            } else {
+              const zstdCompress = require('@datadog/libdatadog').load('datadog-js-zstd').zstd_compress
+              const level = clevel ?? 0 // 0 is zstd default compression level
+              this.#compressionFn = (buffer) => Promise.resolve(Buffer.from(zstdCompress(buffer, level)))
+            }
+            break
+        }
+      } catch (err) {
+        this.#logError(err)
+      }
+    }
+    return this.#compressionFn
+  }
+
+  _start (options) {
     if (this.enabled) return true
 
     const config = this.#config = new Config(options)
@@ -148,45 +199,21 @@ class Profiler extends EventEmitter {
       setLogger(config.logger)
 
       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
-      switch (config.uploadCompression.method) {
-        case 'gzip':
-          this.#compressionFn = promisify(zlib.gzip)
-          if (clevel !== undefined) {
-            this.#compressionOptions = {
-              level: clevel,
-            }
-          }
-          break
-        case 'zstd':
-          if (typeof zlib.zstdCompress === 'function') { // eslint-disable-line n/no-unsupported-features/node-builtins
-            // eslint-disable-next-line n/no-unsupported-features/node-builtins
-            this.#compressionFn = promisify(zlib.zstdCompress)
-            if (clevel !== undefined) {
-              this.#compressionOptions = {
-                params: {
-                  // eslint-disable-next-line n/no-unsupported-features/node-builtins
-                  [zlib.constants.ZSTD_c_compressionLevel]: clevel,
-                },
-              }
+        mapper = new SourceMapper(config.debugSourceMaps)
+        mapper.loadDirectory(process.cwd())
+          .then(() => {
+            if (config.debugSourceMaps) {
+              const count = mapper.infoMap.size
+              this.#logger.debug(() => {
+                return count === 0
+                  ? 'Found no source maps'
+                  : `Found source maps for following files: [${[...mapper.infoMap.keys()].join(', ')}]`
+              })
             }
-          } else {
-            const zstdCompress = require('@datadog/libdatadog').load('datadog-js-zstd').zstd_compress
-            const level = clevel ?? 0 // 0 is zstd default compression level
-            this.#compressionFn = (buffer) => Promise.resolve(Buffer.from(zstdCompress(buffer, level)))
-          }
-          break
+          })
+          .catch((err) => {
+            this.#logError(err)
+          })
       }
     } catch (err) {
       this.#logError(err)
@@ -295,7 +322,7 @@ class Profiler extends EventEmitter {
     return {
       serverless: this.serverless,
       settings: this.#config.systemInfoReport,
-      sourceMapCount: this.#sourceMapCount,
+      hasMissingSourceMaps: false,
     }
   }
 
@@ -332,15 +359,19 @@ class Profiler extends EventEmitter {
 
       const encodedProfiles = {}
       const infos = this.#createInitialInfos()
+      const compressionFn = this.#getCompressionFn()
 
       // encode and export asynchronously
       await Promise.all(profiles.map(async ({ profiler, profile, info }) => {
         try {
           const encoded = await profiler.encode(profile)
-          const compressed = encoded instanceof Buffer && this.#compressionFn !== undefined
-            ? await this.#compressionFn(encoded, this.#compressionOptions)
+          const compressed = encoded instanceof Buffer && compressionFn !== undefined
+            ? await compressionFn(encoded, this.#compressionOptions)
             : encoded
           encodedProfiles[profiler.type] = compressed
+          if (profileHasMissingSourceMaps(profile)) {
+            infos.hasMissingSourceMaps = true
+          }
           processInfo(infos, info, profiler.type)
           this.#logger.debug(() => {
             const profileJson = JSON.stringify(profile, (_, value) => {

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

@@ -180,7 +180,7 @@ class Tracer extends NoopProxy {
       if (config.profiling.enabled === 'true') {
         this._profilerStarted = this._startProfiler(config)
       } else {
-        this._profilerStarted = Promise.resolve(false)
+        this._profilerStarted = false
         if (config.profiling.enabled === 'auto') {
           const { SSIHeuristics } = require('./profiling/ssi-heuristics')
           const ssiHeuristics = new SSIHeuristics(config)
@@ -252,6 +252,7 @@ class Tracer extends NoopProxy {
         'Error starting profiler. For troubleshooting tips, see <https://dtdg.co/nodejs-profiler-troubleshooting>',
         e
       )
+      return false
     }
   }
 
@@ -329,11 +330,11 @@ class Tracer extends NoopProxy {
    * @override
    */
   profilerStarted () {
-    if (!this._profilerStarted) {
+    if (this._profilerStarted === undefined) {
       // injection hardening: this is only ever invoked from tests.
       throw new Error('profilerStarted() must be called after init()')
     }
-    return this._profilerStarted
+    return Promise.resolve(this._profilerStarted)
   }
 
   /**

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

@@ -11,13 +11,22 @@ function storeConfig (config) {
       return
     }
 
+    const { containerId } = require('./exporters/common/docker')
+    const processTags = require('./process-tags')
+
+    const processTagsSerialized = config.propagateProcessTags?.enabled
+      ? (processTags.serialized || null)
+      : null
+
     const metadata = new processDiscovery.TracerMetadata(
       config.tags['runtime-id'],
       tracerVersion,
       config.hostname,
       config.service || null,
       config.env || null,
-      config.version || null
+      config.version || null,
+      processTagsSerialized,
+      containerId || null
     )
 
     return processDiscovery.storeMetadata(metadata)