dd-trace 5.82.0 → 5.83.0

package/packages/dd-trace/src/plugins/util/git-cache.js

@@ -7,11 +7,11 @@ const crypto = require('crypto')
 const cp = require('child_process')
 
 const log = require('../../log')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 const { isTrue } = require('../../util')
 
-let isGitEnabled = isTrue(getEnvironmentVariable('DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED'))
-const GIT_CACHE_DIR = getEnvironmentVariable('DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR') ||
+let isGitEnabled = isTrue(getValueFromEnvSources('DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED'))
+const GIT_CACHE_DIR = getValueFromEnvSources('DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR') ||
   path.join(os.tmpdir(), 'dd-trace-git-cache')
 
 function ensureCacheDir () {

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

@@ -4,7 +4,7 @@ const path = require('path')
 const fs = require('fs')
 const { URL } = require('url')
 const log = require('../../log')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getEnvironmentVariable } = require('../../config/helper')
 const satisfies = require('../../../../../vendor/dist/semifies')
 
 const istanbul = require('../../../../../vendor/dist/istanbul-lib-coverage')

package/packages/dd-trace/src/plugins/util/user-provided-git.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getEnvironmentVariables } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
@@ -21,16 +21,15 @@ const {
 const { normalizeRef } = require('./ci')
 const { filterSensitiveInfoFromRepository } = require('./url')
 
-function removeEmptyValues (tags) {
-  return Object.keys(tags).reduce((filteredTags, tag) => {
-    if (!tags[tag]) {
-      return filteredTags
+function removeEmptyValues (tagsAndValues) {
+  const filteredTags = {}
+  for (let i = 0; i < tagsAndValues.length; i += 2) {
+    const value = tagsAndValues[i + 1]
+    if (value) {
+      filteredTags[tagsAndValues[i]] = value
     }
-    return {
-      ...filteredTags,
-      [tag]: tags[tag]
-    }
-  }, {})
+  }
+  return filteredTags
 }
 
 // The regex is inspired by
@@ -47,47 +46,46 @@ function validateGitCommitSha (gitCommitSha) {
 }
 
 function getUserProviderGitMetadata () {
-  const {
-    DD_GIT_COMMIT_SHA,
-    DD_GIT_BRANCH,
-    DD_GIT_REPOSITORY_URL,
-    DD_GIT_TAG,
-    DD_GIT_COMMIT_MESSAGE,
-    DD_GIT_COMMIT_COMMITTER_NAME,
-    DD_GIT_COMMIT_COMMITTER_EMAIL,
-    DD_GIT_COMMIT_COMMITTER_DATE,
-    DD_GIT_COMMIT_AUTHOR_NAME,
-    DD_GIT_COMMIT_AUTHOR_EMAIL,
-    DD_GIT_COMMIT_AUTHOR_DATE,
-    DD_GIT_PULL_REQUEST_BASE_BRANCH,
-    DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
-    DD_GIT_COMMIT_HEAD_SHA
-  } = getEnvironmentVariables()
+  const DD_GIT_COMMIT_SHA = getValueFromEnvSources('DD_GIT_COMMIT_SHA')
+  const DD_GIT_BRANCH = getValueFromEnvSources('DD_GIT_BRANCH')
+  const DD_GIT_REPOSITORY_URL = getValueFromEnvSources('DD_GIT_REPOSITORY_URL')
+  const DD_GIT_TAG = getValueFromEnvSources('DD_GIT_TAG')
+  const DD_GIT_COMMIT_MESSAGE = getValueFromEnvSources('DD_GIT_COMMIT_MESSAGE')
+  const DD_GIT_COMMIT_COMMITTER_NAME = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_NAME')
+  const DD_GIT_COMMIT_COMMITTER_EMAIL = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_EMAIL')
+  const DD_GIT_COMMIT_COMMITTER_DATE = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_DATE')
+  const DD_GIT_COMMIT_AUTHOR_NAME = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_NAME')
+  const DD_GIT_COMMIT_AUTHOR_EMAIL = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_EMAIL')
+  const DD_GIT_COMMIT_AUTHOR_DATE = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_DATE')
+  const DD_GIT_PULL_REQUEST_BASE_BRANCH = getValueFromEnvSources('DD_GIT_PULL_REQUEST_BASE_BRANCH')
+  const DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA = getValueFromEnvSources('DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA')
+  const DD_GIT_COMMIT_HEAD_SHA = getValueFromEnvSources('DD_GIT_COMMIT_HEAD_SHA')
 
   const branch = normalizeRef(DD_GIT_BRANCH)
   let tag = normalizeRef(DD_GIT_TAG)
 
   // if DD_GIT_BRANCH is a tag, we associate its value to TAG too
-  if ((DD_GIT_BRANCH || '').includes('origin/tags') || (DD_GIT_BRANCH || '').includes('refs/heads/tags')) {
+  if ((DD_GIT_BRANCH ?? '').includes('origin/tags') || (DD_GIT_BRANCH ?? '').includes('refs/heads/tags')) {
     tag = normalizeRef(DD_GIT_BRANCH)
   }
 
-  return removeEmptyValues({
-    [GIT_COMMIT_SHA]: DD_GIT_COMMIT_SHA,
-    [GIT_BRANCH]: branch,
-    [GIT_REPOSITORY_URL]: filterSensitiveInfoFromRepository(DD_GIT_REPOSITORY_URL),
-    [GIT_TAG]: tag,
-    [GIT_COMMIT_MESSAGE]: DD_GIT_COMMIT_MESSAGE,
-    [GIT_COMMIT_COMMITTER_NAME]: DD_GIT_COMMIT_COMMITTER_NAME,
-    [GIT_COMMIT_COMMITTER_DATE]: DD_GIT_COMMIT_COMMITTER_DATE,
-    [GIT_COMMIT_COMMITTER_EMAIL]: DD_GIT_COMMIT_COMMITTER_EMAIL,
-    [GIT_COMMIT_AUTHOR_NAME]: DD_GIT_COMMIT_AUTHOR_NAME,
-    [GIT_COMMIT_AUTHOR_EMAIL]: DD_GIT_COMMIT_AUTHOR_EMAIL,
-    [GIT_COMMIT_AUTHOR_DATE]: DD_GIT_COMMIT_AUTHOR_DATE,
-    [GIT_PULL_REQUEST_BASE_BRANCH]: DD_GIT_PULL_REQUEST_BASE_BRANCH,
-    [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
-    [GIT_COMMIT_HEAD_SHA]: DD_GIT_COMMIT_HEAD_SHA
-  })
+  // Key value pairs are grouped in pairs of two
+  return removeEmptyValues([
+    GIT_COMMIT_SHA, DD_GIT_COMMIT_SHA,
+    GIT_BRANCH, branch,
+    GIT_REPOSITORY_URL, filterSensitiveInfoFromRepository(DD_GIT_REPOSITORY_URL),
+    GIT_TAG, tag,
+    GIT_COMMIT_MESSAGE, DD_GIT_COMMIT_MESSAGE,
+    GIT_COMMIT_COMMITTER_NAME, DD_GIT_COMMIT_COMMITTER_NAME,
+    GIT_COMMIT_COMMITTER_DATE, DD_GIT_COMMIT_COMMITTER_DATE,
+    GIT_COMMIT_COMMITTER_EMAIL, DD_GIT_COMMIT_COMMITTER_EMAIL,
+    GIT_COMMIT_AUTHOR_NAME, DD_GIT_COMMIT_AUTHOR_NAME,
+    GIT_COMMIT_AUTHOR_EMAIL, DD_GIT_COMMIT_AUTHOR_EMAIL,
+    GIT_COMMIT_AUTHOR_DATE, DD_GIT_COMMIT_AUTHOR_DATE,
+    GIT_PULL_REQUEST_BASE_BRANCH, DD_GIT_PULL_REQUEST_BASE_BRANCH,
+    GIT_PULL_REQUEST_BASE_BRANCH_SHA, DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+    GIT_COMMIT_HEAD_SHA, DD_GIT_COMMIT_HEAD_SHA
+  ])
 }
 
 module.exports = { getUserProviderGitMetadata, validateGitRepositoryUrl, validateGitCommitSha }

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

@@ -1,49 +1,14 @@
 'use strict'
 
-const log = require('./log')
 const { profiler } = require('./profiling')
 
-// Stop profiler upon exit in order to collect and export the current profile
-process.once('beforeExit', () => { profiler.stop() })
+globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(() => { profiler.stop() })
 
 module.exports = {
   start: config => {
-    const { service, version, env, url, hostname, port, tags, repositoryUrl, commitSHA, injectionEnabled } = config
-    const { enabled, sourceMap, exporters } = config.profiling
-    const { heartbeatInterval } = config.telemetry
-
-    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
-
-    return profiler.start({
-      service,
-      version,
-      env,
-      logger,
-      sourceMap,
-      exporters,
-      url,
-      hostname,
-      port,
-      tags,
-      repositoryUrl,
-      commitSHA,
-      libraryInjected,
-      activation,
-      heartbeatInterval
-    })
+    // Forward the full tracer config to the profiling layer.
+    // Profiling code is responsible for deriving the specific options it needs.
+    return profiler.start(config)
   },
 
   stop: () => {

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

@@ -8,8 +8,7 @@ const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const { getIsAzureFunction } = require('../serverless')
 const { isFalse, isTrue } = require('../util')
 const { getAzureTagsFromMetadata, getAzureAppMetadata, getAzureFunctionMetadata } = require('../azure_metadata')
-const { getEnvironmentVariables } = require('../config-helper')
-const defaults = require('../config_defaults')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../config/helper')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
@@ -18,14 +17,16 @@ const SpaceProfiler = require('./profilers/space')
 const EventsProfiler = require('./profilers/events')
 const { oomExportStrategies, snapshotKinds } = require('./constants')
 const { tagger } = require('./tagger')
-
 class Config {
   constructor (options = {}) {
+    // TODO: Remove entries that were already resolved in config.
+    // For the others, move them over to config.
+    const AWS_LAMBDA_FUNCTION_NAME = getEnvironmentVariable('AWS_LAMBDA_FUNCTION_NAME')
+    const NODE_OPTIONS = getEnvironmentVariable('NODE_OPTIONS')
+
+    // TODO: Move initialization of these values to packages/dd-trace/src/config/index.js, and just read from config
     const {
-      AWS_LAMBDA_FUNCTION_NAME: functionname,
-      DD_AGENT_HOST,
-      DD_ENV,
-      DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED, // used for testing
+      DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED,
       DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED,
       DD_PROFILING_CODEHOTSPOTS_ENABLED,
       DD_PROFILING_CPU_ENABLED,
@@ -40,40 +41,37 @@ class Config {
       DD_PROFILING_HEAP_SAMPLING_INTERVAL,
       DD_PROFILING_PPROF_PREFIX,
       DD_PROFILING_PROFILERS,
-      DD_PROFILING_SOURCE_MAP,
       DD_PROFILING_TIMELINE_ENABLED,
       DD_PROFILING_UPLOAD_PERIOD,
       DD_PROFILING_UPLOAD_TIMEOUT,
       DD_PROFILING_V8_PROFILER_BUG_WORKAROUND,
       DD_PROFILING_WALLTIME_ENABLED,
-      DD_SERVICE,
-      DD_TAGS,
-      DD_TRACE_AGENT_PORT,
-      DD_TRACE_AGENT_URL,
-      DD_VERSION,
-      NODE_OPTIONS
-    } = getEnvironmentVariables()
-
-    const env = options.env ?? DD_ENV
-    const service = options.service || DD_SERVICE || 'node'
+      DD_TAGS
+    } = getProfilingEnvValues()
+
     const host = os.hostname()
-    const version = options.version ?? DD_VERSION
     // Must be longer than one minute so pad with five seconds
     const flushInterval = options.interval ?? (Number(DD_PROFILING_UPLOAD_PERIOD) * 1000 || 65 * 1000)
     const uploadTimeout = options.uploadTimeout ?? (Number(DD_PROFILING_UPLOAD_TIMEOUT) || 60 * 1000)
-    const sourceMap = options.sourceMap ?? DD_PROFILING_SOURCE_MAP ?? true
     const pprofPrefix = options.pprofPrefix ?? DD_PROFILING_PPROF_PREFIX ?? ''
 
-    this.service = service
-    this.env = env
+    // TODO: Remove the fallback. Just use the value from the config.
+    this.service = options.service || 'node'
+    this.env = options.env
     this.host = host
-    this.functionname = functionname
+    this.functionname = AWS_LAMBDA_FUNCTION_NAME
 
-    this.version = version
+    this.version = options.version
     this.tags = Object.assign(
       tagger.parse(DD_TAGS),
       tagger.parse(options.tags),
-      tagger.parse({ env, host, service, version, functionname }),
+      tagger.parse({
+        env: options.env,
+        host,
+        service: this.service,
+        version: this.version,
+        functionname: AWS_LAMBDA_FUNCTION_NAME
+      }),
       getAzureTagsFromMetadata(getIsAzureFunction() ? getAzureFunctionMetadata() : getAzureAppMetadata())
     )
 
@@ -104,7 +102,7 @@ class Config {
 
     this.flushInterval = flushInterval
     this.uploadTimeout = uploadTimeout
-    this.sourceMap = sourceMap
+    this.sourceMap = options.sourceMap
     this.debugSourceMaps = isTrue(options.debugSourceMaps ?? DD_PROFILING_DEBUG_SOURCE_MAPS)
     this.endpointCollectionEnabled = isTrue(options.endpointCollection ??
       DD_PROFILING_ENDPOINT_COLLECTION_ENABLED ?? samplingContextsAvailable)
@@ -113,12 +111,10 @@ class Config {
     this.pprofPrefix = pprofPrefix
     this.v8ProfilerBugWorkaroundEnabled = isTrue(options.v8ProfilerBugWorkaround ??
       DD_PROFILING_V8_PROFILER_BUG_WORKAROUND ?? true)
-    const hostname = (options.hostname ?? DD_AGENT_HOST) || defaults.hostname
-    const port = (options.port ?? DD_TRACE_AGENT_PORT) || defaults.port
-    this.url = new URL(options.url ?? DD_TRACE_AGENT_URL ?? format({
+    this.url = new URL(options.url || format({
       protocol: 'http:',
-      hostname,
-      port
+      hostname: options.hostname,
+      port: options.port
     }))
 
     this.libraryInjected = options.libraryInjected
@@ -439,3 +435,50 @@ function buildExportCommand (options) {
     path.join(__dirname, 'exporter_cli.js'),
     urls.join(','), tags, 'space']
 }
+
+function getProfilingEnvValues () {
+  return {
+    DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED:
+      getValueFromEnvSources('DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED'),
+    DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED'),
+    DD_PROFILING_CODEHOTSPOTS_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_CODEHOTSPOTS_ENABLED'),
+    DD_PROFILING_CPU_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_CPU_ENABLED'),
+    DD_PROFILING_DEBUG_SOURCE_MAPS:
+      getValueFromEnvSources('DD_PROFILING_DEBUG_SOURCE_MAPS'),
+    DD_PROFILING_DEBUG_UPLOAD_COMPRESSION:
+      getValueFromEnvSources('DD_PROFILING_DEBUG_UPLOAD_COMPRESSION'),
+    DD_PROFILING_ENDPOINT_COLLECTION_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_ENDPOINT_COLLECTION_ENABLED'),
+    DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES:
+      getValueFromEnvSources('DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES'),
+    DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE:
+      getValueFromEnvSources('DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE'),
+    DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT:
+      getValueFromEnvSources('DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT'),
+    DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED'),
+    DD_PROFILING_HEAP_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_HEAP_ENABLED'),
+    DD_PROFILING_HEAP_SAMPLING_INTERVAL:
+      getValueFromEnvSources('DD_PROFILING_HEAP_SAMPLING_INTERVAL'),
+    DD_PROFILING_PPROF_PREFIX:
+      getValueFromEnvSources('DD_PROFILING_PPROF_PREFIX'),
+    DD_PROFILING_PROFILERS:
+      getValueFromEnvSources('DD_PROFILING_PROFILERS'),
+    DD_PROFILING_TIMELINE_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_TIMELINE_ENABLED'),
+    DD_PROFILING_UPLOAD_PERIOD:
+      getValueFromEnvSources('DD_PROFILING_UPLOAD_PERIOD'),
+    DD_PROFILING_UPLOAD_TIMEOUT:
+      getValueFromEnvSources('DD_PROFILING_UPLOAD_TIMEOUT'),
+    DD_PROFILING_V8_PROFILER_BUG_WORKAROUND:
+      getValueFromEnvSources('DD_PROFILING_V8_PROFILER_BUG_WORKAROUND'),
+    DD_PROFILING_WALLTIME_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_WALLTIME_ENABLED'),
+    DD_TAGS:
+      getValueFromEnvSources('DD_TAGS')
+  }
+}

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

@@ -3,7 +3,7 @@
 const fs = require('fs')
 const { fileURLToPath } = require('url')
 const { SourceMapper, heap, encode } = require('@datadog/pprof')
-const { getEnvironmentVariable } = require('../config-helper')
+const { getValueFromEnvSources } = require('../config/helper')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 
@@ -17,9 +17,9 @@ function exporterFromURL (url) {
   if (url.protocol === 'file:') {
     return new FileExporter({ pprofPrefix: fileURLToPath(url) })
   }
-  const injectionEnabled = (getEnvironmentVariable('DD_INJECTION_ENABLED') ?? '').split(',')
+  const injectionEnabled = (getValueFromEnvSources('DD_INJECTION_ENABLED') ?? '').split(',')
   const libraryInjected = injectionEnabled.length > 0
-  const profilingEnabled = (getEnvironmentVariable('DD_PROFILING_ENABLED') ?? '').toLowerCase()
+  const profilingEnabled = (getValueFromEnvSources('DD_PROFILING_ENABLED') ?? '').toLowerCase()
   const activation = ['true', '1'].includes(profilingEnabled)
     ? 'manual'
     : profilingEnabled === 'auto'
@@ -62,12 +62,12 @@ async function exportProfile (urls, tags, profileType, profile) {
  * Expected command line arguments are:
  * - Comma separated list of URLs (eg. "http://127.0.0.1:8126/,file:///tmp/foo.pprof")
  * - Tags (eg. "service:nodejs_oom_test,version:1.0.0")
- * - Profiletype (eg. space,wall,cpu)
+ * - Profile type (eg. space,wall,cpu)
  * - JSON profile filepath
  */
 const urls = process.argv[2].split(',').map(s => new URL(s))
 const tags = tagger.parse(process.argv[3])
 const profileType = process.argv[4]
-const profile = JSON.parse(fs.readFileSync(process.argv[5]))
+const profile = JSON.parse(fs.readFileSync(process.argv[5], 'utf8'))
 
 exportProfile(urls, tags, profileType, profile)

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

@@ -73,7 +73,7 @@ function getBody (stream, callback) {
     callback(err)
   })
   stream.on('data', chunk => chunks.push(chunk))
-  stream.on('end', () => {
+  stream.once('end', () => {
     callback(null, Buffer.concat(chunks))
   })
 }

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,6 +1,6 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../config-helper')
+const { getEnvironmentVariable } = require('../config/helper')
 const { Profiler, ServerlessProfiler } = require('./profiler')
 const WallProfiler = require('./profilers/wall')
 const SpaceProfiler = require('./profilers/space')

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

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

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

@@ -5,6 +5,7 @@ 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')
@@ -63,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
     })
@@ -242,6 +294,7 @@ class Profiler extends EventEmitter {
 
   #createInitialInfos () {
     return {
+      serverless: this.serverless,
       settings: this.#config.systemInfoReport
     }
   }
@@ -351,6 +404,8 @@ class ServerlessProfiler extends Profiler {
     this.#flushAfterIntervals = undefined
   }
 
+  get serverless () { return true }
+
   get profiledIntervals () {
     return this.#profiledIntervals
   }

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

@@ -1,5 +1,6 @@
 'use strict'
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+
+const { getValueFromEnvSources } = require('./config/helper')
 const NoopProxy = require('./noop/proxy')
 const DatadogTracer = require('./tracer')
 const getConfig = require('./config')
@@ -130,7 +131,10 @@ class Tracer extends NoopProxy {
         const rc = new RemoteConfig(config)
 
         const tracingRemoteConfig = require('./config/remote_config')
-        tracingRemoteConfig.enable(rc, config, this._enableOrDisableTracing.bind(this))
+        tracingRemoteConfig.enable(rc, config, () => {
+          this.#updateTracing(config)
+          this.#updateDebugger(config, rc)
+        })
 
         rc.setProductHandler('AGENT_CONFIG', (action, conf) => {
           if (!conf?.name?.startsWith('flare-log-level.')) return
@@ -183,7 +187,7 @@ class Tracer extends NoopProxy {
         runtimeMetrics.start(config)
       }
 
-      this._enableOrDisableTracing(config)
+      this.#updateTracing(config)
 
       this._modules.rewriter.enable(config)
 
@@ -196,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 })
@@ -242,7 +246,7 @@ class Tracer extends NoopProxy {
     }
   }
 
-  _enableOrDisableTracing (config) {
+  #updateTracing (config) {
     if (config.tracing !== false) {
       if (config.appsec.enabled) {
         this._modules.appsec.enable(config)
@@ -287,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

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

@@ -8,7 +8,7 @@ const log = require('../log')
 const { getExtraServices } = require('../service-naming/extra-services')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const tagger = require('../tagger')
-const defaults = require('../config_defaults')
+const defaults = require('../config/defaults')
 const processTags = require('../process-tags')
 const Scheduler = require('./scheduler')
 const { UNACKNOWLEDGED, ACKNOWLEDGED, ERROR } = require('./apply_states')