dd-trace 5.81.0 → 5.83.0

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

@@ -6,6 +6,7 @@ const os = require('os')
 const perf = require('perf_hooks').performance
 const version = require('../../../../../package.json').version
 const { availableParallelism, libuvThreadPoolSize } = require('../libuv-size')
+const processTags = require('../../process-tags')
 
 class EventSerializer {
   constructor ({ env, host, service, version, libraryInjected, activation } = {}) {
@@ -22,7 +23,7 @@ class EventSerializer {
   }
 
   getEventJSON ({ profiles, infos, start, end, tags = {}, endpointCounts }) {
-    return JSON.stringify({
+    const event = {
       attachments: Object.keys(profiles).map(t => this.typeToFile(t)),
       start: start.toISOString(),
       end: end.toISOString(),
@@ -77,7 +78,13 @@ class EventSerializer {
           version: process.version.slice(1)
         }
       }
-    })
+    }
+
+    if (processTags.serialized) {
+      event[processTags.PROFILING_FIELD_NAME] = processTags.serialized
+    }
+
+    return JSON.stringify(event)
   }
 }
 

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

@@ -1,12 +1,12 @@
 'use strict'
 
+const { getEnvironmentVariable } = require('../config/helper')
 const { Profiler, ServerlessProfiler } = require('./profiler')
 const WallProfiler = require('./profilers/wall')
 const SpaceProfiler = require('./profilers/space')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
-const { getEnvironmentVariable } = require('../config-helper')
 
 const profiler = getEnvironmentVariable('AWS_LAMBDA_FUNCTION_NAME') ? new ServerlessProfiler() : new Profiler()
 

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../config-helper')
 const os = require('node:os')
