dd-trace 5.52.0 → 5.54.0

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

@@ -20,7 +20,7 @@ class OracledbPlugin extends DatabasePlugin {
       kind: 'client',
       meta: {
         'db.user': this.config.user,
-        'db.instance': url.pathname && url.pathname.substring(1),
+        'db.instance': url.pathname && url.pathname.slice(1),
         'db.hostname': url.hostname,
         [CLIENT_PORT_KEY]: url.port
       }

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

@@ -34,7 +34,9 @@ const {
   TEST_NAME,
   TEST_IS_RUM_ACTIVE,
   TEST_BROWSER_VERSION,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  TEST_IS_MODIFIED,
+  isModifiedTest
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -56,6 +58,16 @@ class PlaywrightPlugin extends CiPlugin {
     this.numFailedTests = 0
     this.numFailedSuites = 0
 
+    this.addSub('ci:playwright:test:is-modified', ({
+      filePath,
+      modifiedTests,
+      onDone
+    }) => {
+      const testSuite = getTestSuitePath(filePath, this.repositoryRoot)
+      const isModified = isModifiedTest(testSuite, 0, 0, modifiedTests, this.constructor.id)
+      onDone({ isModified })
+    })
+
     this.addSub('ci:playwright:session:finish', ({
       status,
       isEarlyFlakeDetectionEnabled,
@@ -97,7 +109,9 @@ class PlaywrightPlugin extends CiPlugin {
       this.numFailedTests = 0
     })
 
-    this.addSub('ci:playwright:test-suite:start', (testSuiteAbsolutePath) => {
+    this.addBind('ci:playwright:test-suite:start', (ctx) => {
+      const { testSuiteAbsolutePath } = ctx
+
       const store = storage('legacy').getStore()
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
       const testSourceFile = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
@@ -126,27 +140,28 @@ class PlaywrightPlugin extends CiPlugin {
         }
       })
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
-      this.enter(testSuiteSpan, store)
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, testSuiteSpan }
 
       this._testSuites.set(testSuiteAbsolutePath, testSuiteSpan)
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:playwright:test-suite:finish', ({ status, error }) => {
-      const store = storage('legacy').getStore()
-      const span = store && store.span
-      if (!span) return
+    this.addSub('ci:playwright:test-suite:finish', ({ testSuiteSpan, status, error }) => {
+      if (!testSuiteSpan) return
       if (error) {
-        span.setTag('error', error)
-        span.setTag(TEST_STATUS, 'fail')
+        testSuiteSpan.setTag('error', error)
+        testSuiteSpan.setTag(TEST_STATUS, 'fail')
       } else {
-        span.setTag(TEST_STATUS, status)
+        testSuiteSpan.setTag(TEST_STATUS, status)
       }
 
       if (status === 'fail' || error) {
         this.numFailedSuites++
       }
 
-      span.finish()
+      testSuiteSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
     })
 
@@ -180,13 +195,14 @@ class PlaywrightPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:playwright:test:start', ({
-      testName,
-      testSuiteAbsolutePath,
-      testSourceLine,
-      browserName,
-      isDisabled
-    }) => {
+    this.addBind('ci:playwright:test:start', (ctx) => {
+      const {
+        testName,
+        testSuiteAbsolutePath,
+        testSourceLine,
+        browserName,
+        isDisabled
+      } = ctx
       const store = storage('legacy').getStore()
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
       const testSourceFile = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
@@ -203,7 +219,10 @@ class PlaywrightPlugin extends CiPlugin {
         span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
       }
 
-      this.enter(span, store)
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, span }
+
+      return ctx.currentStore
     })
 
     this.addSub('ci:playwright:worker:report', (serializedTraces) => {
@@ -254,6 +273,7 @@ class PlaywrightPlugin extends CiPlugin {
     })
 
     this.addSub('ci:playwright:test:finish', ({
+      span,
       testStatus,
       steps,
       error,
@@ -269,10 +289,9 @@ class PlaywrightPlugin extends CiPlugin {
       hasPassedAttemptToFixRetries,
       hasFailedAttemptToFixRetries,
       isAtrRetry,
+      isModified,
       onDone
     }) => {
-      const store = storage('legacy').getStore()
-      const span = store && store.span
       if (!span) return
 
       const isRUMActive = span.context()._tags[TEST_IS_RUM_ACTIVE]
@@ -321,6 +340,13 @@ class PlaywrightPlugin extends CiPlugin {
       if (isQuarantined) {
         span.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
       }
+      if (isModified) {
+        span.setTag(TEST_IS_MODIFIED, 'true')
+        if (isEfdRetry) {
+          span.setTag(TEST_IS_RETRY, 'true')
+          span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
+        }
+      }
       steps.forEach(step => {
         const stepStartTime = step.startTime.getTime()
         const stepSpan = this.tracer.startSpan('playwright.step', {
@@ -336,7 +362,7 @@ class PlaywrightPlugin extends CiPlugin {
           stepSpan.setTag('error', step.error)
         }
         let stepDuration = step.duration
-        if (stepDuration <= 0 || isNaN(stepDuration)) {
+        if (stepDuration <= 0 || Number.isNaN(stepDuration)) {
           stepDuration = 0
         }
         stepSpan.finish(stepStartTime + stepDuration)

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

@@ -8,6 +8,11 @@ class RedisPlugin extends CachePlugin {
   static get id () { return 'redis' }
   static get system () { return 'redis' }
 
+  constructor (...args) {
+    super(...args)
+    this._spanType = 'redis'
+  }
+
   start ({ db, command, args, connectionOptions = {}, connectionName }) {
     const resource = command
     const normalizedCommand = command.toUpperCase()
@@ -16,11 +21,11 @@ class RedisPlugin extends CachePlugin {
     this.startSpan({
       resource,
       service: this.serviceName({ pluginConfig: this.config, system: this.system, connectionName }),
-      type: 'redis',
+      type: this._spanType,
       meta: {
-        'db.type': 'redis',
+        'db.type': this._spanType,
         'db.name': db || '0',
-        'redis.raw_command': formatCommand(normalizedCommand, args),
+        [`${this._spanType}.raw_command`]: formatCommand(normalizedCommand, args),
         'out.host': connectionOptions.host,
         [CLIENT_PORT_KEY]: connectionOptions.port
       }
@@ -58,7 +63,7 @@ function formatArg (arg) {
 
 function trim (str, maxlen) {
   if (str.length > maxlen) {
-    str = str.substr(0, maxlen - 3) + '...'
+    str = str.slice(0, maxlen - 3) + '...'
   }
 
   return str

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

@@ -1,7 +1,6 @@
 'use strict'
 
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
-const { storage } = require('../../datadog-core')
 const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams')
 
 class RheaConsumerPlugin extends ConsumerPlugin {
@@ -10,13 +9,14 @@ class RheaConsumerPlugin extends ConsumerPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addTraceSub('dispatch', ({ state }) => {
-      const span = storage('legacy').getStore().span
-      span.setTag('amqp.delivery.state', state)
+    this.addTraceSub('dispatch', (ctx) => {
+      const span = ctx.currentStore.span
+      span.setTag('amqp.delivery.state', ctx.state)
     })
   }
 
-  start ({ msgObj }) {
+  bindStart (ctx) {
+    const { msgObj } = ctx
     const name = getResourceNameFromMessage(msgObj)
     const childOf = extractTextMap(msgObj, this.tracer)
 
@@ -29,7 +29,7 @@ class RheaConsumerPlugin extends ConsumerPlugin {
         'amqp.link.source.address': name,
         'amqp.link.role': 'receiver'
       }
-    })
+    }, ctx)
 
     if (
       this.config.dsmEnabled &&
@@ -42,6 +42,8 @@ class RheaConsumerPlugin extends ConsumerPlugin {
       this.tracer
         .setCheckpoint(['direction:in', `topic:${name}`, 'type:rabbitmq'], span, payloadSize)
     }
+
+    return ctx.currentStore
   }
 }
 

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

@@ -13,7 +13,8 @@ class RheaProducerPlugin extends ProducerPlugin {
     this.addTraceSub('encode', this.encode.bind(this))
   }
 
-  start ({ targetAddress, host, port }) {
+  bindStart (ctx) {
+    const { targetAddress, host, port } = ctx
     const name = targetAddress || 'amq.topic'
     this.startSpan({
       resource: name,
@@ -24,7 +25,9 @@ class RheaProducerPlugin extends ProducerPlugin {
         'out.host': host,
         [CLIENT_PORT_KEY]: port
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 
   encode (msg) {

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

@@ -90,7 +90,7 @@ class RouterPlugin extends WebPlugin {
     if (!context) return
     if (context.middleware.length === 0) return context.span
 
-    return context.middleware[context.middleware.length - 1]
+    return context.middleware.at(-1)
   }
 
   _getStoreSpan () {

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

@@ -44,12 +44,7 @@ class SeleniumPlugin extends CiPlugin {
       if (!span) {
         return
       }
-      let testSpan
-      if (isTestSpan(span)) {
-        testSpan = span
-      } else {
-        testSpan = getTestSpanFromTrace(span.context()._trace)
-      }
+      const testSpan = isTestSpan(span) ? span : getTestSpanFromTrace(span.context()._trace)
       if (!testSpan) {
         return
       }

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

@@ -26,7 +26,9 @@ const {
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_HAS_FAILED_ALL_RETRIES,
   getLibraryCapabilitiesTags,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  isModifiedTest,
+  TEST_IS_MODIFIED
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -34,6 +36,7 @@ const {
   TELEMETRY_EVENT_FINISHED,
   TELEMETRY_TEST_SESSION
 } = require('../../dd-trace/src/ci-visibility/telemetry')
+const { DD_MAJOR } = require('../../../version')
 
 // Milliseconds that we subtract from the error test duration
 // so that they do not overlap with the following test
@@ -82,6 +85,13 @@ class VitestPlugin extends CiPlugin {
       onDone(isQuarantined)
     })
 
+    this.addSub('ci:vitest:test:is-modified', ({ modifiedTests, testSuiteAbsolutePath, onDone }) => {
+      const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      const isModified = isModifiedTest(testSuite, 0, 0, modifiedTests, this.constructor.id)
+
+      onDone(isModified)
+    })
+
     this.addSub('ci:vitest:is-early-flake-detection-faulty', ({
       knownTests,
       testFilepaths,
@@ -95,19 +105,22 @@ class VitestPlugin extends CiPlugin {
       onDone(isFaulty)
     })
 
-    this.addSub('ci:vitest:test:start', ({
-      testName,
-      testSuiteAbsolutePath,
-      isRetry,
-      isNew,
-      isAttemptToFix,
-      isQuarantined,
-      isDisabled,
-      mightHitProbe,
-      isRetryReasonEfd,
-      isRetryReasonAttemptToFix,
-      isRetryReasonAtr
-    }) => {
+    this.addBind('ci:vitest:test:start', (ctx) => {
+      const {
+        testName,
+        testSuiteAbsolutePath,
+        isRetry,
+        isNew,
+        isAttemptToFix,
+        isQuarantined,
+        isDisabled,
+        mightHitProbe,
+        isRetryReasonEfd,
+        isRetryReasonAttemptToFix,
+        isRetryReasonAtr,
+        isModified
+      } = ctx
+
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
       const store = storage('legacy').getStore()
 
@@ -138,6 +151,9 @@ class VitestPlugin extends CiPlugin {
       if (isDisabled) {
         extraTags[TEST_MANAGEMENT_IS_DISABLED] = 'true'
       }
+      if (isModified) {
+        extraTags[TEST_IS_MODIFIED] = 'true'
+      }
 
       const span = this.startTestSpan(
         testName,
@@ -146,18 +162,21 @@ class VitestPlugin extends CiPlugin {
         extraTags
       )
 
-      this.enter(span, store)
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, span }
 
       // TODO: there might be multiple tests for which mightHitProbe is true, so activeTestSpan
       // might be wrongly overwritten.
       if (mightHitProbe) {
         this.activeTestSpan = span
       }
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:vitest:test:finish-time', ({ status, task, attemptToFixPassed, attemptToFixFailed }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
+    this.addBind('ci:vitest:test:finish-time', (ctx) => {
+      const { status, task, attemptToFixPassed, attemptToFixFailed } = ctx
+      const span = ctx.currentStore?.span
 
       // we store the finish time to finish at a later hook
       // this is because the test might fail at a `afterEach` hook
@@ -171,13 +190,15 @@ class VitestPlugin extends CiPlugin {
         }
 
         this.taskToFinishTime.set(task, span._getTime())
+
+        ctx.parentStore = ctx.currentStore
+        ctx.currentStore = { ...ctx.currentStore, span }
       }
-    })
 
-    this.addSub('ci:vitest:test:pass', ({ task }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
+      return ctx.currentStore
+    })
 
+    this.addSub('ci:vitest:test:pass', ({ span, task }) => {
       if (span) {
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
           hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS]
@@ -189,6 +210,7 @@ class VitestPlugin extends CiPlugin {
     })
 
     this.addSub('ci:vitest:test:error', ({
+      span,
       duration,
       error,
       shouldSetProbe,
@@ -196,40 +218,38 @@ class VitestPlugin extends CiPlugin {
       hasFailedAllRetries,
       attemptToFixFailed
     }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
-
-      if (span) {
-        if (shouldSetProbe && this.di) {
-          const probeInformation = this.addDiProbe(error)
-          if (probeInformation) {
-            const { file, line, stackIndex, setProbePromise } = probeInformation
-            this.runningTestProbe = { file, line }
-            this.testErrorStackIndex = stackIndex
-            promises.setProbePromise = setProbePromise
-          }
+      if (!span) {
+        return
+      }
+      if (shouldSetProbe && this.di && error?.stack) {
+        const probeInformation = this.addDiProbe(error)
+        if (probeInformation) {
+          const { file, line, stackIndex, setProbePromise } = probeInformation
+          this.runningTestProbe = { file, line }
+          this.testErrorStackIndex = stackIndex
+          promises.setProbePromise = setProbePromise
         }
-        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-          hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS]
-        })
-        span.setTag(TEST_STATUS, 'fail')
+      }
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
+        hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS]
+      })
+      span.setTag(TEST_STATUS, 'fail')
 
-        if (error) {
-          span.setTag('error', error)
-        }
-        if (hasFailedAllRetries) {
-          span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
-        }
-        if (attemptToFixFailed) {
-          span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
-        }
-        if (duration) {
-          span.finish(span._startTime + duration - MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION) // milliseconds
-        } else {
-          span.finish() // `duration` is empty for retries, so we'll use clock time
-        }
-        finishAllTraceSpans(span)
+      if (error) {
+        span.setTag('error', error)
+      }
+      if (hasFailedAllRetries) {
+        span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
       }
+      if (attemptToFixFailed) {
+        span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
+      }
+      if (duration) {
+        span.finish(span._startTime + duration - MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION) // milliseconds
+      } else {
+        span.finish() // `duration` is empty for retries, so we'll use clock time
+      }
+      finishAllTraceSpans(span)
     })
 
     this.addSub('ci:vitest:test:skip', ({ testName, testSuiteAbsolutePath, isNew, isDisabled }) => {
@@ -252,10 +272,9 @@ class VitestPlugin extends CiPlugin {
       testSpan.finish()
     })
 
-    this.addSub('ci:vitest:test-suite:start', ({
-      testSuiteAbsolutePath,
-      frameworkVersion
-    }) => {
+    this.addBind('ci:vitest:test-suite:start', (ctx) => {
+      const { testSuiteAbsolutePath, frameworkVersion } = ctx
+
       this.command = process.env.DD_CIVISIBILITY_TEST_COMMAND
       this.frameworkVersion = frameworkVersion
       const testSessionSpanContext = this.tracer.extract('text_map', {
@@ -263,8 +282,9 @@ class VitestPlugin extends CiPlugin {
         'x-datadog-parent-id': process.env.DD_CIVISIBILITY_TEST_MODULE_ID
       })
 
+      const trimmedCommand = DD_MAJOR < 6 ? this.command : 'vitest run'
       // test suites run in a different process, so they also need to init the metadata dictionary
-      const testSessionName = getTestSessionName(this.config, this.command, this.testEnvironmentMetadata)
+      const testSessionName = getTestSessionName(this.config, trimmedCommand, this.testEnvironmentMetadata)
       const metadataTags = {}
       for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
         metadataTags[testLevel] = {
@@ -305,17 +325,18 @@ class VitestPlugin extends CiPlugin {
       })
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
       const store = storage('legacy').getStore()
-      this.enter(testSuiteSpan, store)
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, testSuiteSpan }
       this.testSuiteSpan = testSuiteSpan
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:vitest:test-suite:finish', ({ status, onFinish }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
-      if (span) {
-        span.setTag(TEST_STATUS, status)
-        span.finish()
-        finishAllTraceSpans(span)
+    this.addSub('ci:vitest:test-suite:finish', ({ testSuiteSpan, status, onFinish }) => {
+      if (testSuiteSpan) {
+        testSuiteSpan.setTag(TEST_STATUS, status)
+        testSuiteSpan.finish()
+        finishAllTraceSpans(testSuiteSpan)
       }
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
       // TODO: too frequent flush - find for method in worker to decrease frequency
@@ -325,13 +346,19 @@ class VitestPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:vitest:test-suite:error', ({ error }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
-      if (span && error) {
-        span.setTag('error', error)
-        span.setTag(TEST_STATUS, 'fail')
+    this.addBind('ci:vitest:test-suite:error', (ctx) => {
+      const { error } = ctx
+      const testSuiteSpan = ctx.currentStore?.testSuiteSpan
+
+      if (testSuiteSpan && error) {
+        testSuiteSpan.setTag('error', error)
+        testSuiteSpan.setTag(TEST_STATUS, 'fail')
+
+        ctx.parentStore = ctx.currentStore
+        ctx.currentStore = { ...ctx.currentStore, testSuiteSpan }
       }
+
+      return ctx.currentStore
     })
 
     this.addSub('ci:vitest:session:finish', ({