dd-trace 5.81.0 → 5.82.0

package/packages/dd-trace/src/appsec/waf/index.js

@@ -19,7 +19,17 @@ class WafUpdateError extends Error {
 
 let limiter = new Limiter(100)
 
+/** @typedef {import('./waf_manager')} WAFManager */
+
+/** @type {typeof import('./waf_manager') | null} */
+let WAFManager = null
+
+/**
+ * @typedef {import('./waf_manager').WAFManagerConfig & { rateLimit: number }} WAFConfig
+ */
+
 const waf = {
+  /** @type {WAFManager | null} */
   wafManager: null,
   init,
   destroy,
@@ -31,13 +41,17 @@ const waf = {
   WafUpdateError
 }
 
+/**
+ * @param {object} rules
+ * @param {WAFConfig} config
+ */
 function init (rules, config) {
   destroy()
 
   limiter = new Limiter(config.rateLimit)
 
-  // dirty require to make startup faster for serverless
-  const WAFManager = require('./waf_manager')
+  // Lazy loading improves the startup time
+  WAFManager = require('./waf_manager')
 
   waf.wafManager = new WAFManager(rules, config)
 
@@ -70,7 +84,7 @@ function updateConfig (product, configId, configPath, config) {
 
   try {
     if (product === 'ASM_DD') {
-      waf.wafManager.removeConfig(waf.wafManager.constructor.defaultWafConfigPath)
+      waf.wafManager.removeConfig((/** @type {NonNullable<typeof WAFManager>} */ (WAFManager)).defaultWafConfigPath)
     }
 
     const updateSucceeded = waf.wafManager.updateConfig(configPath, config)

package/packages/dd-trace/src/appsec/waf/waf_manager.js

@@ -6,9 +6,20 @@ const WAFContextWrapper = require('./waf_context_wrapper')
 
 const contexts = new WeakMap()
 
+/**
+ * @typedef {object} WAFManagerConfig
+ * @property {number} wafTimeout - Maximum time in microseconds for WAF execution
+ * @property {string} obfuscatorKeyRegex - Regex to redact sensitive data by key
+ * @property {string} obfuscatorValueRegex - Regex to redact sensitive data by value
+ */
+
 class WAFManager {
   static defaultWafConfigPath = 'datadog/00/ASM_DD/default/config'
 
+  /**
+   * @param {object} rules
+   * @param {WAFManagerConfig} config
+   */
   constructor (rules, config) {
     this.config = config
     this.wafTimeout = config.wafTimeout

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

@@ -3,8 +3,8 @@
 // Modeled after https://github.com/DataDog/libdatadog/blob/f3994857a59bb5679a65967138c5a3aec418a65f/ddcommon/src/azure_app_services.rs
 
 const os = require('os')
-const { getIsAzureFunction } = require('./serverless')
 const { getEnvironmentVariable, getEnvironmentVariables } = require('../../dd-trace/src/config-helper')
+const { getIsAzureFunction, getIsFlexConsumptionAzureFunction } = require('./serverless')
 
 function extractSubscriptionID (ownerName) {
   if (ownerName !== undefined) {
@@ -38,6 +38,7 @@ function buildMetadata () {
   const {
     COMPUTERNAME,
     DD_AAS_DOTNET_EXTENSION_VERSION,
+    DD_AZURE_RESOURCE_GROUP,
     FUNCTIONS_EXTENSION_VERSION,
     FUNCTIONS_WORKER_RUNTIME,
     FUNCTIONS_WORKER_RUNTIME_VERSION,
@@ -56,7 +57,12 @@ function buildMetadata () {
     ? ['functionapp', 'function']
     : ['app', 'app']
 
-  const resourceGroup = WEBSITE_RESOURCE_GROUP ?? extractResourceGroup(WEBSITE_OWNER_NAME)
+  // Azure Functions on Flex Consumption plans require the `DD_AZURE_RESOURCE_GROUP` env var.
+  // If this logic ever changes, update the logic in `libdatadog`, `serverless-components/src/datadog-trace-agent`,
+  // and the serverless compat layers accordingly.
+  const resourceGroup = getIsFlexConsumptionAzureFunction()
+    ? (DD_AZURE_RESOURCE_GROUP ?? WEBSITE_RESOURCE_GROUP ?? extractResourceGroup(WEBSITE_OWNER_NAME))
+    : (WEBSITE_RESOURCE_GROUP ?? extractResourceGroup(WEBSITE_OWNER_NAME))
 
   return trimObject({
     extensionVersion: DD_AAS_DOTNET_EXTENSION_VERSION,

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/worker/index.js

@@ -2,6 +2,7 @@
 
 const {
   workerData: {
+    config,
     breakpointSetChannel,
     breakpointHitChannel,
     breakpointRemoveChannel
@@ -21,6 +22,7 @@ const {
   getStackFromCallFrames
 } = require('../../../debugger/devtools_client/state')
 const log = require('../../../log')
+const processTags = require('../../../process-tags')
 
 let sessionStarted = false
 
@@ -55,6 +57,10 @@ session.on('Debugger.paused', async ({ params: { hitBreakpoints: [hitBreakpoint]
     language: 'javascript'
   }
 
+  if (config.propagateProcessTags?.enabled) {
+    snapshot[processTags.DYNAMIC_INSTRUMENTATION_FIELD_NAME] = processTags.tagsObject
+  }
+
   breakpointHitChannel.postMessage({ snapshot })
 })
 

package/packages/dd-trace/src/ci-visibility/exporters/agentless/index.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const URL = require('url').URL
-const Writer = require('./writer')
-const CoverageWriter = require('./coverage-writer')
 const CiVisibilityExporter = require('../ci-visibility-exporter')
 const log = require('../../../log')
+const Writer = require('./writer')
+const CoverageWriter = require('./coverage-writer')
 
 class AgentlessCiVisibilityExporter extends CiVisibilityExporter {
   constructor (config) {

package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js

@@ -2,7 +2,6 @@
 
 const URL = require('url').URL
 
-const { sendGitMetadata: sendGitMetadataRequest } = require('./git/git_metadata')
 const { getLibraryConfiguration: getLibraryConfigurationRequest } = require('../requests/get-library-configuration')
 const { getSkippableSuites: getSkippableSuitesRequest } = require('../intelligent-test-runner/get-skippable-suites')
 const { getKnownTests: getKnownTestsRequest } = require('../early-flake-detection/get-known-tests')
@@ -11,6 +10,7 @@ const { getTestManagementTests: getTestManagementTestsRequest } =
 const log = require('../../log')
 const AgentInfoExporter = require('../../exporters/common/agent-info-exporter')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../../plugins/util/tags')
+const { sendGitMetadata: sendGitMetadataRequest } = require('./git/git_metadata')
 
 function getTestConfigurationTags (tags) {
   if (!tags) {

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const Writer = require('./writer')
 const {
   JEST_WORKER_COVERAGE_PAYLOAD_CODE,
   JEST_WORKER_TRACE_PAYLOAD_CODE,
@@ -12,6 +11,7 @@ const {
   VITEST_WORKER_LOGS_PAYLOAD_CODE
 } = require('../../../plugins/util/test')
 const { getEnvironmentVariable } = require('../../../config-helper')
+const Writer = require('./writer')
 
 function getInterprocessTraceCode () {
   if (getEnvironmentVariable('JEST_WORKER_ID')) {

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

@@ -0,0 +1,34 @@
+'use strict'
+
+const RemoteConfigCapabilities = require('../remote_config/capabilities')
+
+/**
+ * Configures remote config for core APM tracing functionality
+ *
+ * @param {object} rc - RemoteConfig instance
+ * @param {object} config - Tracer config
+ * @param {Function} enableOrDisableTracing - Function to enable/disable tracing based on config
+ */
+function enable (rc, config, enableOrDisableTracing) {
+  // Register core APM tracing capabilities
+  rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_CUSTOM_TAGS, true)
+  rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_HTTP_HEADER_TAGS, true)
+  rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_LOGS_INJECTION, true)
+  rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_SAMPLE_RATE, true)
+  rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_ENABLED, true)
+  rc.updateCapabilities(RemoteConfigCapabilities.APM_TRACING_SAMPLE_RULES, true)
+
+  // APM_TRACING product handler - manages tracer configuration
+  rc.setProductHandler('APM_TRACING', (action, conf) => {
+    if (action === 'unapply') {
+      config.configure({}, true)
+    } else {
+      config.configure(conf.lib_config, true)
+    }
+    enableOrDisableTracing(config, rc)
+  })
+}
+
+module.exports = {
+  enable
+}

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

@@ -2,25 +2,30 @@
 
 const fs = require('fs')
 const os = require('os')
-const uuid = require('../../../vendor/dist/crypto-randomuuid') // we need to keep the old uuid dep because of cypress
 const { URL } = require('url')
+const path = require('path')
+const uuid = require('../../../vendor/dist/crypto-randomuuid') // we need to keep the old uuid dep because of cypress
 
+const set = require('../../datadog-core/src/utils/src/set')
+const { DD_MAJOR } = require('../../../version')
 const log = require('./log')
 const tagger = require('./tagger')
-const set = require('../../datadog-core/src/utils/src/set')
 const { isTrue, isFalse, normalizeProfilingEnabledValue } = require('./util')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('./plugins/util/tags')
 const { getGitMetadataFromGitProperties, removeUserSensitiveInfo, getRemoteOriginURL, resolveGitHeadSHA } =
   require('./git_properties')
 const { updateConfig } = require('./telemetry')
 const telemetryMetrics = require('./telemetry/metrics')
-const { isInServerlessEnvironment, getIsGCPFunction, getIsAzureFunction } = require('./serverless')
+const {
+  isInServerlessEnvironment,
+  getIsGCPFunction,
+  getIsAzureFunction,
+  enableGCPPubSubPushSubscription
+} = require('./serverless')
 const { ORIGIN_KEY } = require('./constants')
 const { appendRules } = require('./payload-tagging/config')
 const { getEnvironmentVariable: getEnv, getEnvironmentVariables } = require('./config-helper')
 const defaults = require('./config_defaults')
-const path = require('path')
-const { DD_MAJOR } = require('../../../version')
 
 const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
 
@@ -182,7 +187,7 @@ function validateNamingVersion (versionString) {
  * @param {string | string[]} input
  */
 function splitJSONPathRules (input) {
-  if (!input) return
+  if (!input || input === '$') return
   if (Array.isArray(input)) return input
   if (input === 'all') return []
   return input.split(',')
@@ -276,8 +281,6 @@ class Config {
       this.stableConfig = new StableConfig()
     }
 
-    const envs = getEnvironmentVariables()
-
     options = {
       ...options,
       appsec: options.appsec == null ? options.experimental?.appsec : options.appsec,
@@ -321,7 +324,7 @@ class Config {
     this.#defaults = defaults
     this.#applyDefaults()
     this.#applyStableConfig(this.stableConfig?.localEntries ?? {}, this.#localStableConfig)
-    this.#applyEnvironment(envs)
+    this.#applyEnvironment()
     this.#applyStableConfig(this.stableConfig?.fleetEntries ?? {}, this.#fleetStableConfig)
     this.#applyOptions(options)
     this.#applyCalculated()
@@ -342,7 +345,7 @@ class Config {
     }
 
     if (this.gitMetadataEnabled) {
-      this.#loadGitMetadata(envs)
+      this.#loadGitMetadata()
     }
   }
 
@@ -801,6 +804,7 @@ class Config {
     this.#setBoolean(target, 'injectForce', DD_INJECT_FORCE)
     this.#setBoolean(target, 'isAzureFunction', getIsAzureFunction())
     this.#setBoolean(target, 'isGCPFunction', getIsGCPFunction())
+    this.#setBoolean(target, 'gcpPubSubPushSubscriptionEnabled', enableGCPPubSubPushSubscription())
     target['langchain.spanCharLimit'] = maybeInt(DD_LANGCHAIN_SPAN_CHAR_LIMIT)
     target['langchain.spanPromptCompletionSampleRate'] = maybeFloat(DD_LANGCHAIN_SPAN_PROMPT_COMPLETION_SAMPLE_RATE)
     this.#setBoolean(target, 'legacyBaggageEnabled', DD_TRACE_LEGACY_BAGGAGE_ENABLED)
@@ -1152,9 +1156,8 @@ class Config {
     // This is reliant on environment config being set before options.
     // This is to make sure the origins of each value are tracked appropriately for telemetry.
     // We'll only set `llmobs.enabled` on the opts when it's not set on the environment, and options.llmobs is provided.
-    const llmobsEnabledEnv = this.#env['llmobs.enabled']
-    if (llmobsEnabledEnv == null && options.llmobs) {
-      this.#setBoolean(opts, 'llmobs.enabled', !!options.llmobs)
+    if (this.#env['llmobs.enabled'] == null && options.llmobs) {
+      this.#setBoolean(opts, 'llmobs.enabled', true)
     }
   }
 
@@ -1473,26 +1476,24 @@ class Config {
     }
   }
 
-  #loadGitMetadata (envs) {
+  #loadGitMetadata () {
     // try to read Git metadata from the environment variables
     this.repositoryUrl = removeUserSensitiveInfo(
-      envs.DD_GIT_REPOSITORY_URL ??
-      this.tags[GIT_REPOSITORY_URL]
+      getEnv('DD_GIT_REPOSITORY_URL') ?? this.tags[GIT_REPOSITORY_URL]
     )
-    this.commitSHA = envs.DD_GIT_COMMIT_SHA ??
-      this.tags[GIT_COMMIT_SHA]
+    this.commitSHA = getEnv('DD_GIT_COMMIT_SHA') ?? this.tags[GIT_COMMIT_SHA]
 
     // otherwise, try to read Git metadata from the git.properties file
     if (!this.repositoryUrl || !this.commitSHA) {
-      const DD_GIT_PROPERTIES_FILE = envs.DD_GIT_PROPERTIES_FILE ??
-        `${process.cwd()}/git.properties`
+      const DD_GIT_PROPERTIES_FILE = getEnv('DD_GIT_PROPERTIES_FILE')
+      const gitPropertiesFile = DD_GIT_PROPERTIES_FILE ?? `${process.cwd()}/git.properties`
       let gitPropertiesString
       try {
-        gitPropertiesString = fs.readFileSync(DD_GIT_PROPERTIES_FILE, 'utf8')
+        gitPropertiesString = fs.readFileSync(gitPropertiesFile, 'utf8')
       } catch (e) {
         // Only log error if the user has set a git.properties path
-        if (envs.DD_GIT_PROPERTIES_FILE) {
-          log.error('Error reading DD_GIT_PROPERTIES_FILE: %s', DD_GIT_PROPERTIES_FILE, e)
+        if (DD_GIT_PROPERTIES_FILE) {
+          log.error('Error reading DD_GIT_PROPERTIES_FILE: %s', gitPropertiesFile, e)
         }
       }
       if (gitPropertiesString) {
@@ -1503,11 +1504,11 @@ class Config {
     }
     // otherwise, try to read Git metadata from the .git/ folder
     if (!this.repositoryUrl || !this.commitSHA) {
-      const DD_GIT_FOLDER_PATH = envs.DD_GIT_FOLDER_PATH ??
-        path.join(process.cwd(), '.git')
+      const DD_GIT_FOLDER_PATH = getEnv('DD_GIT_FOLDER_PATH')
+      const gitFolderPath = DD_GIT_FOLDER_PATH ?? path.join(process.cwd(), '.git')
       if (!this.repositoryUrl) {
         // try to read git config (repository URL)
-        const gitConfigPath = path.join(DD_GIT_FOLDER_PATH, 'config')
+        const gitConfigPath = path.join(gitFolderPath, 'config')
         try {
           const gitConfigContent = fs.readFileSync(gitConfigPath, 'utf8')
           if (gitConfigContent) {
@@ -1515,14 +1516,14 @@ class Config {
           }
         } catch (e) {
           // Only log error if the user has set a .git/ path
-          if (envs.DD_GIT_FOLDER_PATH) {
+          if (DD_GIT_FOLDER_PATH) {
             log.error('Error reading git config: %s', gitConfigPath, e)
           }
         }
       }
       if (!this.commitSHA) {
         // try to read git HEAD (commit SHA)
-        const gitHeadSha = resolveGitHeadSHA(DD_GIT_FOLDER_PATH)
+        const gitHeadSha = resolveGitHeadSHA(gitFolderPath)
         if (gitHeadSha) {
           this.commitSHA = gitHeadSha
         }

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

@@ -114,6 +114,7 @@ module.exports = {
   isFlakyTestRetriesEnabled: false,
   flakyTestRetriesCount: 5,
   isGCPFunction: false,
+  isGCPPubSubPushSubscriptionEnabled: true,
   isGitUploadEnabled: false,
   isIntelligentTestRunnerEnabled: false,
   isManualApiEnabled: false,
@@ -205,7 +206,7 @@ module.exports = {
   'tracePropagationStyle.inject': ['datadog', 'tracecontext', 'baggage'],
   'tracePropagationStyle.extract': ['datadog', 'tracecontext', 'baggage'],
   'tracePropagationStyle.otelPropagators': false,
-  traceWebsocketMessagesEnabled: false,
+  traceWebsocketMessagesEnabled: true,
   traceWebsocketMessagesInheritSampling: true,
   traceWebsocketMessagesSeparateTraces: true,
   tracing: true,

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

@@ -50,8 +50,13 @@ module.exports = {
   GRPC_SERVER_ERROR_STATUSES: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
   DYNAMODB_PTR_KIND: 'aws.dynamodb.item',
   S3_PTR_KIND: 'aws.s3.object',
+  WEBSOCKET_PTR_KIND: 'websocket',
   SPAN_POINTER_DIRECTION: Object.freeze({
     UPSTREAM: 'u',
     DOWNSTREAM: 'd'
+  }),
+  SPAN_POINTER_DIRECTION_NAME: Object.freeze({
+    UPSTREAM: 'span-pointer-up',
+    DOWNSTREAM: 'span-pointer-down'
   })
 }

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

@@ -1,13 +1,15 @@
 'use strict'
 
+const { URL } = require('url')
+
 // Load binding first to not import other modules if it throws
 const libdatadog = require('@datadog/libdatadog')
 const binding = libdatadog.load('crashtracker')
 
 const log = require('../log')
 const defaults = require('../config_defaults')
-const { URL } = require('url')
 const pkg = require('../../../../package.json')
+const processTags = require('../process-tags')
 
 class Crashtracker {
   #started = false
@@ -77,6 +79,13 @@ class Crashtracker {
   #getMetadata (config) {
     const tags = Object.keys(config.tags).map(key => `${key}:${config.tags[key]}`)
 
+    // Add process tags to the tags array
+    for (const [key, value] of processTags.tags) {
+      if (value !== undefined) {
+        tags.push(`${key}:${value}`)
+      }
+    }
+
     return {
       library_name: pkg.name,
       library_version: pkg.version,

package/packages/dd-trace/src/datastreams/checkpointer.js

@@ -13,7 +13,7 @@ class DataStreamsCheckpointer {
    * @param {string} type - The type of the checkpoint, usually the streaming technology being used.
    *                       Examples include kafka, kinesis, sns etc.
    * @param {string} target - The target of data. This can be a topic, exchange or stream name.
-   * @param {Object} carrier - The carrier object to inject context into.
+   * @param {object} carrier - The carrier object to inject context into.
    */
   setProduceCheckpoint (type, target, carrier) {
     if (!this.config.dsmEnabled) return
@@ -33,7 +33,7 @@ class DataStreamsCheckpointer {
    * @param {string} type - The type of the checkpoint, usually the streaming technology being used.
    *                       Examples include kafka, kinesis, sns etc.
    * @param {string} source - The source of data. This can be a topic, exchange or stream name.
-   * @param {Object} carrier - The carrier object to extract context from.
+   * @param {object} carrier - The carrier object to extract context from.
    * @param {boolean} [manualCheckpoint=true] - Whether this checkpoint was manually set. Keep true if manually
    *                                           instrumenting. Manual instrumentation always overrides automatic
    *                                           instrumentation in the case a call is both manually and automatically

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

@@ -13,7 +13,7 @@ const {
 //
 // TODO: Remove this when DSM has been moved to dedicated plugins.
 /**
- * @template T extends new (...args: any[]) => any
+ * @template T extends new (...args: unknown[]) => unknown
  * @param {() => T} classGetter
  * @param {string[]} methods
  * @param {string[]} staticMethods

package/packages/dd-trace/src/datastreams/pathway.js

@@ -4,10 +4,10 @@
 // other languages use FNV1
 // this inconsistency is ok because hashes do not need to be consistent across services
 const crypto = require('crypto')
-const { encodeVarint, decodeVarint } = require('./encoding')
 const { LRUCache } = require('../../../../vendor/dist/lru-cache')
 const log = require('../log')
 const pick = require('../../../datadog-core/src/utils/src/pick')
+const { encodeVarint, decodeVarint } = require('./encoding')
 
 const cache = new LRUCache({ max: 500 })
 
@@ -44,7 +44,7 @@ function computeHash (service, env, edgeTags, parentHash) {
 }
 
 /**
- * @param {Object} dataStreamsContext
+ * @param {object} dataStreamsContext
  * @param {Buffer} dataStreamsContext.hash
  * @param {number} dataStreamsContext.pathwayStartNs
  * @param {number} dataStreamsContext.edgeStartNs
@@ -59,7 +59,7 @@ function encodePathwayContext (dataStreamsContext) {
 }
 
 /**
- * @param {Object} dataStreamsContext
+ * @param {object} dataStreamsContext
  * @param {Buffer} dataStreamsContext.hash
  * @param {number} dataStreamsContext.pathwayStartNs
  * @param {number} dataStreamsContext.edgeStartNs
@@ -72,7 +72,7 @@ function encodePathwayContextBase64 (dataStreamsContext) {
 
 /**
  * @param {Buffer} pathwayContext
- * @returns {Object}
+ * @returns {object}
  */
 function decodePathwayContext (pathwayContext) {
   if (pathwayContext == null || pathwayContext.length < 8) {
@@ -111,11 +111,11 @@ const DsmPathwayCodec = {
   // we use a class for encoding / decoding in case we update our encoding/decoding. A class will make updates easier
   // instead of using individual functions.
   /**
-   * @param {Object} dataStreamsContext
+   * @param {object} dataStreamsContext
    * @param {Buffer} dataStreamsContext.hash
    * @param {number} dataStreamsContext.pathwayStartNs
    * @param {number} dataStreamsContext.edgeStartNs
-   * @param {Object} carrier
+   * @param {object} carrier
    */
   encode (dataStreamsContext, carrier) {
     if (!dataStreamsContext || !dataStreamsContext.hash) {
@@ -127,7 +127,7 @@ const DsmPathwayCodec = {
   },
 
   /**
-   * @param {Object} carrier
+   * @param {object} carrier
    * @returns {ReturnType<typeof decodePathwayContext>|undefined}
    */
   decode (carrier) {

package/packages/dd-trace/src/datastreams/processor.js

@@ -4,14 +4,14 @@ const os = require('os')
 const pkg = require('../../../../package.json')
 
 const { LogCollapsingLowestDenseDDSketch } = require('../../../../vendor/dist/@datadog/sketches-js')
+const { PATHWAY_HASH } = require('../../../../ext/tags')
+const log = require('../log')
 const { DsmPathwayCodec } = require('./pathway')
 const { DataStreamsWriter } = require('./writer')
 const { computePathwayHash } = require('./pathway')
 const { getAmqpMessageSize, getHeadersSize, getMessageSize, getSizeOrZero } = require('./size')
-const { PATHWAY_HASH } = require('../../../../ext/tags')
 const { SchemaBuilder } = require('./schemas/schema_builder')
 const { SchemaSampler } = require('./schemas/schema_sampler')
-const log = require('../log')
 
 const ENTRY_PARENT_HASH = Buffer.from('0000000000000000', 'hex')
 

package/packages/dd-trace/src/datastreams/writer.js

@@ -1,12 +1,12 @@
 'use strict'
 
+const { URL, format } = require('url')
+const zlib = require('zlib')
 const pkg = require('../../../../package.json')
 const log = require('../log')
 const request = require('../exporters/common/request')
-const { URL, format } = require('url')
 const { MsgpackEncoder } = require('../msgpack')
 const defaults = require('../config_defaults')
-const zlib = require('zlib')
 
 const msgpack = new MsgpackEncoder()
 

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

@@ -8,6 +8,7 @@ module.exports = function getDebuggerConfig (config) {
     hostname: config.hostname,
     logLevel: config.logLevel,
     port: config.port,
+    propagateProcessTags: config.propagateProcessTags,
     repositoryUrl: config.repositoryUrl,
     runtimeId: config.tags['runtime-id'],
     service: config.service,

package/packages/dd-trace/src/debugger/devtools_client/config.js

@@ -2,8 +2,8 @@
 
 const { workerData: { config: parentConfig, parentThreadId, configPort } } = require('node:worker_threads')
 const { format } = require('node:url')
-const log = require('./log')
 const defaults = require('../../config_defaults')
+const log = require('./log')
 
 const config = module.exports = {
   ...parentConfig,

package/packages/dd-trace/src/debugger/devtools_client/index.js

@@ -1,6 +1,9 @@
 'use strict'
 
 const { randomUUID } = require('crypto')
+const { version } = require('../../../../../package.json')
+const { NODE_MAJOR } = require('../../../../../version')
+const processTags = require('../../process-tags')
 const { breakpointToProbes } = require('./state')
 const session = require('./session')
 const { getLocalStateForCallFrame } = require('./snapshot')
@@ -10,8 +13,6 @@ const { ackEmitting } = require('./status')
 const config = require('./config')
 const { MAX_SNAPSHOTS_PER_SECOND_GLOBALLY } = require('./defaults')
 const log = require('./log')
-const { version } = require('../../../../../package.json')
-const { NODE_MAJOR } = require('../../../../../version')
 
 require('./remote_config')
 
@@ -215,6 +216,10 @@ session.on('Debugger.paused', async ({ params }) => {
       language: 'javascript'
     }
 
+    if (config.propagateProcessTags.enabled) {
+      snapshot[processTags.DYNAMIC_INSTRUMENTATION_FIELD_NAME] = processTags.tagsObject
+    }
+
     if (probe.captureSnapshot) {
       if (captureErrors?.length > 0) {
         // There was an error collecting the snapshot for this probe, let's not try again

package/packages/dd-trace/src/debugger/devtools_client/send.js

@@ -3,13 +3,13 @@
 const { hostname: getHostname } = require('os')
 const { stringify } = require('querystring')
 
-const config = require('./config')
-const JSONBuffer = require('./json-buffer')
 const request = require('../../exporters/common/request')
 const { GIT_COMMIT_SHA, GIT_REPOSITORY_URL } = require('../../plugins/util/tags')
-const log = require('./log')
 const { version } = require('../../../../../package.json')
 const { getEnvironmentVariable } = require('../../config-helper')
+const log = require('./log')
+const JSONBuffer = require('./json-buffer')
+const config = require('./config')
 const { pruneSnapshot } = require('./snapshot-pruner')
 
 module.exports = send

package/packages/dd-trace/src/debugger/devtools_client/session.js

@@ -7,7 +7,7 @@ const inspector = require('./inspector_promises_polyfill')
  *   connect: () => void,
  *   connectToMainThread: () => void
  *   disconnect: () => void,
- *   post: (method: string, params?: object) => Promise<any>,
+ *   post: (method: string, params?: object) => Promise<unknown>,
  * }} CDPSession
  */
 const session = /** @type {CDPSession} */ (new inspector.Session())