dd-trace 5.14.1 → 5.15.0

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

@@ -13,7 +13,7 @@ const AppsecSdk = require('./appsec/sdk')
 const dogstatsd = require('./dogstatsd')
 const NoopDogStatsDClient = require('./noop/dogstatsd')
 const spanleak = require('./spanleak')
-const { SSITelemetry } = require('./profiling/ssi-telemetry')
+const { SSIHeuristics } = require('./profiling/ssi-heuristics')
 const telemetryLog = require('dc-polyfill').channel('datadog:telemetry:log')
 
 class LazyModule {
@@ -40,6 +40,7 @@ class Tracer extends NoopProxy {
     this._pluginManager = new PluginManager(this)
     this.dogstatsd = new NoopDogStatsDClient()
     this._tracingInitialized = false
+    this._flare = new LazyModule(() => require('./flare'))
 
     // these requires must work with esm bundler
     this._modules = {
@@ -90,29 +91,46 @@ class Tracer extends NoopProxy {
           }
           this._enableOrDisableTracing(config)
         })
+
+        rc.on('AGENT_CONFIG', (action, conf) => {
+          if (!conf?.name?.startsWith('flare-log-level.')) return
+
+          if (action === 'unapply') {
+            this._flare.disable()
+          } else if (conf.config?.log_level) {
+            this._flare.enable(config)
+            this._flare.module.prepare(conf.config.log_level)
+          }
+        })
+
+        rc.on('AGENT_TASK', (action, conf) => {
+          if (action === 'unapply' || !conf) return
+          if (conf.task_type !== 'tracer_flare' || !conf.args) return
+
+          this._flare.enable(config)
+          this._flare.module.send(conf.args)
+        })
       }
 
       if (config.isGCPFunction || config.isAzureFunction) {
         require('./serverless').maybeStartServerlessMiniAgent(config)
       }
 
