dd-trace 5.53.0 → 5.55.0

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

@@ -2,6 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_SKIP_REASON,
@@ -34,7 +35,10 @@ const {
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
   TEST_HAS_FAILED_ALL_RETRIES,
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  TEST_IS_MODIFIED,
+  isModifiedTest,
+  getTestEndLine
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -55,7 +59,7 @@ const id = require('../../dd-trace/src/id')
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
 const BREAKPOINT_SET_GRACE_PERIOD_MS = 200
-const isCucumberWorker = !!process.env.CUCUMBER_WORKER_ID
+const isCucumberWorker = !!getEnvironmentVariable('CUCUMBER_WORKER_ID')
 
 function getTestSuiteTags (testSuiteSpan) {
   const suiteTags = {
@@ -131,7 +135,7 @@ class CucumberPlugin extends CiPlugin {
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       this.libraryConfig = null
@@ -345,7 +349,8 @@ class CucumberPlugin extends CiPlugin {
       hasPassedAllRetries,
       hasFailedAttemptToFix,
       isDisabled,
-      isQuarantined
+      isQuarantined,
+      isModified
     }) => {
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
@@ -400,6 +405,14 @@ class CucumberPlugin extends CiPlugin {
         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)
+        }
+      }
+
       span.finish()
       if (!isStep) {
         const spanTags = span.context()._tags
@@ -442,6 +455,49 @@ class CucumberPlugin extends CiPlugin {
     this.addBind('ci:cucumber:test:fn', (ctx) => {
       return ctx.currentStore
     })
+
+    this.addSub('ci:cucumber:is-modified-test', ({
+      scenarios,
+      testFileAbsolutePath,
+      modifiedTests,
+      stepIds,
+      stepDefinitions,
+      setIsModified
+    }) => {
+      const testScenarioPath = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot || process.cwd())
+      for (const scenario of scenarios) {
+        const isModified = isModifiedTest(
+          testScenarioPath,
+          scenario.location.line,
+          scenario.steps[scenario.steps.length - 1].location.line,
+          modifiedTests,
+          'cucumber'
+        )
+        if (isModified) {
+          setIsModified(true)
+          return
+        }
+      }
+      for (const stepDefinition of stepDefinitions) {
+        if (!stepIds?.includes(stepDefinition.id)) {
+          continue
+        }
+        const testStartLineStep = stepDefinition.line
+        const testEndLineStep = getTestEndLine(stepDefinition.code, testStartLineStep)
+        const isModified = isModifiedTest(
+          stepDefinition.uri,
+          testStartLineStep,
+          testEndLineStep,
+          modifiedTests,
+          'cucumber'
+        )
+        if (isModified) {
+          setIsModified(true)
+          return
+        }
+      }
+      setIsModified(false)
+    })
   }
 
   startTestSpan (testName, testSuite, extraTags) {

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

@@ -41,10 +41,15 @@ const {
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_HAS_FAILED_ALL_RETRIES,
   getLibraryCapabilitiesTags,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  getPullRequestDiff,
+  getModifiedTestsFromDiff,
+  TEST_IS_MODIFIED,
+  getPullRequestBaseBranch
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
 
@@ -67,7 +72,11 @@ const {
   GIT_BRANCH,
   CI_PROVIDER_NAME,
   CI_WORKSPACE_PATH,
-  GIT_COMMIT_MESSAGE
+  GIT_COMMIT_MESSAGE,
+  GIT_TAG,
+  GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+  GIT_COMMIT_HEAD_SHA,
+  GIT_PULL_REQUEST_BASE_BRANCH
 } = require('../../dd-trace/src/plugins/util/tags')
 const {
   OS_VERSION,
@@ -76,6 +85,7 @@ const {
   RUNTIME_NAME,
   RUNTIME_VERSION
 } = require('../../dd-trace/src/plugins/util/env')
+const { DD_MAJOR } = require('../../../version')
 
 const TEST_FRAMEWORK_NAME = 'cypress'
 
@@ -175,6 +185,26 @@ function getTestManagementTests (tracer, testConfiguration) {
   })
 }
 
+function getModifiedTests (testEnvironmentMetadata) {
+  const {
+    [GIT_PULL_REQUEST_BASE_BRANCH]: pullRequestBaseBranch,
+    [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseBranchSha,
+    [GIT_COMMIT_HEAD_SHA]: commitHeadSha
+  } = testEnvironmentMetadata
+
+  const baseBranchSha = pullRequestBaseBranchSha || getPullRequestBaseBranch(pullRequestBaseBranch)
+
+  if (baseBranchSha) {
+    const diff = getPullRequestDiff(baseBranchSha, commitHeadSha)
+    const modifiedTests = getModifiedTestsFromDiff(diff)
+    if (modifiedTests) {
+      return modifiedTests
+    }
+  }
+
+  throw new Error('Modified tests could not be retrieved')
+}
+
 function getSuiteStatus (suiteStats) {
   if (!suiteStats) {
     return 'skip'
@@ -205,10 +235,13 @@ class CypressPlugin {
       [GIT_BRANCH]: branch,
       [CI_PROVIDER_NAME]: ciProviderName,
       [CI_WORKSPACE_PATH]: repositoryRoot,
-      [GIT_COMMIT_MESSAGE]: commitMessage
+      [GIT_COMMIT_MESSAGE]: commitMessage,
+      [GIT_TAG]: tag,
+      [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseSha,
+      [GIT_COMMIT_HEAD_SHA]: commitHeadSha
     } = this.testEnvironmentMetadata
 
-    this.repositoryRoot = repositoryRoot
+    this.repositoryRoot = repositoryRoot || process.cwd()
     this.ciProviderName = ciProviderName
     this.codeOwnersEntries = getCodeOwnersFileEntries(repositoryRoot)
 
@@ -222,7 +255,10 @@ class CypressPlugin {
       runtimeVersion,
       branch,
       testLevel: 'test',
-      commitMessage
+      commitMessage,
+      tag,
+      pullRequestBaseSha,
+      commitHeadSha
     }
     this.finishedTestsByFile = {}
     this.testStatuses = {}
@@ -242,6 +278,8 @@ class CypressPlugin {
     this.knownTests = []
     this.isTestManagementTestsEnabled = false
     this.testManagementAttemptToFixRetries = 0
+    this.isImpactedTestsEnabled = false
+    this.modifiedTests = []
   }
 
   // Init function returns a promise that resolves with the Cypress configuration
@@ -271,7 +309,8 @@ class CypressPlugin {
               flakyTestRetriesCount,
               isKnownTestsEnabled,
               isTestManagementEnabled,
-              testManagementAttemptToFixRetries
+              testManagementAttemptToFixRetries,
+              isImpactedTestsEnabled
             }
           } = libraryConfigurationResponse
           this.isSuitesSkippingEnabled = isSuitesSkippingEnabled
@@ -285,12 +324,25 @@ class CypressPlugin {
           }
           this.isTestManagementTestsEnabled = isTestManagementEnabled
           this.testManagementAttemptToFixRetries = testManagementAttemptToFixRetries
+          this.isImpactedTestsEnabled = isImpactedTestsEnabled
         }
         return this.cypressConfig
       })
     return this.libraryConfigurationPromise
   }
 
+  getIsTestModified (testSuiteAbsolutePath) {
+    const relativeTestSuitePath = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+    if (!this.modifiedTests) {
+      return false
+    }
+    const lines = this.modifiedTests[relativeTestSuitePath]
+    if (!lines) {
+      return false
+    }
+    return lines.length > 0
+  }
+
   getTestSuiteProperties (testSuite) {
     return this.testManagementTests?.cypress?.suites?.[testSuite]?.tests || {}
   }
@@ -455,6 +507,15 @@ class CypressPlugin {
       }
     }
 
+    if (this.isImpactedTestsEnabled) {
+      try {
+        this.modifiedTests = getModifiedTests(this.testEnvironmentMetadata)
+      } catch (error) {
+        log.error(error)
+        this.isImpactedTestsEnabled = false
+      }
+    }
+
     // `details.specs` are test files
     details.specs?.forEach(({ absolute, relative }) => {
       const isUnskippableSuite = isMarkedAsUnskippable({ path: absolute })
@@ -474,7 +535,13 @@ class CypressPlugin {
       testSessionSpanMetadata[TEST_EARLY_FLAKE_ENABLED] = 'true'
     }
 
-    const testSessionName = getTestSessionName(this.tracer._tracer._config, this.command, this.testEnvironmentMetadata)
+    const trimmedCommand = DD_MAJOR < 6 ? this.command : 'cypress run'
+
+    const testSessionName = getTestSessionName(
+      this.tracer._tracer._config,
+      trimmedCommand,
+      this.testEnvironmentMetadata
+    )
 
     if (this.tracer._tracer._exporter?.addMetadataTags) {
       const metadataTags = {}
@@ -549,7 +616,7 @@ class CypressPlugin {
       this.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
       incrementCountMetric(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       finishAllTraceSpans(this.testSessionSpan)
@@ -601,13 +668,9 @@ class CypressPlugin {
       const isSkippedByItr = this.testsToSkip.find(test =>
         cypressTestName === test.name && spec.relative === test.suite
       )
-      let testSourceFile
-
-      if (spec.absolute && this.repositoryRoot) {
-        testSourceFile = getTestSuitePath(spec.absolute, this.repositoryRoot)
-      } else {
-        testSourceFile = spec.relative
-      }
+      const testSourceFile = spec.absolute && this.repositoryRoot
+        ? getTestSuitePath(spec.absolute, this.repositoryRoot)
+        : spec.relative
 
       const skippedTestSpan = this.getTestSpan({ testName: cypressTestName, testSuite: spec.relative, testSourceFile })
 
@@ -683,12 +746,9 @@ class CypressPlugin {
         if (this.itrCorrelationId) {
           finishedTest.testSpan.setTag(ITR_CORRELATION_ID, this.itrCorrelationId)
         }
-        let testSourceFile
-        if (spec.absolute && this.repositoryRoot) {
-          testSourceFile = getTestSuitePath(spec.absolute, this.repositoryRoot)
-        } else {
-          testSourceFile = spec.relative
-        }
+        const testSourceFile = spec.absolute && this.repositoryRoot
+          ? getTestSuitePath(spec.absolute, this.repositoryRoot)
+          : spec.relative
         if (testSourceFile) {
           finishedTest.testSpan.setTag(TEST_SOURCE_FILE, testSourceFile)
         }
@@ -725,7 +785,10 @@ class CypressPlugin {
           isKnownTestsEnabled: this.isKnownTestsEnabled,
           isTestManagementEnabled: this.isTestManagementTestsEnabled,
           testManagementAttemptToFixRetries: this.testManagementAttemptToFixRetries,
-          testManagementTests: this.getTestSuiteProperties(testSuite)
+          testManagementTests: this.getTestSuiteProperties(testSuite),
+          isImpactedTestsEnabled: this.isImpactedTestsEnabled,
+          isModifiedTest: this.getIsTestModified(testSuiteAbsolutePath),
+          repositoryRoot: this.repositoryRoot
         }
 
         if (this.testSuiteSpan) {
@@ -736,7 +799,7 @@ class CypressPlugin {
       },
       'dd:beforeEach': (test) => {
         const { testName, testSuite } = test
-        const shouldSkip = !!this.testsToSkip.find(test => {
+        const shouldSkip = this.testsToSkip.some(test => {
           return testName === test.name && testSuite === test.suite
         })
         const isUnskippable = this.unskippableSuites.includes(testSuite)
@@ -783,7 +846,8 @@ class CypressPlugin {
           testName,
           isNew,
           isEfdRetry,
-          isAttemptToFix
+          isAttemptToFix,
+          isModified
         } = test
         if (coverage && this.isCodeCoverageEnabled && this.tracer._tracer._exporter?.exportCoverage) {
           const coverageFiles = getCoveredFilenamesFromCoverage(coverage)
@@ -807,10 +871,10 @@ class CypressPlugin {
         this.activeTestSpan.setTag(TEST_STATUS, testStatus)
 
         // Save the test status to know if it has passed all retries
-        if (!this.testStatuses[testName]) {
-          this.testStatuses[testName] = [testStatus]
-        } else {
+        if (this.testStatuses[testName]) {
           this.testStatuses[testName].push(testStatus)
+        } else {
+          this.testStatuses[testName] = [testStatus]
         }
         const testStatuses = this.testStatuses[testName]
 
@@ -830,6 +894,13 @@ class CypressPlugin {
             this.activeTestSpan.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
           }
         }
+        if (isModified) {
+          this.activeTestSpan.setTag(TEST_IS_MODIFIED, 'true')
+          if (isEfdRetry) {
+            this.activeTestSpan.setTag(TEST_IS_RETRY, 'true')
+            this.activeTestSpan.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
+          }
+        }
         if (isAttemptToFix) {
           this.activeTestSpan.setTag(TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX, 'true')
           if (testStatuses.length > 1) {
@@ -838,7 +909,7 @@ class CypressPlugin {
           }
           const isLastAttempt = testStatuses.length === this.testManagementAttemptToFixRetries + 1
           if (isLastAttempt) {
-            if (testStatuses.some(status => status === 'fail')) {
+            if (testStatuses.includes('fail')) {
               this.activeTestSpan.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
             }
             if (testStatuses.every(status => status === 'fail')) {

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

@@ -1,6 +1,7 @@
 const NoopTracer = require('../../dd-trace/src/noop/tracer')
 const cypressPlugin = require('./cypress-plugin')
 const satisfies = require('semifies')
+const { DD_MAJOR } = require('../../../version')
 
 const noopTask = {
   'dd:testSuiteStart': () => {
@@ -17,10 +18,19 @@ const noopTask = {
   }
 }
 
-module.exports = (on, config) => {
+module.exports = function CypressPlugin (on, config) {
   const tracer = require('../../dd-trace')
 
   if (satisfies(config.version, '<10.2.0')) {
+    if (DD_MAJOR >= 6) {
+      // eslint-disable-next-line no-console
+      console.error(
+        'ERROR: dd-trace v6 has deleted support for Cypress<10.2.0.'
+      )
+      on('task', noopTask)
+      return config
+    }
+
     // console.warn does not seem to work in cypress, so using console.log instead
     // eslint-disable-next-line no-console
     console.log(

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

@@ -1,12 +1,15 @@
+/* eslint-disable unicorn/no-abusive-eslint-disable */
 /* eslint-disable */
 let isEarlyFlakeDetectionEnabled = false
 let isKnownTestsEnabled = false
 let knownTestsForSuite = []
-let suiteTests = []
 let earlyFlakeDetectionNumRetries = 0
 let isTestManagementEnabled = false
 let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
+let isImpactedTestsEnabled = false
+let isModifiedTest = false
+
 // We need to grab the original window as soon as possible,
 // in case the test changes the origin. If the test does change the origin,
 // any call to `cy.window()` will result in a cross origin error.
@@ -48,10 +51,9 @@ function retryTest (test, suiteTests, numRetries, tags) {
   }
 }
 
-
 const oldRunTests = Cypress.mocha.getRunner().runTests
 Cypress.mocha.getRunner().runTests = function (suite, fn) {
-  if (!isKnownTestsEnabled && !isTestManagementEnabled) {
+  if (!isKnownTestsEnabled && !isTestManagementEnabled && !isImpactedTestsEnabled) {
     return oldRunTests.apply(this, arguments)
   }
   // We copy the new tests at the beginning of the suite run (runTests), so that they're run
@@ -67,10 +69,24 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
         retryTest(test, suite.tests, testManagementAttemptToFixRetries, ['_ddIsAttemptToFix'])
       }
     }
+    if (isImpactedTestsEnabled && isModifiedTest) {
+      test._ddIsModified = true
+      if (isEarlyFlakeDetectionEnabled && !isAttemptToFix) {
+        retryTest(
+          test,
+          suite.tests,
+          earlyFlakeDetectionNumRetries,
+          ['_ddIsModified', '_ddIsEfdRetry', isKnownTestsEnabled && isNewTest(test) && '_ddIsNew']
+        )
+      }
+    }
     if (isKnownTestsEnabled) {
       if (!test._ddIsNew && !test.isPending() && isNewTest(test)) {
         test._ddIsNew = true
-        if (isEarlyFlakeDetectionEnabled && !isAttemptToFix) {
+        if (isImpactedTestsEnabled && isModifiedTest) {
+          test._ddIsModified = true
+        }
+        if (isEarlyFlakeDetectionEnabled && !isAttemptToFix && !isModifiedTest) {
           retryTest(test, suite.tests, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
         }
       }
@@ -108,6 +124,8 @@ before(function () {
       isTestManagementEnabled = suiteConfig.isTestManagementEnabled
       testManagementAttemptToFixRetries = suiteConfig.testManagementAttemptToFixRetries
       testManagementTests = suiteConfig.testManagementTests
+      isImpactedTestsEnabled = suiteConfig.isImpactedTestsEnabled
+      isModifiedTest = suiteConfig.isModifiedTest
     }
   })
 })
@@ -133,7 +151,8 @@ afterEach(function () {
     error: currentTest.err,
     isNew: currentTest._ddIsNew,
     isEfdRetry: currentTest._ddIsEfdRetry,
-    isAttemptToFix: currentTest._ddIsAttemptToFix
+    isAttemptToFix: currentTest._ddIsAttemptToFix,
+    isModified: currentTest._ddIsModified
   }
   try {
     testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line

package/packages/datadog-plugin-dd-trace-api/src/index.js

@@ -3,12 +3,13 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const telemetryMetrics = require('../../dd-trace/src/telemetry/metrics')
 const apiMetrics = telemetryMetrics.manager.namespace('tracers')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 // api ==> here
 const objectMap = new WeakMap()
 
 const injectionEnabledTag =
-  `injection_enabled:${process.env.DD_INJECTION_ENABLED ? 'yes' : 'no'}`
+  `injection_enabled:${getEnvironmentVariable('DD_INJECTION_ENABLED') ? 'yes' : 'no'}`
 
 module.exports = class DdTraceApiPlugin extends Plugin {
   static get id () {

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

@@ -35,7 +35,7 @@ function getBody (body) {
 }
 
 function quantizePath (path) {
-  return path && path.replace(/[0-9]+/g, '?')
+  return path && path.replaceAll(/[0-9]+/g, '?')
 }
 
 module.exports = ElasticsearchPlugin

package/packages/datadog-plugin-express/src/code_origin.js

@@ -0,0 +1,30 @@
+'use strict'
+
+const { entryTags } = require('../../datadog-code-origin')
+const Plugin = require('../../dd-trace/src/plugins/plugin')
+const web = require('../../dd-trace/src/plugins/util/web')
+
+class ExpressCodeOriginForSpansPlugin extends Plugin {
+  static get id () {
+    return 'express'
+  }
+
+  constructor (...args) {
+    super(...args)
+
+    const layerTags = new WeakMap()
+
+    this.addSub('apm:express:middleware:enter', ({ req, layer }) => {
+      const tags = layerTags.get(layer)
+      if (!tags) return
+      web.getContext(req).span?.addTags(tags)
+    })
+
+    this.addSub('apm:express:route:added', ({ topOfStackFunc, layer }) => {
+      if (layerTags.has(layer)) return
+      layerTags.set(layer, entryTags(topOfStackFunc))
+    })
+  }
+}
+
+module.exports = ExpressCodeOriginForSpansPlugin

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

@@ -1,18 +1,16 @@
 'use strict'
 
-const RouterPlugin = require('../../datadog-plugin-router/src')
+const ExpressTracingPlugin = require('./tracing')
+const ExpressCodeOriginForSpansPlugin = require('./code_origin')
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
-class ExpressPlugin extends RouterPlugin {
-  static get id () {
-    return 'express'
-  }
-
-  constructor (...args) {
-    super(...args)
-
-    this.addSub('apm:express:request:handle', ({ req }) => {
-      this.setFramework(req, 'express', this.config)
-    })
+class ExpressPlugin extends CompositePlugin {
+  static get id () { return 'express' }
+  static get plugins () {
+    return {
+      tracing: ExpressTracingPlugin,
+      codeOriginForSpans: ExpressCodeOriginForSpansPlugin
+    }
   }
 }
 

package/packages/datadog-plugin-express/src/tracing.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const RouterPlugin = require('../../datadog-plugin-router/src')
+
+class ExpressTracingPlugin extends RouterPlugin {
+  static get id () {
+    return 'express'
+  }
+
+  constructor (...args) {
+    super(...args)
+
+    this.addSub('apm:express:request:handle', ({ req }) => {
+      this.setFramework(req, 'express', this.config)
+    })
+  }
+}
+
+module.exports = ExpressTracingPlugin

package/packages/datadog-plugin-google-cloud-pubsub/src/client.js

@@ -7,18 +7,22 @@ class GoogleCloudPubsubClientPlugin extends ClientPlugin {
   static get type () { return 'messaging' }
   static get operation () { return 'request' }
 
-  start ({ request, api, projectId }) {
+  start (ctx) {
+    const { request, api, projectId } = ctx
+
     if (api === 'publish') return
 
     this.startSpan(this.operationName(), {
       service: this.config.service || this.serviceName(),
-      resource: [api, request.name].filter(x => x).join(' '),
+      resource: [api, request.name].filter(Boolean).join(' '),
       kind: this.constructor.kind,
       meta: {
         'pubsub.method': api,
         'gcloud.project_id': projectId
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

@@ -7,7 +7,8 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
   static get id () { return 'google-cloud-pubsub' }
   static get operation () { return 'receive' }
 
-  start ({ message }) {
+  bindStart (ctx) {
+    const { message } = ctx
     const subscription = message._subscriber._subscription
     const topic = subscription.metadata && subscription.metadata.topic
     const childOf = this.tracer.extract('text_map', message.attributes) || null
@@ -23,25 +24,29 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       metrics: {
         'pubsub.ack': 0
       }
-    })
+    }, ctx)
+
     if (this.config.dsmEnabled && message?.attributes) {
       const payloadSize = getMessageSize(message)
       this.tracer.decodeDataStreamsContext(message.attributes)
       this.tracer
         .setCheckpoint(['direction:in', `topic:${topic}`, 'type:google-pubsub'], span, payloadSize)
     }
-  }
 
-  finish (message) {
-    const span = this.activeSpan
+    return ctx.currentStore
+  }
 
-    if (!span) return
+  bindFinish (ctx) {
+    const { message } = ctx
+    const span = ctx.currentStore.span
 
-    if (message.message._handled) {
+    if (message?._handled) {
       span.setTag('pubsub.ack', 1)
     }
 
     super.finish()
+
+    return ctx.parentStore
   }
 }