dd-trace 5.46.0 → 5.48.0

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

@@ -1,6 +1,10 @@
 'use strict'
 
-module.exports = compile
+module.exports = {
+  compile,
+  compileSegments,
+  templateRequiresEvaluation
+}
 
 const identifierRegex = /^[@a-zA-Z_$][\w$]*$/
 
@@ -35,7 +39,37 @@ const reservedWords = new Set([
 
 const PRIMITIVE_TYPES = new Set(['string', 'number', 'bigint', 'boolean', 'undefined', 'symbol', 'null'])
 
-// TODO: Consider storing some of these functions on `process` so they can be reused across probes
+function templateRequiresEvaluation (segments) {
+  if (segments === undefined) return false // There should always be segments, but just in case
+  for (const { str } of segments) {
+    if (str === undefined) return true
+  }
+  return false
+}
+
+function compileSegments (segments) {
+  let result = '['
+  for (let i = 0; i < segments.length; i++) {
+    const { str, dsl, json } = segments[i]
+    result += str !== undefined
+      ? JSON.stringify(str)
+      : `(() => {
+          try {
+            const result = ${compile(json)}
+            return typeof result === 'string' ? result : $dd_inspect(result, $dd_segmentInspectOptions)
+          } catch (e) {
+            return { expr: ${JSON.stringify(dsl)}, message: \`\${e.name}: \${e.message}\` }
+          }
+        })()`
+    if (i !== segments.length - 1) {
+      result += ','
+    }
+  }
+  return `${result}]`
+}
+
+// TODO: Consider storing some of these functions that doesn't require closure access to the current scope on `process`
+// so they can be reused across probes
 function compile (node) {
   if (node === null || typeof node === 'number' || typeof node === 'boolean') {
     return node

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

@@ -16,10 +16,20 @@ const { NODE_MAJOR } = require('../../../../../version')
 require('./remote_config')
 
 // Expression to run on a call frame of the paused thread to get its active trace and span id.
-const expression = `
-  const context = global.require('dd-trace').scope().active()?.context();
-  ({ trace_id: context?.toTraceId(), span_id: context?.toSpanId() })
+const templateExpressionSetupCode = `
+  const $dd_inspect = global.require('node:util').inspect;
+  const $dd_segmentInspectOptions = {
+    depth: 0,
+    customInspect: false,
+    maxArrayLength: 3,
+    maxStringLength: 8 * 1024,
+    breakLength: Infinity
+  };
 `
+const getDDTagsExpression = `(() => {
+  const context = global.require('dd-trace').scope().active()?.context();
+  return { trace_id: context?.toTraceId(), span_id: context?.toSpanId() }
+})()`
 
 // There doesn't seem to be an official standard for the content of these fields, so we're just populating them with
 // something that should be useful to a Node.js developer.
@@ -45,6 +55,7 @@ session.on('Debugger.paused', async ({ params }) => {
   let sampled = false
   let numberOfProbesWithSnapshots = 0
   const probes = []
+  let templateExpressions = ''
 
   // V8 doesn't allow setting more than one breakpoint at a specific location, however, it's possible to set two
   // breakpoints just next to each other that will "snap" to the same logical location, which in turn will be hit at the
@@ -79,15 +90,6 @@ session.on('Debugger.paused', async ({ params }) => {
         continue
       }
 
-      if (shouldVerifyConditions && probe.condition !== undefined) {
-        const { result } = await session.post('Debugger.evaluateOnCallFrame', {
-          callFrameId: params.callFrames[0].callFrameId,
-          expression: probe.condition,
-          returnByValue: true
-        })
-        if (result.value !== true) continue
-      }
-
       if (probe.captureSnapshot === true) {
         // This algorithm to calculate number of sampled snapshots within the last second is not perfect, as it's not a
         // sliding window. But it's quick and easy :)
@@ -107,9 +109,24 @@ session.on('Debugger.paused', async ({ params }) => {
         maxLength = highestOrUndefined(probe.capture.maxLength, maxLength)
       }
 
+      if (shouldVerifyConditions && probe.condition !== undefined) {
+        // TODO: Bundle all conditions and evaluate them in a single call
+        // TODO: Handle errors
+        const { result } = await session.post('Debugger.evaluateOnCallFrame', {
+          callFrameId: params.callFrames[0].callFrameId,
+          expression: probe.condition,
+          returnByValue: true
+        })
+        if (result.value !== true) continue
+      }
+
       sampled = true
       probe.lastCaptureNs = start
 
+      if (probe.templateRequiresEvaluation) {
+        templateExpressions += `,${probe.template}`
+      }
+
       probes.push(probe)
     }
   }
@@ -119,7 +136,22 @@ session.on('Debugger.paused', async ({ params }) => {
   }
 
   const timestamp = Date.now()
-  const dd = await getDD(params.callFrames[0].callFrameId)
+
+  let evalResults = null
+  const { result } = await session.post('Debugger.evaluateOnCallFrame', {
+    callFrameId: params.callFrames[0].callFrameId,
+    expression: templateExpressions.length === 0
+      ? `[${getDDTagsExpression}]`
+      : `${templateExpressionSetupCode}[${getDDTagsExpression}${templateExpressions}]`,
+    returnByValue: true,
+    includeCommandLineAPI: true
+  })
+  if (result?.subtype === 'error') {
+    log.error('[debugger:devtools_client] Error evaluating code on call frame: %s', result?.description)
+    evalResults = []
+  } else {
+    evalResults = result?.value ?? []
+  }
 
   let processLocalState
   if (numberOfProbesWithSnapshots !== 0) {
@@ -155,6 +187,8 @@ session.on('Debugger.paused', async ({ params }) => {
   }
 
   const stack = getStackFromCallFrames(params.callFrames)
+  const dd = processDD(evalResults[0]) // the first result is the dd tags, the rest are the probe template results
+  let messageIndex = 1
 
   // TODO: Send multiple probes in one HTTP request as an array (DEBUG-2848)
   for (const probe of probes) {
@@ -179,9 +213,33 @@ session.on('Debugger.paused', async ({ params }) => {
       }
     }
 
+    let message = ''
+    if (probe.templateRequiresEvaluation) {
+      const results = evalResults[messageIndex++]
+      if (results === undefined) {
+        log.error('[debugger:devtools_client] No evaluation results for probe %s', probe.id)
+      } else {
+        for (const result of results) {
+          if (typeof result === 'string') {
+            message += result
+          } else {
+            // If `result` isn't a string, it's an evaluation error object
+            if (snapshot.evaluationErrors === undefined) {
+              snapshot.evaluationErrors = [result]
+            } else {
+              snapshot.evaluationErrors.push(result)
+            }
+            message += `{${result.message}}`
+          }
+        }
+      }
+    } else {
+      message = probe.template
+    }
+
     ackEmitting(probe)
-    // TODO: Process template (DEBUG-2628)
-    send(probe.template, logger, dd, snapshot)
+
+    send(message, logger, dd, snapshot)
   }
 })
 
@@ -189,22 +247,6 @@ function highestOrUndefined (num, max) {
   return num === undefined ? max : Math.max(num, max ?? 0)
 }
 
-async function getDD (callFrameId) {
-  // TODO: Consider if an `objectGroup` should be used, so it can be explicitly released using
-  // `Runtime.releaseObjectGroup`
-  const { result } = await session.post('Debugger.evaluateOnCallFrame', {
-    callFrameId,
-    expression,
-    returnByValue: true,
-    includeCommandLineAPI: true
-  })
-
-  if (result?.value?.trace_id === undefined) {
-    if (result?.subtype === 'error') {
-      log.error('[debugger:devtools_client] Error getting trace/span id:', result.description)
-    }
-    return
-  }
-
-  return result.value
+function processDD (result) {
+  return result?.trace_id === undefined ? undefined : result
 }

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

@@ -12,6 +12,7 @@ const { version } = require('../../../../../package.json')
 
 module.exports = send
 
+const MAX_MESSAGE_LENGTH = 8 * 1024 // 8KB
 const MAX_LOG_PAYLOAD_SIZE = 1024 * 1024 // 1MB
 
 const ddsource = 'dd_debugger'
@@ -36,7 +37,9 @@ function send (message, logger, dd, snapshot) {
     ddsource,
     hostname,
     service,
-    message,
+    message: message?.length > MAX_MESSAGE_LENGTH
+      ? message.slice(0, MAX_MESSAGE_LENGTH) + '…'
+      : message,
     logger,
     dd,
     debugger: { snapshot }

package/packages/dd-trace/src/debugger/devtools_client/source-maps.js

@@ -27,7 +27,7 @@ const self = module.exports = {
 
   async getGeneratedPosition (url, source, line, sourceMapURL) {
     const dir = dirname(new URL(url).pathname)
-    return await SourceMapConsumer.with(
+    return SourceMapConsumer.with(
       await self.loadSourceMap(dir, sourceMapURL),
       null,
       (consumer) => consumer.generatedPositionFor({ source, line, column: 0 })

package/packages/dd-trace/src/exporters/common/docker.js

@@ -2,34 +2,64 @@
 
 const fs = require('fs')
 
+const { DD_EXTERNAL_ENV } = process.env
+
 // The second part is the PCF / Garden regexp. We currently assume no suffix($) to avoid matching pod UIDs
 // See https://github.com/DataDog/datadog-agent/blob/7.40.x/pkg/util/cgroups/reader.go#L50
 const uuidSource =
 '[0-9a-f]{8}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{12}|[0-9a-f]{8}(?:-[0-9a-f]{4}){4}$'
 const containerSource = '[0-9a-f]{64}'
 const taskSource = '[0-9a-f]{32}-\\d+'
+const lineReg = /^(\d+):([^:]*):(.+)$/
 const entityReg = new RegExp(`.*(${uuidSource}|${containerSource}|${taskSource})(?:\\.scope)?$`, 'm')
 
+const cgroup = readControlGroup()
 const entityId = getEntityId()
+const inode = getInode()
 
 function getEntityId () {
-  const cgroup = readControlGroup() || ''
-  const match = cgroup.trim().match(entityReg) || []
+  const match = cgroup.match(entityReg) || []
 
   return match[1]
 }
 
+function getInode () {
+  const match = cgroup.match(lineReg) || []
+
+  return readInode(match[3])
+}
+
 function readControlGroup () {
   try {
-    return fs.readFileSync('/proc/self/cgroup').toString()
+    return fs.readFileSync('/proc/self/cgroup').toString().trim()
+  } catch (err) {
+    return ''
+  }
+}
+
+function readInode (path) {
+  if (!path) return 0
+
+  const strippedPath = path.replace(/^\//, '').replace(/\/$/, '')
+
+  try {
+    return fs.statSync(`/sys/fs/cgroup/${strippedPath}`).ino
   } catch (err) {
-    // ignore
+    return 0
   }
 }
 
 module.exports = {
-  // can be the container ID but not always depending on the orchestrator
-  id () {
-    return entityId
+  inject (carrier) {
+    if (entityId) {
+      carrier['Datadog-Container-Id'] = entityId
+      carrier['Datadog-Entity-ID'] = `ci-${entityId}`
+    } else if (inode) {
+      carrier['Datadog-Entity-ID'] = `in-${inode}`
+    }
+
+    if (DD_EXTERNAL_ENV) {
+      carrier['Datadog-External-Env'] = DD_EXTERNAL_ENV
+    }
   }
 }

package/packages/dd-trace/src/exporters/common/request.js

@@ -15,7 +15,6 @@ const { storage } = require('../../../../datadog-core')
 const log = require('../../log')
 
 const maxActiveRequests = 8
-const containerId = docker.id()
 
 let activeRequests = 0
 
@@ -63,9 +62,7 @@ function request (data, options, callback) {
     options.headers['Content-Length'] = byteLength(dataArray)
   }
 
-  if (containerId) {
-    options.headers['Datadog-Container-ID'] = containerId
-  }
+  docker.inject(options.headers)
 
   options.agent = isSecure ? httpsAgent : httpAgent
 

package/packages/dd-trace/src/llmobs/plugins/base.js

@@ -37,13 +37,13 @@ class LLMObsPlugin extends TracingPlugin {
     // register options may not be set for operations we do not trace with llmobs
     // ie OpenAI fine tuning jobs, file jobs, etc.
     if (registerOptions) {
-      telemetry.incrementLLMObsSpanStartCount({ autoinstrumented: true, integration: this.constructor.id })
+      telemetry.incrementLLMObsSpanStartCount({ autoinstrumented: true, integration: this.constructor.integration })
 
       ctx.llmobs = {} // initialize context-based namespace
       llmobsStorage.enterWith({ span })
       ctx.llmobs.parent = parent
 
-      this._tagger.registerLLMObsSpan(span, { parent, integration: this.constructor.id, ...registerOptions })
+      this._tagger.registerLLMObsSpan(span, { parent, integration: this.constructor.integration, ...registerOptions })
     }
   }
 

package/packages/dd-trace/src/llmobs/plugins/langchain/index.js

@@ -20,7 +20,8 @@ const ChatModelHandler = require('./handlers/chat_model')
 const LlmHandler = require('./handlers/llm')
 const EmbeddingHandler = require('./handlers/embedding')
 
-class LangChainLLMObsPlugin extends LLMObsPlugin {
+class BaseLangChainLLMObsPlugin extends LLMObsPlugin {
+  static get integration () { return 'langchain' }
   static get id () { return 'langchain' }
   static get prefix () {
     return 'tracing:apm:langchain:invoke'
@@ -55,8 +56,11 @@ class LangChainLLMObsPlugin extends LLMObsPlugin {
   }
 
   setLLMObsTags (ctx) {
+    ctx.args = ctx.arguments
+    ctx.instance = ctx.self
+
     const span = ctx.currentStore?.span
-    const type = ctx.type // langchain operation type (oneof chain,chat_model,llm,embedding)
+    const type = ctx.type = this.constructor.lcType // langchain operation type (oneof chain,chat_model,llm,embedding)
 
     if (!Object.keys(this._handlers).includes(type)) {
       log.warn(`Unsupported LangChain operation type: ${type}`)
@@ -129,4 +133,59 @@ class LangChainLLMObsPlugin extends LLMObsPlugin {
   }
 }
 
-module.exports = LangChainLLMObsPlugin
+class RunnableSequenceInvokePlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_rs_invoke' }
+  static get lcType () { return 'chain' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:RunnableSequence_invoke'
+  }
+}
+
+class RunnableSequenceBatchPlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_rs_batch' }
+  static get lcType () { return 'chain' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:RunnableSequence_batch'
+  }
+}
+
+class BaseChatModelGeneratePlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_chat_model_generate' }
+  static get lcType () { return 'chat_model' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:BaseChatModel_generate'
+  }
+}
+
+class BaseLLMGeneratePlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_llm_generate' }
+  static get lcType () { return 'llm' }
+  static get prefix () {
+    return 'tracing:orchestrion:@langchain/core:BaseLLM_generate'
+  }
+}
+
+class EmbeddingsEmbedQueryPlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_embeddings_embed_query' }
+  static get lcType () { return 'embedding' }
+  static get prefix () {
+    return 'tracing:apm:@langchain/core:Embeddings_embedQuery'
+  }
+}
+
+class EmbeddingsEmbedDocumentsPlugin extends BaseLangChainLLMObsPlugin {
+  static get id () { return 'llmobs_langchain_embeddings_embed_documents' }
+  static get lcType () { return 'embedding' }
+  static get prefix () {
+    return 'tracing:apm:@langchain/core:Embeddings_embedDocuments'
+  }
+}
+
+module.exports = [
+  RunnableSequenceInvokePlugin,
+  RunnableSequenceBatchPlugin,
+  BaseChatModelGeneratePlugin,
+  BaseLLMGeneratePlugin,
+  EmbeddingsEmbedQueryPlugin,
+  EmbeddingsEmbedDocumentsPlugin
+]

package/packages/dd-trace/src/llmobs/plugins/openai.js

@@ -11,6 +11,7 @@ function isIterable (obj) {
 
 class OpenAiLLMObsPlugin extends LLMObsPlugin {
   static get id () { return 'openai' }
+  static get integration () { return 'openai' }
   static get prefix () {
     return 'tracing:apm:openai:request'
   }

package/packages/dd-trace/src/llmobs/plugins/vertexai.js

@@ -7,7 +7,8 @@ const {
 } = require('../../../../datadog-plugin-google-cloud-vertexai/src/utils')
 
 class VertexAILLMObsPlugin extends LLMObsPlugin {
-  static get id () { return 'vertexai' } // used for llmobs telemetry
+  static get integration () { return 'vertexai' } // used for llmobs telemetry
+  static get id () { return 'vertexai' }
   static get prefix () {
     return 'tracing:apm:vertexai:request'
   }

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

@@ -121,6 +121,8 @@ const log = {
   }
 }
 
+logWriter.setStackTraceLimitFunction(log.error)
+
 log.reset()
 
 log.toggle(log.isEnabled(), log.getLogLevel())

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

@@ -13,6 +13,7 @@ const defaultLogger = {
 let enabled = false
 let logger = defaultLogger
 let logChannel = new LogChannel()
+let stackTraceLimitFunction = onError
 
 function withNoop (fn) {
   const store = storage('legacy').getStore()
@@ -61,12 +62,28 @@ function getErrorLog (err) {
   }
 }
 
+function setStackTraceLimitFunction (fn) {
+  if (typeof fn !== 'function') {
+    throw new TypeError('stackTraceLimitFunction must be a function')
+  }
+  stackTraceLimitFunction = fn
+}
+
 function onError (err) {
   const { formatted, cause } = getErrorLog(err)
 
   // calling twice logger.error() because Error cause is only available in nodejs v16.9.0
   // TODO: replace it with Error(message, { cause }) when cause has broad support
-  if (formatted) withNoop(() => logger.error(new Error(formatted)))
+  if (formatted) {
+    withNoop(() => {
+      const l = Error.stackTraceLimit
+      Error.stackTraceLimit = 0
+      const e = new Error(formatted)
+      Error.stackTraceLimit = l
+      Error.captureStackTrace(e, stackTraceLimitFunction)
+      logger.error(e)
+    })
+  }
   if (cause) withNoop(() => logger.error(cause))
 }
 
@@ -122,4 +139,4 @@ function trace (...args) {
   onTrace(Log.parse(...args))
 }
 
-module.exports = { use, toggle, reset, error, warn, info, debug, trace }
+module.exports = { use, toggle, reset, error, warn, info, debug, trace, setStackTraceLimitFunction }

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -298,6 +298,7 @@ class TextMapPropagator {
 
   _extractSpanContext (carrier) {
     let context = null
+    let style = ''
     for (const extractor of this._config.tracePropagationStyle.extract) {
       let extractedContext = null
       switch (extractor) {
@@ -331,9 +332,9 @@ class TextMapPropagator {
 
       if (context === null) {
         context = extractedContext
+        style = extractor
         if (this._config.tracePropagationExtractFirst) {
-          this._extractBaggageItems(carrier, context)
-          return context
+          break
         }
       } else {
         // If extractor is tracecontext, add tracecontext specific information to the context
@@ -342,7 +343,7 @@ class TextMapPropagator {
             this._extractTraceparentContext(carrier), context, carrier)
         }
         if (extractedContext._traceId && extractedContext._spanId &&
-           extractedContext.toTraceId(true) !== context.toTraceId(true)) {
+          extractedContext.toTraceId(true) !== context.toTraceId(true)) {
           const link = {
             context: extractedContext,
             attributes: { reason: 'terminated_context', context_headers: extractor }
@@ -354,6 +355,19 @@ class TextMapPropagator {
 
     this._extractBaggageItems(carrier, context)
 
+    if (this._config.tracePropagationBehaviorExtract === 'ignore') {
+      context._links = []
+    } else if (this._config.tracePropagationBehaviorExtract === 'restart') {
+      context._links = []
+      context._links.push({
+        context,
+        attributes:
+        {
+          reason: 'propagation_behavior_extract', context_headers: style
+        }
+      })
+    }
+
     return context || this._extractSqsdContext(carrier)
   }
 

package/packages/dd-trace/src/opentracing/span.js

@@ -319,6 +319,12 @@ class DatadogSpan {
     let spanContext
     let startTime
 
+    let baggage = {}
+    if (parent && parent._isRemote && this._parentTracer?._config?.tracePropagationBehaviorExtract !== 'continue') {
+      baggage = parent._baggageItems
+      parent = null
+    }
+
     if (fields.context) {
       spanContext = fields.context
       if (!spanContext._trace.startTime) {
@@ -352,6 +358,10 @@ class DatadogSpan {
           .padStart(8, '0')
           .padEnd(16, '0')
       }
+
+      if (this._parentTracer?._config?.tracePropagationBehaviorExtract === 'restart') {
+        spanContext._baggageItems = baggage
+      }
     }
 
     spanContext._trace.ticks = spanContext._trace.ticks || now()

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

@@ -120,6 +120,12 @@ const TEST_LEVEL_EVENT_TYPES = [
   'test_module_end',
   'test_session_end'
 ]
+const TEST_RETRY_REASON_TYPES = {
+  efd: 'early_flake_detection',
+  atr: 'auto_test_retry',
+  atf: 'attempt_to_fix',
+  ext: 'external'
+}
 
 const DD_TEST_IS_USER_PROVIDED_SERVICE = '_dd.test.is_user_provided_service'
 
@@ -227,6 +233,7 @@ module.exports = {
   DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE,
   DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX,
   TEST_LEVEL_EVENT_TYPES,
+  TEST_RETRY_REASON_TYPES,
   getNumFromKnownTests,
   getFileAndLineNumberFromError,
   DI_ERROR_DEBUG_INFO_CAPTURED,

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

@@ -16,8 +16,6 @@ const perf = require('perf_hooks').performance
 const telemetryMetrics = require('../../telemetry/metrics')
 const profilersNamespace = telemetryMetrics.manager.namespace('profilers')
 
-const containerId = docker.id()
-
 const statusCodeCounters = []
 const requestCounter = profilersNamespace.count('profile_api.requests', [])
 const sizeDistribution = profilersNamespace.distribution('profile_api.bytes', [])
@@ -155,9 +153,7 @@ class AgentExporter extends EventSerializer {
           timeout: this._backoffTime * Math.pow(2, attempt)
         }
 
-        if (containerId) {
-          options.headers['Datadog-Container-ID'] = containerId
-        }
+        docker.inject(options.headers)
 
         if (this._url.protocol === 'unix:') {
           options.socketPath = this._url.pathname

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

@@ -70,7 +70,9 @@ function ensureChannelsActivated () {
 class NativeWallProfiler {
   constructor (options = {}) {
     this.type = 'wall'
-    this._asyncIdEnabled = !!options.asyncIdEnabled
+    // Currently there's a crash sometimes on worker threads trying to collect async IDs so for the
+    // time being we'll constrain it to only the main thread.
+    this._asyncIdEnabled = !!options.asyncIdEnabled && require('worker_threads').isMainThread
     this._codeHotspotsEnabled = !!options.codeHotspotsEnabled
     this._cpuProfilingEnabled = !!options.cpuProfilingEnabled
     this._endpointCollectionEnabled = !!options.endpointCollectionEnabled

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

@@ -70,7 +70,8 @@ class Tracer extends NoopProxy {
     this._modules = {
       appsec: new LazyModule(() => require('./appsec')),
       iast: new LazyModule(() => require('./appsec/iast')),
-      llmobs: new LazyModule(() => require('./llmobs'))
+      llmobs: new LazyModule(() => require('./llmobs')),
+      rewriter: new LazyModule(() => require('./appsec/iast/taint-tracking/rewriter'))
     }
   }
 
@@ -178,6 +179,8 @@ class Tracer extends NoopProxy {
 
       this._enableOrDisableTracing(config)
 
+      this._modules.rewriter.enable(config)
+
       if (config.tracing) {
         if (config.isManualApiEnabled) {
           const TestApiManualPlugin = require('./ci-visibility/test-api-manual/test-api-manual-plugin')
@@ -247,6 +250,7 @@ class Tracer extends NoopProxy {
       if (config.iast.enabled) {
         this._modules.iast.enable(config, this._tracer)
       }
+      // This needs to be after the IAST module is enabled
     } else if (this._tracingInitialized) {
       this._modules.appsec.disable()
       this._modules.iast.disable()