-      const ssiTelemetry = new SSITelemetry()
-      ssiTelemetry.start()
+      const ssiHeuristics = new SSIHeuristics(config.profiling)
+      ssiHeuristics.start()
       if (config.profiling.enabled) {
-        // do not stop tracer initialization if the profiler fails to be imported
-        try {
-          const profiler = require('./profiler')
-          this._profilerStarted = profiler.start(config)
-        } catch (e) {
-          log.error(e)
-          telemetryLog.publish({
-            message: e.message,
-            level: 'ERROR',
-            stack_trace: e.stack
+        this._profilerStarted = this._startProfiler(config)
+      } else if (config.profiling.ssi) {
+        const mockProfiler = require('./profiling/ssi-telemetry-mock-profiler')
+        mockProfiler.start(config)
+
+        if (config.profiling.heuristicsEnabled) {
+          ssiHeuristics.onTriggered(() => {
+            mockProfiler.stop()
+            this._startProfiler(config)
+            ssiHeuristics.onTriggered()
           })
         }
-      } else if (ssiTelemetry.enabled()) {
-        require('./profiling/ssi-telemetry-mock-profiler').start(config)
       }
       if (!this._profilerStarted) {
         this._profilerStarted = Promise.resolve(false)
@@ -138,6 +156,22 @@ class Tracer extends NoopProxy {
     return this
   }
 
+  _startProfiler (config) {
+    // do not stop tracer initialization if the profiler fails to be imported
+    try {
+      return require('./profiler').start(config)
+    } catch (e) {
+      log.error(e)
+      if (telemetryLog.hasSubscribers) {
+        telemetryLog.publish({
+          message: e.message,
+          level: 'ERROR',
+          stack_trace: e.stack
+        })
+      }
+    }
+  }
+
   _enableOrDisableTracing (config) {
     if (config.tracing !== false) {
       if (config.appsec.enabled) {

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

@@ -50,8 +50,20 @@ function Hook (modules, options, onrequire) {
 
   if (patchedRequire) return
 
+  const _origRequire = Module.prototype.require
   patchedRequire = Module.prototype.require = function (request) {
-    const filename = Module._resolveFilename(request, this)
+    /*
+    If resolving the filename for a `require(...)` fails, defer to the wrapped
+    require implementation rather than failing right away. This allows a
+    possibly monkey patched `require` to work.
+    */
+    let filename
+    try {
+      filename = Module._resolveFilename(request, this)
+    } catch (resolveErr) {
+      return _origRequire.apply(this, arguments)
+    }
+
     const core = filename.indexOf(path.sep) === -1
     let name, basedir, hooks
     // return known patched modules immediately

package/packages/dd-trace/src/startup-log.js

@@ -37,6 +37,23 @@ function startupLog ({ agentError } = {}) {
     return
   }
 
+  const out = tracerInfo({ agentError })
+
+  if (agentError) {
+    out.agent_error = agentError.message
+  }
+
+  info('DATADOG TRACER CONFIGURATION - ' + out)
+  if (agentError) {
+    warn('DATADOG TRACER DIAGNOSTIC - Agent Error: ' + agentError.message)
+    errors.agentError = {
+      code: agentError.code ? agentError.code : '',
+      message: `Agent Error:${agentError.message}`
+    }
+  }
+}
+
+function tracerInfo () {
   const url = config.url || `http://${config.hostname || 'localhost'}:${config.port}`
 
   const out = {
@@ -59,9 +76,6 @@ function startupLog ({ agentError } = {}) {
   out.enabled = config.enabled
   out.service = config.service
   out.agent_url = url
-  if (agentError) {
-    out.agent_error = agentError.message
-  }
   out.debug = !!config.debug
   out.sample_rate = config.sampler.sampleRate
   out.sampling_rules = samplingRules
@@ -87,18 +101,7 @@ function startupLog ({ agentError } = {}) {
   // out.service_mapping
   // out.service_mapping_error
 
-  info('DATADOG TRACER CONFIGURATION - ' + out)
-  if (agentError) {
-    warn('DATADOG TRACER DIAGNOSTIC - Agent Error: ' + agentError.message)
-    errors.agentError = {
-      code: agentError.code ? agentError.code : '',
-      message: `Agent Error:${agentError.message}`
-    }
-  }
-
-  config = undefined
-  pluginManager = undefined
-  samplingRules = undefined
+  return out
 }
 
 function setStartupLogConfig (aConfig) {
@@ -118,5 +121,6 @@ module.exports = {
   setStartupLogConfig,
   setStartupLogPluginManager,
   setSamplingRules,
+  tracerInfo,
   errors
 }

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

@@ -313,7 +313,8 @@ function updateConfig (changes, config) {
     sampleRate: 'DD_TRACE_SAMPLE_RATE',
     logInjection: 'DD_LOG_INJECTION',
     headerTags: 'DD_TRACE_HEADER_TAGS',
-    tags: 'DD_TAGS'
+    tags: 'DD_TAGS',
+    'sampler.rules': 'DD_TRACE_SAMPLING_RULES'
   }
 
   const namesNeedFormatting = new Set(['DD_TAGS', 'peerServiceMapping'])
@@ -328,9 +329,12 @@ function updateConfig (changes, config) {
     const { origin, value } = change
     const entry = { name, value, origin }
 
-    if (Array.isArray(value)) entry.value = value.join(',')
     if (namesNeedFormatting.has(entry.name)) entry.value = formatMapForTelemetry(entry.value)
     if (entry.name === 'url' && entry.value) entry.value = entry.value.toString()
+    if (entry.name === 'DD_TRACE_SAMPLING_RULES') {
+      entry.value = JSON.stringify(entry.value)
+    }
+    if (Array.isArray(entry.value)) entry.value = value.join(',')
 
     configuration.push(entry)
   }

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

@@ -11,6 +11,8 @@ const { DataStreamsProcessor } = require('./datastreams/processor')
 const { DsmPathwayCodec } = require('./datastreams/pathway')
 const { DD_MAJOR } = require('../../../version')
 const DataStreamsContext = require('./data_streams_context')
+const { flushStartupLogs } = require('../../datadog-instrumentations/src/check_require_cache')
+const log = require('./log/writer')
 
 const SPAN_TYPE = tags.SPAN_TYPE
 const RESOURCE_NAME = tags.RESOURCE_NAME
@@ -23,6 +25,7 @@ class DatadogTracer extends Tracer {
     this._dataStreamsProcessor = new DataStreamsProcessor(config)
     this._scope = new Scope()
     setStartupLogConfig(config)
+    flushStartupLogs(log)
   }
 
   configure ({ env, sampler }) {

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

@@ -1,51 +0,0 @@
-'use strict'
-
-const semver = require('semver')
-
-if (semver.satisfies(process.version, '>=14.18.0')) {
-  const net = require('net')
-
-  module.exports = net.BlockList
-} else {
-  const ipaddr = require('ipaddr.js')
-
-  module.exports = class BlockList {
-    constructor () {
-      this.v4Ranges = []
-      this.v6Ranges = []
-    }
-
-    addSubnet (net, prefix, type) {
-      this[type === 'ipv4' ? 'v4Ranges' : 'v6Ranges'].push(ipaddr.parseCIDR(`${net}/${prefix}`))
-    }
-
-    check (address, type) {
-      try {
-        let ip = ipaddr.parse(address)
-
-        type = ip.kind()
-
-        if (type === 'ipv6') {
-          for (const range of this.v6Ranges) {
-            if (ip.match(range)) return true
-          }
-
-          if (ip.isIPv4MappedAddress()) {
-            ip = ip.toIPv4Address()
-            type = ip.kind()
-          }
-        }
-
-        if (type === 'ipv4') {
-          for (const range of this.v4Ranges) {
-            if (ip.match(range)) return true
-          }
-        }
-
-        return false
-      } catch {
-        return false
-      }
-    }
-  }
-}