dd-trace 5.5.0 → 5.6.0

package/packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -25,7 +25,10 @@ const {
   TEST_ITR_UNSKIPPABLE,
   TEST_ITR_FORCED_RUN,
   ITR_CORRELATION_ID,
-  TEST_SOURCE_FILE
+  TEST_SOURCE_FILE,
+  TEST_IS_NEW,
+  TEST_EARLY_FLAKE_IS_RETRY,
+  TEST_EARLY_FLAKE_IS_ENABLED
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
@@ -113,12 +116,9 @@ function getLibraryConfiguration (tracer, testConfiguration) {
   })
 }
 
-function getSkippableTests (isSuitesSkippingEnabled, tracer, testConfiguration) {
-  if (!isSuitesSkippingEnabled) {
-    return Promise.resolve({ skippableTests: [] })
-  }
+function getSkippableTests (tracer, testConfiguration) {
   return new Promise(resolve => {
-    if (!tracer._tracer._exporter?.getLibraryConfiguration) {
+    if (!tracer._tracer._exporter?.getSkippableSuites) {
       return resolve({ err: new Error('CI Visibility was not initialized correctly') })
     }
     tracer._tracer._exporter.getSkippableSuites(testConfiguration, (err, skippableTests, correlationId) => {
@@ -131,6 +131,20 @@ function getSkippableTests (isSuitesSkippingEnabled, tracer, testConfiguration)
   })
 }
 
+function getKnownTests (tracer, testConfiguration) {
+  return new Promise(resolve => {
+    if (!tracer._tracer._exporter?.getKnownTests) {
+      return resolve({ err: new Error('CI Visibility was not initialized correctly') })
+    }
+    tracer._tracer._exporter.getKnownTests(testConfiguration, (err, knownTests) => {
+      resolve({
+        err,
+        knownTests
+      })
+    })
+  })
+}
+
 function getSuiteStatus (suiteStats) {
   if (!suiteStats) {
     return 'skip'
@@ -183,10 +197,14 @@ class CypressPlugin {
     this.isTestsSkipped = false
     this.isSuitesSkippingEnabled = false
     this.isCodeCoverageEnabled = false
+    this.isEarlyFlakeDetectionEnabled = false
+    this.earlyFlakeDetectionNumRetries = 0
+    this.testsToSkip = []
     this.skippedTests = []
     this.hasForcedToRunSuites = false
     this.hasUnskippableSuites = false
     this.unskippableSuites = []
+    this.knownTests = []
   }
 
   init (tracer, cypressConfig) {
@@ -274,66 +292,101 @@ class CypressPlugin {
     })
   }
 
-  beforeRun (details) {
+  isNewTest (testName, testSuite) {
+    return !this.knownTestsByTestSuite?.[testSuite]?.includes(testName)
+  }
+
+  async beforeRun (details) {
     this.command = getCypressCommand(details)
     this.frameworkVersion = getCypressVersion(details)
     this.rootDir = getRootDir(details)
 
-    return getLibraryConfiguration(this.tracer, this.testConfiguration).then(({ err, libraryConfig }) => {
-      if (err) {
-        log.error(err)
+    const libraryConfigurationResponse = await getLibraryConfiguration(this.tracer, this.testConfiguration)
+
+    if (libraryConfigurationResponse.err) {
+      log.error(libraryConfigurationResponse.err)
+    } else {
+      const {
+        libraryConfig: {
+          isSuitesSkippingEnabled,
+          isCodeCoverageEnabled,
+          isEarlyFlakeDetectionEnabled,
+          earlyFlakeDetectionNumRetries
+        }
+      } = libraryConfigurationResponse
+      this.isSuitesSkippingEnabled = isSuitesSkippingEnabled
+      this.isCodeCoverageEnabled = isCodeCoverageEnabled
+      this.isEarlyFlakeDetectionEnabled = isEarlyFlakeDetectionEnabled
+      this.earlyFlakeDetectionNumRetries = earlyFlakeDetectionNumRetries
+    }
+
+    if (this.isEarlyFlakeDetectionEnabled) {
+      const knownTestsResponse = await getKnownTests(
+        this.tracer,
+        this.testConfiguration
+      )
+      if (knownTestsResponse.err) {
+        log.error(knownTestsResponse.err)
       } else {
-        this.isSuitesSkippingEnabled = libraryConfig.isSuitesSkippingEnabled
-        this.isCodeCoverageEnabled = libraryConfig.isCodeCoverageEnabled
+        // We use TEST_FRAMEWORK_NAME for the name of the module
+        this.knownTestsByTestSuite = knownTestsResponse.knownTests[TEST_FRAMEWORK_NAME]
       }
+    }
 
-      return getSkippableTests(this.isSuitesSkippingEnabled, this.tracer, this.testConfiguration)
-        .then(({ err, skippableTests, correlationId }) => {
-          if (err) {
-            log.error(err)
-          } else {
-            this.testsToSkip = skippableTests || []
-            this.itrCorrelationId = correlationId
-          }
+    if (this.isSuitesSkippingEnabled) {
+      const skippableTestsResponse = await getSkippableTests(
+        this.tracer,
+        this.testConfiguration
+      )
+      if (skippableTestsResponse.err) {
+        log.error(skippableTestsResponse.err)
+      } else {
+        const { skippableTests, correlationId } = skippableTestsResponse
+        this.testsToSkip = skippableTests || []
+        this.itrCorrelationId = correlationId
+      }
+    }
 
-          // `details.specs` are test files
-          details.specs?.forEach(({ absolute, relative }) => {
-            const isUnskippableSuite = isMarkedAsUnskippable({ path: absolute })
-            if (isUnskippableSuite) {
-              this.unskippableSuites.push(relative)
-            }
-          })
+    // `details.specs` are test files
+    details.specs?.forEach(({ absolute, relative }) => {
+      const isUnskippableSuite = isMarkedAsUnskippable({ path: absolute })
+      if (isUnskippableSuite) {
+        this.unskippableSuites.push(relative)
+      }
+    })
 
-          const childOf = getTestParentSpan(this.tracer)
+    const childOf = getTestParentSpan(this.tracer)
 
-          const testSessionSpanMetadata =
-            getTestSessionCommonTags(this.command, this.frameworkVersion, TEST_FRAMEWORK_NAME)
-          const testModuleSpanMetadata =
-            getTestModuleCommonTags(this.command, this.frameworkVersion, TEST_FRAMEWORK_NAME)
+    const testSessionSpanMetadata =
+      getTestSessionCommonTags(this.command, this.frameworkVersion, TEST_FRAMEWORK_NAME)
+    const testModuleSpanMetadata =
+      getTestModuleCommonTags(this.command, this.frameworkVersion, TEST_FRAMEWORK_NAME)
 
-          this.testSessionSpan = this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_session`, {
-            childOf,
-            tags: {
-              [COMPONENT]: TEST_FRAMEWORK_NAME,
-              ...this.testEnvironmentMetadata,
-              ...testSessionSpanMetadata
-            }
-          })
-          this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'session')
-
-          this.testModuleSpan = this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_module`, {
-            childOf: this.testSessionSpan,
-            tags: {
-              [COMPONENT]: TEST_FRAMEWORK_NAME,
-              ...this.testEnvironmentMetadata,
-              ...testModuleSpanMetadata
-            }
-          })
-          this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'module')
+    if (this.isEarlyFlakeDetectionEnabled) {
+      testSessionSpanMetadata[TEST_EARLY_FLAKE_IS_ENABLED] = 'true'
+    }
 
-          return details
-        })
+    this.testSessionSpan = this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_session`, {
+      childOf,
+      tags: {
+        [COMPONENT]: TEST_FRAMEWORK_NAME,
+        ...this.testEnvironmentMetadata,
+        ...testSessionSpanMetadata
+      }
     })
+    this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'session')
+
+    this.testModuleSpan = this.tracer.startSpan(`${TEST_FRAMEWORK_NAME}.test_module`, {
+      childOf: this.testSessionSpan,
+      tags: {
+        [COMPONENT]: TEST_FRAMEWORK_NAME,
+        ...this.testEnvironmentMetadata,
+        ...testModuleSpanMetadata
+      }
+    })
+    this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'module')
+
+    return details
   }
 
   afterRun (suiteStats) {
@@ -471,12 +524,18 @@ class CypressPlugin {
 
   getTasks () {
     return {
-      'dd:testSuiteStart': (suite) => {
+      'dd:testSuiteStart': (testSuite) => {
+        const suitePayload = {
+          isEarlyFlakeDetectionEnabled: this.isEarlyFlakeDetectionEnabled,
+          knownTestsForSuite: this.knownTestsByTestSuite?.[testSuite] || [],
+          earlyFlakeDetectionNumRetries: this.earlyFlakeDetectionNumRetries
+        }
+
         if (this.testSuiteSpan) {
-          return null
+          return suitePayload
         }
-        this.testSuiteSpan = this.getTestSuiteSpan(suite)
-        return null
+        this.testSuiteSpan = this.getTestSuiteSpan(testSuite)
+        return suitePayload
       },
       'dd:beforeEach': (test) => {
         const { testName, testSuite } = test
@@ -500,7 +559,7 @@ class CypressPlugin {
         return this.activeTestSpan ? { traceId: this.activeTestSpan.context().toTraceId() } : {}
       },
       'dd:afterEach': ({ test, coverage }) => {
-        const { state, error, isRUMActive, testSourceLine, testSuite, testName } = test
+        const { state, error, isRUMActive, testSourceLine, testSuite, testName, isNew, isEfdRetry } = test
         if (this.activeTestSpan) {
           if (coverage && this.isCodeCoverageEnabled && this.tracer._tracer._exporter?.exportCoverage) {
             const coverageFiles = getCoveredFilenamesFromCoverage(coverage)
@@ -530,6 +589,12 @@ class CypressPlugin {
           if (testSourceLine) {
             this.activeTestSpan.setTag(TEST_SOURCE_START, testSourceLine)
           }
+          if (isNew) {
+            this.activeTestSpan.setTag(TEST_IS_NEW, 'true')
+            if (isEfdRetry) {
+              this.activeTestSpan.setTag(TEST_EARLY_FLAKE_IS_RETRY, 'true')
+            }
+          }
           const finishedTest = {
             testName,
             testStatus,

package/packages/datadog-plugin-cypress/src/support.js

@@ -1,4 +1,43 @@
 /* eslint-disable */
+let isEarlyFlakeDetectionEnabled = false
+let knownTestsForSuite = []
+let suiteTests = []
+let earlyFlakeDetectionNumRetries = 0
+
+function isNewTest (test) {
+  return !knownTestsForSuite.includes(test.fullTitle())
+}
+
+function retryTest (test, suiteTests) {
+  for (let retryIndex = 0; retryIndex < earlyFlakeDetectionNumRetries; retryIndex++) {
+    const clonedTest = test.clone()
+    // TODO: signal in framework logs that this is a retry.
+    // TODO: Change it so these tests are allowed to fail.
+    // TODO: figure out if reported duration is skewed.
+    suiteTests.unshift(clonedTest)
+    clonedTest._ddIsNew = true
+    clonedTest._ddIsEfdRetry = true
+  }
+}
+
+
+const oldRunTests = Cypress.mocha.getRunner().runTests
+Cypress.mocha.getRunner().runTests = function (suite, fn) {
+  if (!isEarlyFlakeDetectionEnabled) {
+    return oldRunTests.apply(this, arguments)
+  }
+  // We copy the new tests at the beginning of the suite run (runTests), so that they're run
+  // multiple times.
+  suite.tests.forEach(test => {
+    if (!test._ddIsNew && !test.isPending() && isNewTest(test)) {
+      test._ddIsNew = true
+      retryTest(test, suite.tests)
+    }
+  })
+
+  return oldRunTests.apply(this, [suite, fn])
+}
+
 beforeEach(function () {
   cy.task('dd:beforeEach', {
     testName: Cypress.mocha.getRunner().suite.ctx.currentTest.fullTitle(),
@@ -11,8 +50,14 @@ beforeEach(function () {
   })
 })
 
-before(() => {
-  cy.task('dd:testSuiteStart', Cypress.mocha.getRootSuite().file)
+before(function () {
+  cy.task('dd:testSuiteStart', Cypress.mocha.getRootSuite().file).then((suiteConfig) => {
+    if (suiteConfig) {
+      isEarlyFlakeDetectionEnabled = suiteConfig.isEarlyFlakeDetectionEnabled
+      knownTestsForSuite = suiteConfig.knownTestsForSuite
+      earlyFlakeDetectionNumRetries = suiteConfig.earlyFlakeDetectionNumRetries
+    }
+  })
 })
 
 after(() => {
@@ -24,7 +69,7 @@ after(() => {
 })
 
 
-afterEach(() => {
+afterEach(function () {
   cy.window().then(win => {
     const currentTest = Cypress.mocha.getRunner().suite.ctx.currentTest
     const testInfo = {
@@ -32,6 +77,8 @@ afterEach(() => {
       testSuite: Cypress.mocha.getRootSuite().file,
       state: currentTest.state,
       error: currentTest.err,
+      isNew: currentTest._ddIsNew,
+      isEfdRetry: currentTest._ddIsEfdRetry
     }
     try {
       testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line

package/packages/datadog-plugin-graphql/src/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const pick = require('../../utils/src/pick')
+const pick = require('../../datadog-core/src/utils/src/pick')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 const log = require('../../dd-trace/src/log')
 const GraphQLExecutePlugin = require('./execute')

package/packages/datadog-plugin-graphql/src/resolve.js

@@ -122,15 +122,17 @@ function getResolverInfo (info, args) {
     Object.assign(resolverVars, args)
   }
 
-  const directives = info.fieldNodes[0].directives
-  for (const directive of directives) {
-    const argList = {}
-    for (const argument of directive['arguments']) {
-      argList[argument.name.value] = argument.value.value
-    }
+  const directives = info.fieldNodes?.[0]?.directives
+  if (Array.isArray(directives)) {
+    for (const directive of directives) {
+      const argList = {}
+      for (const argument of directive['arguments']) {
+        argList[argument.name.value] = argument.value.value
+      }
 
-    if (Object.keys(argList).length) {
-      resolverVars[directive.name.value] = argList
+      if (Object.keys(argList).length) {
+        resolverVars[directive.name.value] = argList
+      }
     }
   }
 

package/packages/datadog-plugin-grpc/src/util.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const pick = require('../../utils/src/pick')
+const pick = require('../../datadog-core/src/utils/src/pick')
 const log = require('../../dd-trace/src/log')
 
 module.exports = {

package/packages/datadog-plugin-jest/src/index.js

@@ -18,7 +18,8 @@ const {
   TEST_SOURCE_FILE,
   TEST_IS_NEW,
   TEST_EARLY_FLAKE_IS_RETRY,
-  TEST_EARLY_FLAKE_IS_ENABLED
+  TEST_EARLY_FLAKE_IS_ENABLED,
+  JEST_DISPLAY_NAME
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const id = require('../../dd-trace/src/id')
@@ -144,7 +145,7 @@ class JestPlugin extends CiPlugin {
       })
     })
 
-    this.addSub('ci:jest:test-suite:start', ({ testSuite, testEnvironmentOptions, frameworkVersion }) => {
+    this.addSub('ci:jest:test-suite:start', ({ testSuite, testEnvironmentOptions, frameworkVersion, displayName }) => {
       const {
         _ddTestSessionId: testSessionId,
         _ddTestCommand: testCommand,
@@ -179,6 +180,9 @@ class JestPlugin extends CiPlugin {
       if (itrCorrelationId) {
         testSuiteMetadata[ITR_CORRELATION_ID] = itrCorrelationId
       }
+      if (displayName) {
+        testSuiteMetadata[JEST_DISPLAY_NAME] = displayName
+      }
 
       this.testSuiteSpan = this.tracer.startSpan('jest.test_suite', {
         childOf: testSessionSpanContext,
@@ -308,6 +312,7 @@ class JestPlugin extends CiPlugin {
       suite,
       name,
       runner,
+      displayName,
       testParameters,
       frameworkVersion,
       testStartLine,
@@ -327,6 +332,10 @@ class JestPlugin extends CiPlugin {
     // If for whatever we don't have the source file, we'll fall back to the suite name
     extraTags[TEST_SOURCE_FILE] = testSourceFile || suite
 
+    if (displayName) {
+      extraTags[JEST_DISPLAY_NAME] = displayName
+    }
+
     if (isNew) {
       extraTags[TEST_IS_NEW] = 'true'
       if (isEfdRetry) {

package/packages/datadog-plugin-kafkajs/src/consumer.js

@@ -1,7 +1,8 @@
 'use strict'
 
 const dc = require('dc-polyfill')
-const { getMessageSize, CONTEXT_PROPAGATION_KEY } = require('../../dd-trace/src/datastreams/processor')
+const { getMessageSize } = require('../../dd-trace/src/datastreams/processor')
+const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams/pathway')
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 
 const afterStartCh = dc.channel('dd-trace:kafkajs:consumer:afterStart')
@@ -77,9 +78,9 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
         'kafka.partition': partition
       }
     })
-    if (this.config.dsmEnabled) {
+    if (this.config.dsmEnabled && message?.headers && DsmPathwayCodec.contextExists(message.headers)) {
       const payloadSize = getMessageSize(message)
-      this.tracer.decodeDataStreamsContext(message.headers[CONTEXT_PROPAGATION_KEY])
+      this.tracer.decodeDataStreamsContext(message.headers)
       this.tracer
         .setCheckpoint(['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka'], span, payloadSize)
     }

package/packages/datadog-plugin-kafkajs/src/producer.js

@@ -1,8 +1,8 @@
 'use strict'
 
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
-const { encodePathwayContext } = require('../../dd-trace/src/datastreams/pathway')
-const { getMessageSize, CONTEXT_PROPAGATION_KEY } = require('../../dd-trace/src/datastreams/processor')
+const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams/pathway')
+const { getMessageSize } = require('../../dd-trace/src/datastreams/processor')
 
 const BOOTSTRAP_SERVERS_KEY = 'messaging.kafka.bootstrap.servers'
 
@@ -67,7 +67,6 @@ class KafkajsProducerPlugin extends ProducerPlugin {
   }
 
   start ({ topic, messages, bootstrapServers }) {
-    let pathwayCtx
     const span = this.startSpan({
       resource: topic,
       meta: {
@@ -88,8 +87,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
           const payloadSize = getMessageSize(message)
           const dataStreamsContext = this.tracer
             .setCheckpoint(['direction:out', `topic:${topic}`, 'type:kafka'], span, payloadSize)
-          pathwayCtx = encodePathwayContext(dataStreamsContext)
-          message.headers[CONTEXT_PROPAGATION_KEY] = pathwayCtx
+          DsmPathwayCodec.encode(dataStreamsContext, message.headers)
         }
       }
     }

package/packages/datadog-plugin-playwright/src/index.js

@@ -30,11 +30,23 @@ class PlaywrightPlugin extends CiPlugin {
     super(...args)
 
     this._testSuites = new Map()
+    this.numFailedTests = 0
+    this.numFailedSuites = 0
 
     this.addSub('ci:playwright:session:finish', ({ status, onDone }) => {
       this.testModuleSpan.setTag(TEST_STATUS, status)
       this.testSessionSpan.setTag(TEST_STATUS, status)
 
+      if (this.numFailedSuites > 0) {
+        let errorMessage = `Test suites failed: ${this.numFailedSuites}.`
+        if (this.numFailedTests > 0) {
+          errorMessage += ` Tests failed: ${this.numFailedTests}`
+        }
+        const error = new Error(errorMessage)
+        this.testModuleSpan.setTag('error', error)
+        this.testSessionSpan.setTag('error', error)
+      }
+
       this.testModuleSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
       this.testSessionSpan.finish()
@@ -42,6 +54,7 @@ class PlaywrightPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       appClosingTelemetry()
       this.tracer._exporter.flush(onDone)
+      this.numFailedTests = 0
     })
 
     this.addSub('ci:playwright:test-suite:start', (testSuiteAbsolutePath) => {
@@ -69,11 +82,21 @@ class PlaywrightPlugin extends CiPlugin {
       this._testSuites.set(testSuite, testSuiteSpan)
     })
 
-    this.addSub('ci:playwright:test-suite:finish', (status) => {
+    this.addSub('ci:playwright:test-suite:finish', ({ status, error }) => {
       const store = storage.getStore()
       const span = store && store.span
       if (!span) return
-      span.setTag(TEST_STATUS, status)
+      if (error) {
+        span.setTag('error', error)
+        span.setTag(TEST_STATUS, 'fail')
+      } else {
+        span.setTag(TEST_STATUS, status)
+      }
+
+      if (status === 'fail' || error) {
+        this.numFailedSuites++
+      }
+
       span.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
     })
@@ -114,11 +137,19 @@ class PlaywrightPlugin extends CiPlugin {
         if (step.error) {
           stepSpan.setTag('error', step.error)
         }
-        stepSpan.finish(stepStartTime + step.duration)
+        let stepDuration = step.duration
+        if (stepDuration <= 0 || isNaN(stepDuration)) {
+          stepDuration = 0
+        }
+        stepSpan.finish(stepStartTime + stepDuration)
       })
 
       span.finish()
 
+      if (testStatus === 'fail') {
+        this.numFailedTests++
+      }
+
       this.telemetry.ciVisEvent(
         TELEMETRY_EVENT_FINISHED,
         'test',

package/packages/datadog-plugin-rhea/src/consumer.js

@@ -2,7 +2,8 @@
 
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 const { storage } = require('../../datadog-core')
-const { getAmqpMessageSize, CONTEXT_PROPAGATION_KEY } = require('../../dd-trace/src/datastreams/processor')
+const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams/processor')
+const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams/pathway')
 
 class RheaConsumerPlugin extends ConsumerPlugin {
   static get id () { return 'rhea' }
@@ -33,12 +34,13 @@ class RheaConsumerPlugin extends ConsumerPlugin {
 
     if (
       this.config.dsmEnabled &&
-      msgObj?.message?.delivery_annotations?.[CONTEXT_PROPAGATION_KEY]
+      msgObj?.message?.delivery_annotations &&
+      DsmPathwayCodec.contextExists(msgObj.message.delivery_annotations)
     ) {
       const payloadSize = getAmqpMessageSize(
         { headers: msgObj.message.delivery_annotations, content: msgObj.message.body }
       )
-      this.tracer.decodeDataStreamsContext(msgObj.message.delivery_annotations[CONTEXT_PROPAGATION_KEY])
+      this.tracer.decodeDataStreamsContext(msgObj.message.delivery_annotations)
       this.tracer
         .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
     }

package/packages/datadog-plugin-rhea/src/producer.js

@@ -2,8 +2,8 @@
 
 const { CLIENT_PORT_KEY } = require('../../dd-trace/src/constants')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
-const { encodePathwayContext } = require('../../dd-trace/src/datastreams/pathway')
-const { getAmqpMessageSize, CONTEXT_PROPAGATION_KEY } = require('../../dd-trace/src/datastreams/processor')
+const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams/pathway')
+const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams/processor')
 
 class RheaProducerPlugin extends ProducerPlugin {
   static get id () { return 'rhea' }
@@ -44,8 +44,7 @@ function addDeliveryAnnotations (msg, tracer, span) {
       const payloadSize = getAmqpMessageSize({ content: msg.body, headers: msg.delivery_annotations })
       const dataStreamsContext = tracer
         .setCheckpoint(['direction:out', `exchange:${targetName}`, 'type:rabbitmq'], span, payloadSize)
-      const pathwayCtx = encodePathwayContext(dataStreamsContext)
-      msg.delivery_annotations[CONTEXT_PROPAGATION_KEY] = pathwayCtx
+      DsmPathwayCodec.encode(dataStreamsContext, msg.delivery_annotations)
     }
   }
 }

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

@@ -21,7 +21,11 @@ const requestStart = dc.channel('dd-trace:incomingHttpRequestStart')
 const requestClose = dc.channel('dd-trace:incomingHttpRequestEnd')
 const iastResponseEnd = dc.channel('datadog:iast:response-end')
 
+let isEnabled = false
+
 function enable (config, _tracer) {
+  if (isEnabled) return
+
   iastTelemetry.configure(config, config.iast?.telemetryVerbosity)
   enableAllAnalyzers(config)
   enableTaintTracking(config.iast, iastTelemetry.verbosity)
@@ -30,9 +34,15 @@ function enable (config, _tracer) {
   overheadController.configure(config.iast)
   overheadController.startGlobalContext()
   vulnerabilityReporter.start(config, _tracer)
+
+  isEnabled = true
 }
 
 function disable () {
+  if (!isEnabled) return
+
+  isEnabled = false
+
   iastTelemetry.stop()
   disableAllAnalyzers()
   disableTaintTracking()

package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js

@@ -65,16 +65,18 @@ function getRewriter (telemetryVerbosity) {
   return rewriter
 }
 
-let originalPrepareStackTrace = Error.prepareStackTrace
+let originalPrepareStackTrace
+let actualPrepareStackTrace
 function getPrepareStackTraceAccessor () {
-  let actual = getPrepareStackTrace(originalPrepareStackTrace)
+  originalPrepareStackTrace = Error.prepareStackTrace
+  actualPrepareStackTrace = getPrepareStackTrace(originalPrepareStackTrace)
   return {
     configurable: true,
     get () {
-      return actual
+      return actualPrepareStackTrace
     },
     set (value) {
-      actual = getPrepareStackTrace(value)
+      actualPrepareStackTrace = getPrepareStackTrace(value)
       originalPrepareStackTrace = value
     }
   }
@@ -121,7 +123,18 @@ function enableRewriter (telemetryVerbosity) {
 
 function disableRewriter () {
   shimmer.unwrap(Module.prototype, '_compile')
-  Error.prepareStackTrace = originalPrepareStackTrace
+
+  if (!actualPrepareStackTrace) return
+
+  try {
+    delete Error.prepareStackTrace
+
+    Error.prepareStackTrace = originalPrepareStackTrace
+
+    actualPrepareStackTrace = undefined
+  } catch (e) {
+    iastLog.warn(e)
+  }
 }
 
 function getOriginalPathAndLineFromSourceMap ({ path, line, column }) {