dd-trace 5.51.0 → 5.53.0

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

@@ -109,12 +109,9 @@ class MochaPlugin extends CiPlugin {
       this.telemetry.distribution(TELEMETRY_CODE_COVERAGE_NUM_FILES, {}, relativeCoverageFiles.length)
     })
 
-    this.addSub('ci:mocha:test-suite:start', ({
-      testSuiteAbsolutePath,
-      isUnskippable,
-      isForcedToRun,
-      itrCorrelationId
-    }) => {
+    this.addBind('ci:mocha:test-suite:start', (ctx) => {
+      const { testSuiteAbsolutePath, isUnskippable, isForcedToRun, itrCorrelationId } = ctx
+
       // If the test module span is undefined, the plugin has not been initialized correctly and we bail out
       if (!this.testModuleSpan) {
         return
@@ -164,38 +161,51 @@ class MochaPlugin extends CiPlugin {
         testSuiteSpan.setTag(ITR_CORRELATION_ID, itrCorrelationId)
       }
       const store = storage('legacy').getStore()
-      this.enter(testSuiteSpan, store)
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, testSuiteSpan }
       this._testSuites.set(testSuite, testSuiteSpan)
     })
 
-    this.addSub('ci:mocha:test-suite:finish', (status) => {
-      const store = storage('legacy').getStore()
-      if (store && store.span) {
-        const span = store.span
+    this.addSub('ci:mocha:test-suite:finish', ({ testSuiteSpan, status }) => {
+      if (testSuiteSpan) {
         // the test status of the suite may have been set in ci:mocha:test-suite:error already
-        if (!span.context()._tags[TEST_STATUS]) {
-          span.setTag(TEST_STATUS, status)
+        if (!testSuiteSpan.context()._tags[TEST_STATUS]) {
+          testSuiteSpan.setTag(TEST_STATUS, status)
         }
-        span.finish()
+        testSuiteSpan.finish()
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
       }
     })
 
-    this.addSub('ci:mocha:test-suite:error', (err) => {
-      const store = storage('legacy').getStore()
-      if (store && store.span) {
-        const span = store.span
-        span.setTag('error', err)
-        span.setTag(TEST_STATUS, 'fail')
+    this.addBind('ci:mocha:test-suite:error', (ctx) => {
+      const { error } = ctx
+      const testSuiteSpan = ctx.currentStore?.testSuiteSpan
+
+      if (testSuiteSpan) {
+        testSuiteSpan.setTag('error', error)
+        testSuiteSpan.setTag(TEST_STATUS, 'fail')
+
+        ctx.parentStore = ctx.currentStore
+        ctx.currentStore = { ...ctx.currentStore, testSuiteSpan }
       }
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:test:start', (testInfo) => {
+    this.addBind('ci:mocha:test:fn', (ctx) => {
+      return ctx.currentStore
+    })
+
+    this.addBind('ci:mocha:test:start', (ctx) => {
       const store = storage('legacy').getStore()
-      const span = this.startTestSpan(testInfo)
+      const span = this.startTestSpan(ctx)
+
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, span }
 
-      this.enter(span, store)
       this.activeTestSpan = span
+
+      return ctx.currentStore
     })
 
     this.addSub('ci:mocha:worker:finish', () => {
@@ -203,17 +213,16 @@ class MochaPlugin extends CiPlugin {
     })
 
     this.addSub('ci:mocha:test:finish', ({
+      span,
       status,
       hasBeenRetried,
       isLastRetry,
       hasFailedAllRetries,
       attemptToFixPassed,
+      attemptToFixFailed,
       isAttemptToFixRetry,
       isAtrRetry
     }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
-
       if (span) {
         span.setTag(TEST_STATUS, status)
         if (hasBeenRetried) {
@@ -229,6 +238,8 @@ class MochaPlugin extends CiPlugin {
         }
         if (attemptToFixPassed) {
           span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+        } else if (attemptToFixFailed) {
+          span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
         }
         if (isAttemptToFixRetry) {
           span.setTag(TEST_IS_RETRY, 'true')
@@ -257,19 +268,26 @@ class MochaPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:mocha:test:skip', (testInfo) => {
+    this.addBind('ci:mocha:test:skip', (ctx) => {
       const store = storage('legacy').getStore()
       // skipped through it.skip, so the span is not created yet
       // for this test
       if (!store) {
-        const testSpan = this.startTestSpan(testInfo)
-        this.enter(testSpan, store)
+        const span = this.startTestSpan(ctx)
+
+        ctx.parentStore = store
+        ctx.currentStore = { ...store, span }
+
+        this.activeTestSpan = span
       }
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:test:error', (err) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
+    this.addBind('ci:mocha:test:error', (ctx) => {
+      const { err } = ctx
+      const span = ctx.currentStore?.span
+
       if (err && span) {
         if (err.constructor.name === 'Pending' && !this.forbidPending) {
           span.setTag(TEST_STATUS, 'skip')
@@ -277,12 +295,17 @@ class MochaPlugin extends CiPlugin {
           span.setTag(TEST_STATUS, 'fail')
           span.setTag('error', err)
         }
+
+        ctx.parentStore = ctx.currentStore
+        ctx.currentStore = { ...ctx.currentStore, span }
+
+        this.activeTestSpan = span
       }
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:test:retry', ({ isFirstAttempt, willBeRetried, err, test, isAtrRetry }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
+    this.addSub('ci:mocha:test:retry', ({ span, isFirstAttempt, willBeRetried, err, test, isAtrRetry }) => {
       if (span) {
         span.setTag(TEST_STATUS, 'fail')
         if (!isFirstAttempt) {

package/packages/datadog-plugin-net/src/ipc.js

@@ -6,15 +6,17 @@ class NetIPCPlugin extends ClientPlugin {
   static get id () { return 'net' }
   static get operation () { return 'ipc' }
 
-  start ({ options }) {
+  bindStart (ctx) {
     this.startSpan('ipc.connect', {
       service: this.config.service,
-      resource: options.path,
+      resource: ctx.options.path,
       kind: 'client',
       meta: {
-        'ipc.path': options.path
+        'ipc.path': ctx.options.path
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-net/src/tcp.js

@@ -10,20 +10,24 @@ class NetTCPPlugin extends ClientPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addTraceSub('connection', ({ socket }) => {
-      const span = this.activeSpan
+    this.addTraceBind('ready', (ctx) => {
+      return ctx.parentStore
+    })
+
+    this.addTraceSub('connection', (ctx) => {
+      const span = ctx.currentStore.span
 
       span.addTags({
-        'tcp.local.address': socket.localAddress,
-        'tcp.local.port': socket.localPort
+        'tcp.local.address': ctx.socket.localAddress,
+        'tcp.local.port': ctx.socket.localPort
       })
     })
   }
 
-  start ({ options }) {
-    const host = options.host || 'localhost'
-    const port = options.port || 0
-    const family = options.family || 4
+  bindStart (ctx) {
+    const host = ctx.options.host || 'localhost'
+    const port = ctx.options.port || 0
+    const family = ctx.options.family || 4
 
     this.startSpan('tcp.connect', {
       service: this.config.service,
@@ -40,7 +44,9 @@ class NetTCPPlugin extends ClientPlugin {
         'tcp.local.port': 0,
         [CLIENT_PORT_KEY]: port
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -8,7 +8,7 @@ class PGPlugin extends DatabasePlugin {
   static get operation () { return 'query' }
   static get system () { return 'postgres' }
 
-  start ({ params = {}, query, processId }) {
+  start ({ params = {}, query, processId, stream }) {
     const service = this.serviceName({ pluginConfig: this.config, params })
     const originalStatement = this.maybeTruncate(query.text)
 
@@ -27,6 +27,10 @@ class PGPlugin extends DatabasePlugin {
       }
     })
 
+    if (stream) {
+      span.setTag('db.stream', 1)
+    }
+
     query.__ddInjectableQuery = this.injectDbmQuery(span, query.text, service, !!query.name)
   }
 }

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

@@ -97,7 +97,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 +128,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 +183,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 +207,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 +261,7 @@ class PlaywrightPlugin extends CiPlugin {
     })
 
     this.addSub('ci:playwright:test:finish', ({
+      span,
       testStatus,
       steps,
       error,
@@ -267,11 +275,10 @@ class PlaywrightPlugin extends CiPlugin {
       isAttemptToFixRetry,
       hasFailedAllRetries,
       hasPassedAttemptToFixRetries,
+      hasFailedAttemptToFixRetries,
       isAtrRetry,
       onDone
     }) => {
-      const store = storage('legacy').getStore()
-      const span = store && store.span
       if (!span) return
 
       const isRUMActive = span.context()._tags[TEST_IS_RUM_ACTIVE]
@@ -311,6 +318,8 @@ class PlaywrightPlugin extends CiPlugin {
       }
       if (hasPassedAttemptToFixRetries) {
         span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+      } else if (hasFailedAttemptToFixRetries) {
+        span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
       }
       if (isDisabled) {
         span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')

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
       }

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

@@ -95,19 +95,21 @@ 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
+      } = ctx
+
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
       const store = storage('legacy').getStore()
 
@@ -146,18 +148,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 }) => {
-      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
@@ -166,16 +171,20 @@ class VitestPlugin extends CiPlugin {
 
         if (attemptToFixPassed) {
           span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+        } else if (attemptToFixFailed) {
+          span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
         }
 
         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]
@@ -186,10 +195,15 @@ class VitestPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:vitest:test:error', ({ duration, error, shouldSetProbe, promises, hasFailedAllRetries }) => {
-      const store = storage('legacy').getStore()
-      const span = store?.span
-
+    this.addSub('ci:vitest:test:error', ({
+      span,
+      duration,
+      error,
+      shouldSetProbe,
+      promises,
+      hasFailedAllRetries,
+      attemptToFixFailed
+    }) => {
       if (span) {
         if (shouldSetProbe && this.di) {
           const probeInformation = this.addDiProbe(error)
@@ -211,6 +225,9 @@ class VitestPlugin extends CiPlugin {
         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 {
@@ -240,10 +257,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', {
@@ -293,17 +309,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
@@ -313,13 +330,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', ({
@@ -337,7 +360,7 @@ class VitestPlugin extends CiPlugin {
         this.testModuleSpan.setTag('error', error)
         this.testSessionSpan.setTag('error', error)
       }
-      if (testCodeCoverageLinesTotal) {
+      if (testCodeCoverageLinesTotal !== undefined) {
         this.testModuleSpan.setTag(TEST_CODE_COVERAGE_LINES_PCT, testCodeCoverageLinesTotal)
         this.testSessionSpan.setTag(TEST_CODE_COVERAGE_LINES_PCT, testCodeCoverageLinesTotal)
       }