+const { getEnvironmentVariable } = require('../config/helper')
 
 function getLibuvThreadPoolSize (envVar) {
   if (envVar === undefined) {

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

@@ -1,15 +1,15 @@
 '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')
 const { Config } = require('./config')
 const { snapshotKinds } = require('./constants')
 const { threadNamePrefix } = require('./profilers/shared')
 const { isWebServerSpan, endpointNameFromTags, getStartedSpans } = require('./webspan-utils')
-const dc = require('dc-polyfill')
-const crashtracker = require('../crashtracking')
-
-const { promisify } = require('util')
-const zlib = require('zlib')
 
 const profileSubmittedChannel = dc.channel('datadog:profiling:profile-submitted')
 const spanFinishedChannel = dc.channel('dd-trace:span:finish')
@@ -64,13 +64,64 @@ class Profiler extends EventEmitter {
     this._timeoutInterval = undefined
   }
 
+  get serverless () { return false }
+
   get flushInterval () {
     return this.#config?.flushInterval
   }
 
-  start (options) {
+  start (config) {
+    const {
+      service,
+      version,
+      env,
+      url,
+      hostname,
+      port,
+      tags,
+      repositoryUrl,
+      commitSHA,
+      injectionEnabled
+    } = config
+    const { enabled, sourceMap, exporters } = config.profiling
+    const { heartbeatInterval } = config.telemetry
+
+    // TODO: Unify with main logger and rewrite template strings to use printf formatting.
+    const logger = {
+      debug (message) { log.debug(message) },
+      info (message) { log.info(message) },
+      warn (message) { log.warn(message) },
+      error (...args) { log.error(...args) }
+    }
+
+    const libraryInjected = injectionEnabled.length > 0
+    let activation
+    if (enabled === 'auto') {
+      activation = 'auto'
+    } else if (enabled === 'true') {
+      activation = 'manual'
+    } // else activation = undefined
+
+    const options = {
+      service,
+      version,
+      env,
+      logger,
+      sourceMap,
+      exporters,
+      url,
+      hostname,
+      port,
+      tags,
+      repositoryUrl,
+      commitSHA,
+      libraryInjected,
+      activation,
+      heartbeatInterval
+    }
+
     return this._start(options).catch((err) => {
-      logError(options.logger, 'Error starting profiler. For troubleshooting tips, see ' +
+      logError(logger, 'Error starting profiler. For troubleshooting tips, see ' +
         '<https://dtdg.co/nodejs-profiler-troubleshooting>', err)
       return false
     })
@@ -243,6 +294,7 @@ class Profiler extends EventEmitter {
 
   #createInitialInfos () {
     return {
+      serverless: this.serverless,
       settings: this.#config.systemInfoReport
     }
   }
@@ -352,6 +404,8 @@ class ServerlessProfiler extends Profiler {
     this.#flushAfterIntervals = undefined
   }
 
+  get serverless () { return true }
+
   get profiledIntervals () {
     return this.#profiledIntervals
   }

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

@@ -1,7 +1,7 @@
 'use strict'
 
-const TracingPlugin = require('../../../plugins/tracing')
 const { performance } = require('perf_hooks')
+const TracingPlugin = require('../../../plugins/tracing')
 
 // We are leveraging the TracingPlugin class for its functionality to bind
 // start/error/finish methods to the appropriate diagnostic channels.

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

@@ -1,7 +1,6 @@
 'use strict'
 
 const { performance, constants, PerformanceObserver } = require('perf_hooks')
-const { END_TIMESTAMP_LABEL, SPAN_ID_LABEL, LOCAL_ROOT_SPAN_ID_LABEL, encodeProfileAsync } = require('./shared')
 const {
   Function,
   Label,
@@ -12,8 +11,9 @@ const {
   StringTable,
   ValueType
 } = require('../../../../../vendor/dist/pprof-format')
-const PoissonProcessSamplingFilter = require('./poisson')
 const { availableParallelism, effectiveLibuvThreadCount } = require('../libuv-size')
+const { END_TIMESTAMP_LABEL, SPAN_ID_LABEL, LOCAL_ROOT_SPAN_ID_LABEL, encodeProfileAsync } = require('./shared')
+const PoissonProcessSamplingFilter = require('./poisson')
 // perf_hooks uses millis, with fractional part representing nanos. We emit nanos into the pprof file.
 const MS_TO_NS = 1_000_000
 // The number of sampling intervals that need to pass before we reset the Poisson process sampling instant.

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

@@ -1,10 +1,12 @@
 'use strict'
 
-const { storage } = require('../../../../datadog-core')
-
 const dc = require('dc-polyfill')
+
+const { storage } = require('../../../../datadog-core')
 const runtimeMetrics = require('../../runtime_metrics')
 const telemetryMetrics = require('../../telemetry/metrics')
+const { isWebServerSpan, endpointNameFromTags, getStartedSpans } = require('../webspan-utils')
+
 const {
   END_TIMESTAMP_LABEL,
   SPAN_ID_LABEL,
@@ -15,8 +17,6 @@ const {
 } = require('./shared')
 const TRACE_ENDPOINT_LABEL = 'trace endpoint'
 
-const { isWebServerSpan, endpointNameFromTags, getStartedSpans } = require('../webspan-utils')
-
 let beforeCh
 const enterCh = dc.channel('dd-trace:storage:enter')
 const spanFinishCh = dc.channel('dd-trace:span:finish')

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

@@ -1,4 +1,6 @@
 'use strict'
+
+const { getValueFromEnvSources } = require('./config/helper')
 const NoopProxy = require('./noop/proxy')
 const DatadogTracer = require('./tracer')
 const getConfig = require('./config')
@@ -10,7 +12,6 @@ const telemetry = require('./telemetry')
 const nomenclature = require('./service-naming')
 const PluginManager = require('./plugin_manager')
 const NoopDogStatsDClient = require('./noop/dogstatsd')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const {
   setBaggageItem,
   getBaggageItem,
@@ -126,15 +127,13 @@ class Tracer extends NoopProxy {
       }
 
       if (config.remoteConfig.enabled && !config.isCiVisibility) {
-        const rc = require('./remote_config').enable(config, this._modules.appsec)
+        const RemoteConfig = require('./remote_config')
+        const rc = new RemoteConfig(config)
 
-        rc.setProductHandler('APM_TRACING', (action, conf) => {
-          if (action === 'unapply') {
-            config.configure({}, true)
-          } else {
-            config.configure(conf.lib_config, true)
-          }
-          this._enableOrDisableTracing(config)
+        const tracingRemoteConfig = require('./config/remote_config')
+        tracingRemoteConfig.enable(rc, config, () => {
+          this.#updateTracing(config)
+          this.#updateDebugger(config, rc)
         })
 
         rc.setProductHandler('AGENT_CONFIG', (action, conf) => {
@@ -156,18 +155,17 @@ class Tracer extends NoopProxy {
           this._flare.module.send(conf.args)
         })
 
+        if (this._modules.appsec) {
+          const appsecRemoteConfig = require('./appsec/remote_config')
+          appsecRemoteConfig.enable(rc, config, this._modules.appsec)
+        }
+
         if (config.dynamicInstrumentation.enabled) {
           DynamicInstrumentation.start(config, rc)
         }
 
-        if (config.experimental.flaggingProvider.enabled) {
-          rc.setProductHandler('FFE_FLAGS', (action, conf) => {
-            // Feed UFC config directly to OpenFeature provider
-            if (action === 'apply' || action === 'modify') {
-              this.openfeature._setConfiguration(conf)
-            }
-          })
-        }
+        const openfeatureRemoteConfig = require('./openfeature/remote_config')
+        openfeatureRemoteConfig.enable(rc, config, () => this.openfeature)
       }
 
       if (config.profiling.enabled === 'true') {
@@ -189,7 +187,7 @@ class Tracer extends NoopProxy {
         runtimeMetrics.start(config)
       }
 
-      this._enableOrDisableTracing(config)
+      this.#updateTracing(config)
 
       this._modules.rewriter.enable(config)
 
@@ -202,7 +200,7 @@ class Tracer extends NoopProxy {
         this._testApiManualPlugin.configure({ ...config, enabled: true }, false)
       }
       if (config.ciVisAgentlessLogSubmissionEnabled) {
-        if (getEnvironmentVariable('DD_API_KEY')) {
+        if (getValueFromEnvSources('DD_API_KEY')) {
           const LogSubmissionPlugin = require('./ci-visibility/log-submission/log-submission-plugin')
           const automaticLogPlugin = new LogSubmissionPlugin(this)
           automaticLogPlugin.configure({ ...config, enabled: true })
@@ -248,7 +246,7 @@ class Tracer extends NoopProxy {
     }
   }
 
-  _enableOrDisableTracing (config) {
+  #updateTracing (config) {
     if (config.tracing !== false) {
       if (config.appsec.enabled) {
         this._modules.appsec.enable(config)
@@ -293,6 +291,31 @@ class Tracer extends NoopProxy {
     }
   }
 
+  /**
+   * Updates the debugger (Dynamic Instrumentation) state based on remote config changes.
+   * Handles starting, stopping, and reconfiguring the debugger dynamically.
+   *
+   * @param {object} config - The tracer configuration object
+   * @param {object} rc - The RemoteConfig instance
+   */
+  #updateDebugger (config, rc) {
+    const shouldBeEnabled = config.dynamicInstrumentation.enabled
+    const isCurrentlyStarted = DynamicInstrumentation.isStarted()
+
+    if (shouldBeEnabled) {
+      if (isCurrentlyStarted) {
+        log.debug('[proxy] Reconfiguring Dynamic Instrumentation via remote config')
+        DynamicInstrumentation.configure(config)
+      } else {
+        log.debug('[proxy] Starting Dynamic Instrumentation via remote config')
+        DynamicInstrumentation.start(config, rc)
+      }
+    } else if (isCurrentlyStarted) {
+      log.debug('[proxy] Stopping Dynamic Instrumentation via remote config')
+      DynamicInstrumentation.stop()
+    }
+  }
+
   /**
    * @override
    */

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

@@ -31,9 +31,12 @@ module.exports = {
   ASM_NETWORK_FINGERPRINT: 1n << 34n,
   ASM_HEADER_FINGERPRINT: 1n << 35n,
   ASM_RASP_CMDI: 1n << 37n,
+  APM_TRACING_ENABLE_DYNAMIC_INSTRUMENTATION: 1n << 38n,
+  APM_TRACING_ENABLE_CODE_ORIGIN: 1n << 40n,
   ASM_DD_MULTICONFIG: 1n << 42n,
   ASM_TRACE_TAGGING_RULES: 1n << 43n,
   ASM_EXTENDED_DATA_COLLECTION: 1n << 44n,
+  APM_TRACING_MULTICONFIG: 1n << 45n,
   FFE_FLAG_CONFIGURATION_RULES: 1n << 46n,
   /*
     DO NOT ADD ARBITRARY CAPABILITIES IN YOUR CODE