dd-trace 4.13.0 → 4.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "4.13.0",
+  "version": "4.13.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

package/packages/datadog-instrumentations/src/kafkajs.js

@@ -15,15 +15,14 @@ const consumerStartCh = channel('apm:kafkajs:consume:start')
 const consumerFinishCh = channel('apm:kafkajs:consume:finish')
 const consumerErrorCh = channel('apm:kafkajs:consume:error')
 
-addHook({ name: 'kafkajs', versions: ['>=1.4'] }, (obj) => {
-  class Kafka extends obj.Kafka {
+addHook({ name: 'kafkajs', file: 'src/index.js', versions: ['>=1.4'] }, (BaseKafka) => {
+  class Kafka extends BaseKafka {
     constructor (options) {
       super(options)
       this._brokers = (options.brokers && typeof options.brokers !== 'function')
         ? options.brokers.join(',') : undefined
     }
   }
-  obj.Kafka = Kafka
 
   shimmer.wrap(Kafka.prototype, 'producer', createProducer => function () {
     const producer = createProducer.apply(this, arguments)
@@ -117,5 +116,5 @@ addHook({ name: 'kafkajs', versions: ['>=1.4'] }, (obj) => {
     }
     return consumer
   })
-  return obj
+  return Kafka
 })

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -36,10 +36,14 @@ class MongodbCorePlugin extends DatabasePlugin {
   }
 }
 
+function sanitizeBigInt (data) {
+  return JSON.stringify(data, (_key, value) => typeof value === 'bigint' ? value.toString() : value)
+}
+
 function getQuery (cmd) {
   if (!cmd || typeof cmd !== 'object' || Array.isArray(cmd)) return
-  if (cmd.query) return JSON.stringify(limitDepth(cmd.query))
-  if (cmd.filter) return JSON.stringify(limitDepth(cmd.filter))
+  if (cmd.query) return sanitizeBigInt(limitDepth(cmd.query))
+  if (cmd.filter) return sanitizeBigInt(limitDepth(cmd.filter))
 }
 
 function getResource (plugin, ns, query, operationName) {

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-handler.js

@@ -76,7 +76,18 @@ class SensitiveHandler {
         while (nextSensitive != null && contains(nextTainted, nextSensitive)) {
           const redactionStart = nextSensitive.start - nextTainted.start
           const redactionEnd = nextSensitive.end - nextTainted.start
-          this.redactSource(sources, redactedSources, redactedSourcesContext, sourceIndex, redactionStart, redactionEnd)
+          if (redactionStart === redactionEnd) {
+            this.writeRedactedValuePart(valueParts, 0)
+          } else {
+            this.redactSource(
+              sources,
+              redactedSources,
+              redactedSourcesContext,
+              sourceIndex,
+              redactionStart,
+              redactionEnd
+            )
+          }
           nextSensitive = sensitive.shift()
         }
 

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

@@ -15,6 +15,7 @@ const FILE_URI_START = `file://`
 const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
 
 let immediate, config, application, host
+let isFirstModule = true
 
 function waitAndSend (config, application, host) {
   if (!immediate) {
@@ -36,7 +37,21 @@ function waitAndSend (config, application, host) {
   }
 }
 
+function loadAllTheLoadedModules () {
+  if (require.cache) {
+    const filenames = Object.keys(require.cache)
+    filenames.forEach(filename => {
+      onModuleLoad({ filename })
+    })
+  }
+}
+
 function onModuleLoad (data) {
+  if (isFirstModule) {
+    isFirstModule = false
+    loadAllTheLoadedModules()
+  }
+
   if (data) {
     let filename = data.filename
     if (filename && filename.startsWith(FILE_URI_START)) {

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

@@ -17,6 +17,7 @@ let pluginManager
 let application
 let host
 let interval
+let heartbeatTimeout
 let heartbeatInterval
 const sentIntegrations = new Set()
 
@@ -110,6 +111,14 @@ function getTelemetryData () {
   return { config, application, host, heartbeatInterval }
 }
 
+function heartbeat (config, application, host) {
+  heartbeatTimeout = setTimeout(() => {
+    sendData(config, application, host, 'app-heartbeat')
+    heartbeat(config, application, host)
+  }, heartbeatInterval).unref()
+  return heartbeatTimeout
+}
+
 function start (aConfig, thePluginManager) {
   if (!aConfig.telemetry.enabled) {
     return
@@ -122,9 +131,9 @@ function start (aConfig, thePluginManager) {
 
   dependencies.start(config, application, host)
   sendData(config, application, host, 'app-started', appStarted())
+  heartbeat(config, application, host)
   interval = setInterval(() => {
     metricsManager.send(config, application, host)
-    sendData(config, application, host, 'app-heartbeat')
   }, heartbeatInterval)
   interval.unref()
   process.on('beforeExit', onBeforeExit)
@@ -137,6 +146,7 @@ function stop () {
     return
   }
   clearInterval(interval)
+  clearTimeout(heartbeatTimeout)
   process.removeListener('beforeExit', onBeforeExit)
 
   telemetryStopChannel.publish(getTelemetryData())