dd-trace 5.71.0 → 5.73.0

package/packages/datadog-plugin-azure-event-hubs/src/index.js

@@ -0,0 +1,15 @@
+'use strict'
+
+const ProducerPlugin = require('./producer')
+const CompositePlugin = require('../../dd-trace/src/plugins/composite')
+
+class AzureEventHubsPlugin extends CompositePlugin {
+  static get id () { return 'azure-event-hubs' }
+  static get plugins () {
+    return {
+      producer: ProducerPlugin
+    }
+  }
+}
+
+module.exports = AzureEventHubsPlugin

package/packages/datadog-plugin-azure-event-hubs/src/producer.js

@@ -0,0 +1,82 @@
+'use strict'
+
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+
+class AzureEventHubsProducerPlugin extends ProducerPlugin {
+  static get id () { return 'azure-event-hubs' }
+  static get operation () { return 'send' }
+  static get prefix () { return 'tracing:apm:azure-event-hubs:send' }
+
+  bindStart (ctx) {
+    // we do not want to make these spans when batch linking is disabled.
+    if (!batchLinksAreEnabled() && ctx.functionName === 'tryAdd') {
+      return ctx.currentStore
+    }
+
+    const qualifiedNamespace = ctx.config.endpoint.replace('sb://', '').replace('/', '')
+    const entityPath = ctx.config.entityPath
+    const span = this.startSpan({
+      resource: entityPath,
+      type: 'messaging',
+      meta: {
+        component: 'azure-event-hubs',
+        'messaging.system': 'eventhubs',
+        'messaging.destination.name': entityPath,
+        'network.destination.name': qualifiedNamespace,
+      }
+    }, ctx)
+
+    if (ctx.functionName === 'tryAdd') {
+      span._spanContext._name = 'azure.eventhubs.create'
+      span.setTag('messaging.operation', 'create')
+
+      if (ctx.eventData.messageID !== undefined) {
+        span.setTag('message.id', ctx.eventData.messageID)
+      }
+
+      if (batchLinksAreEnabled()) {
+        ctx.batch._spanContexts.push(span.context())
+        injectTraceContext(this.tracer, span, ctx.eventData)
+      }
+    }
+
+    if (ctx.functionName === 'sendBatch') {
+      const eventData = ctx.eventData
+      const eventDataLength = eventData.length || eventData._context.connection._eventsCount
+      span.setTag('messaging.operation', 'send')
+      span.setTag('messaging.batch.message_count', eventDataLength)
+
+      if (eventData.constructor.name !== 'EventDataBatchImpl' && Array.isArray(eventData)) {
+        eventData.forEach(event => {
+          injectTraceContext(this.tracer, span, event)
+        })
+      } else {
+        if (batchLinksAreEnabled()) {
+          eventData._spanContexts.forEach(spanContext => {
+            span.addLink(spanContext)
+          })
+        }
+      }
+    }
+    return ctx.currentStore
+  }
+
+  asyncEnd (ctx) {
+    super.finish()
+  }
+}
+
+function injectTraceContext (tracer, span, event) {
+  if (!event.properties) {
+    event.properties = {}
+  }
+  tracer.inject(span, 'text_map', event.properties)
+}
+
+function batchLinksAreEnabled () {
+  const eh = getEnvironmentVariable('DD_TRACE_AZURE_EVENTHUBS_BATCH_LINKS_ENABLED')
+  return eh !== 'false'
+}
+
+module.exports = AzureEventHubsProducerPlugin

package/packages/datadog-plugin-azure-functions/src/index.js

@@ -13,6 +13,7 @@ const triggerMap = {
   put: 'Http',
   serviceBusQueue: 'ServiceBus',
   serviceBusTopic: 'ServiceBus',
+  eventHub: 'EventHubs',
 }
 
 class AzureFunctionsPlugin extends TracingPlugin {
@@ -23,8 +24,10 @@ class AzureFunctionsPlugin extends TracingPlugin {
   static prefix = 'tracing:datadog:azure:functions:invoke'
 
   bindStart (ctx) {
-    const childOf = extractTraceContext(this._tracer, ctx)
     const meta = getMetaForTrigger(ctx)
+    const triggerType = triggerMap[ctx.methodName]
+    const isMessagingService = (triggerType === 'ServiceBus' || triggerType === 'EventHubs')
+    const childOf = isMessagingService ? null : extractTraceContext(this._tracer, ctx)
     const span = this.startSpan(this.operationName(), {
       childOf,
       service: this.serviceName(),
@@ -32,6 +35,10 @@ class AzureFunctionsPlugin extends TracingPlugin {
       meta,
     }, ctx)
 
+    if (isMessagingService) {
+      setSpanLinks(triggerType, this.tracer, span, ctx)
+    }
+
     ctx.span = span
     return ctx.currentStore
   }
@@ -86,6 +93,16 @@ function getMetaForTrigger ({ functionName, methodName, invocationContext }) {
       'resource.name': `ServiceBus ${functionName}`,
       'span.kind': 'consumer'
     }
+  } else if (triggerMap[methodName] === 'EventHubs') {
+    const partitionContext = invocationContext.triggerMetadata.triggerPartitionContext
+    meta = {
+      ...meta,
+      'messaging.destination.name': partitionContext.eventHubName,
+      'messaging.operation': 'receive',
+      'messaging.system': 'eventhubs',
+      'resource.name': `EventHubs ${functionName}`,
+      'span.kind': 'consumer'
+    }
   }
 
   return meta
@@ -99,8 +116,38 @@ function extractTraceContext (tracer, ctx) {
   switch (String(triggerMap[ctx.methodName])) {
     case 'Http':
       return tracer.extract('http_headers', Object.fromEntries(ctx.httpRequest.headers))
-    case 'ServiceBus':
-      return tracer.extract('text_map', ctx.invocationContext.triggerMetadata.applicationProperties)
+    default:
+      null
+  }
+}
+
+// message & messages & batch with cardinality of 1 == applicationProperties
+// messages with cardinality of many == applicationPropertiesArray
+function setSpanLinks (triggerType, tracer, span, ctx) {
+  const cardinality = ctx.invocationContext.options.trigger.cardinality
+  const triggerMetadata = ctx.invocationContext.triggerMetadata
+  const isServiceBus = triggerType === 'ServiceBus'
+
+  const properties = isServiceBus
+    ? triggerMetadata.applicationProperties
+    : triggerMetadata.properties
+
+  const propertiesArray = isServiceBus
+    ? triggerMetadata.applicationPropertiesArray
+    : triggerMetadata.propertiesArray
+
+  const addLinkFromProperties = (props) => {
+    if (!props || Object.keys(props).length === 0) return
+    const spanContext = tracer.extract('text_map', props)
+    if (spanContext) {
+      span.addLink(spanContext)
+    }
+  }
+
+  if (cardinality === 'many' && propertiesArray?.length > 0) {
+    propertiesArray.forEach(addLinkFromProperties)
+  } else if (cardinality === 'one') {
+    addLinkFromProperties(properties)
   }
 }
 

package/packages/datadog-plugin-azure-service-bus/src/index.js

@@ -4,7 +4,7 @@ const ProducerPlugin = require('./producer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class AzureServiceBusPlugin extends CompositePlugin {
-  static id = 'azure-service-bus'
+  static get id () { return 'azure-service-bus' }
   static get plugins () {
     return {
       producer: ProducerPlugin

package/packages/datadog-plugin-azure-service-bus/src/producer.js

@@ -1,36 +1,84 @@
 'use strict'
 
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
 class AzureServiceBusProducerPlugin extends ProducerPlugin {
-  static id = 'azure-service-bus'
-  static operation = 'send'
+  static get id () { return 'azure-service-bus' }
+  static get operation () { return 'send' }
+  static get prefix () { return 'tracing:apm:azure-service-bus:send' }
 
   bindStart (ctx) {
-    const { sender, msg } = ctx
-    const qualifiedSenderNamespace = sender._sender.audience.replace('sb://', '')
+    // we do not want to make these spans when batch linking is disabled.
+    if (!batchLinksAreEnabled() && ctx.functionName === 'tryAddMessage') {
+      return ctx.currentStore
+    }
+
+    const qualifiedSenderNamespace = ctx.config.host
     const span = this.startSpan({
-      resource: sender.entityPath,
+      resource: ctx.entityPath,
       type: 'messaging',
       meta: {
         component: 'azure-service-bus',
-        'messaging.destination.name': sender.entityPath,
+        'messaging.destination.name': ctx.entityPath,
         'messaging.operation': 'send',
         'messaging.system': 'servicebus',
         'network.destination.name': qualifiedSenderNamespace,
       }
     }, ctx)
 
-    // This is the correct key for injecting trace context into Azure Service Bus messages
-    // It may not be present in the message properties, so we ensure it exists
-    if (!msg.applicationProperties) {
-      msg.applicationProperties = {}
-    }
+    if (ctx.functionName === 'tryAddMessage') {
+      span._spanContext._name = 'azure.servicebus.create'
+      span.setTag('messaging.operation', 'create')
 
-    this.tracer.inject(span, 'text_map', msg.applicationProperties)
+      if (ctx.msg.messageID !== undefined) {
+        span.setTag('message.id', ctx.msg)
+      }
 
+      if (batchLinksAreEnabled()) {
+        ctx.batch._spanContexts.push(span.context())
+        injectTraceContext(this.tracer, span, ctx.msg)
+      }
+    }
+
+    if (ctx.functionName === 'send' || ctx.functionName === 'sendBatch' || ctx.functionName === 'scheduleMessages') {
+      const messages = ctx.msg
+      const isBatch = messages.constructor?.name === 'ServiceBusMessageBatchImpl'
+      if (isBatch) {
+        span.setTag('messaging.batch.message_count', messages.count)
+        if (batchLinksAreEnabled()) {
+          messages._spanContexts.forEach(spanContext => {
+            span.addLink(spanContext)
+          })
+        }
+      } else if (Array.isArray(messages)) {
+        span.setTag('messaging.batch.message_count', messages.length)
+        messages.forEach(event => {
+          injectTraceContext(this.tracer, span, event)
+        })
+      } else {
+        injectTraceContext(this.tracer, span, messages)
+      }
+    }
     return ctx.currentStore
   }
+
+  asyncEnd (ctx) {
+    super.finish()
+  }
+}
+
+function injectTraceContext (tracer, span, msg) {
+  if (!msg.applicationProperties) {
+    msg.applicationProperties = {}
+  }
+
+  tracer.inject(span, 'text_map', msg.applicationProperties)
+}
+
+function batchLinksAreEnabled () {
+  const sb = getEnvironmentVariable('DD_TRACE_AZURE_SERVICEBUS_BATCH_LINKS_ENABLED')
+  return sb !== 'false'
 }
 
 module.exports = AzureServiceBusProducerPlugin

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

@@ -407,7 +407,7 @@ class CucumberPlugin extends CiPlugin {
     this.addSub('ci:cucumber:is-modified-test', ({
       scenarios,
       testFileAbsolutePath,
-      modifiedTests,
+      modifiedFiles,
       stepIds,
       stepDefinitions,
       setIsModified
@@ -418,7 +418,7 @@ class CucumberPlugin extends CiPlugin {
           testScenarioPath,
           scenario.location.line,
           scenario.steps[scenario.steps.length - 1].location.line,
-          modifiedTests,
+          modifiedFiles,
           'cucumber'
         )
         if (isModified) {
@@ -436,7 +436,7 @@ class CucumberPlugin extends CiPlugin {
           stepDefinition.uri,
           testStartLineStep,
           testEndLineStep,
-          modifiedTests,
+          modifiedFiles,
           'cucumber'
         )
         if (isModified) {

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

@@ -45,7 +45,7 @@ const {
   getLibraryCapabilitiesTags,
   TEST_RETRY_REASON_TYPES,
   getPullRequestDiff,
-  getModifiedTestsFromDiff,
+  getModifiedFilesFromDiff,
   TEST_IS_MODIFIED,
   getPullRequestBaseBranch
 } = require('../../dd-trace/src/plugins/util/test')
@@ -188,7 +188,7 @@ function getTestManagementTests (tracer, testConfiguration) {
   })
 }
 
-function getModifiedTests (testEnvironmentMetadata) {
+function getModifiedFiles (testEnvironmentMetadata) {
   const {
     [GIT_PULL_REQUEST_BASE_BRANCH]: pullRequestBaseBranch,
     [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: pullRequestBaseBranchSha,
@@ -199,9 +199,9 @@ function getModifiedTests (testEnvironmentMetadata) {
 
   if (baseBranchSha) {
     const diff = getPullRequestDiff(baseBranchSha, commitHeadSha)
-    const modifiedTests = getModifiedTestsFromDiff(diff)
-    if (modifiedTests) {
-      return modifiedTests
+    const modifiedFiles = getModifiedFilesFromDiff(diff)
+    if (modifiedFiles) {
+      return modifiedFiles
     }
   }
 
@@ -245,7 +245,7 @@ class CypressPlugin {
   isTestManagementTestsEnabled = false
   testManagementAttemptToFixRetries = 0
   isImpactedTestsEnabled = false
-  modifiedTests = []
+  modifiedFiles = []
 
   constructor () {
     const {
@@ -339,10 +339,10 @@ class CypressPlugin {
 
   getIsTestModified (testSuiteAbsolutePath) {
     const relativeTestSuitePath = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-    if (!this.modifiedTests) {
+    if (!this.modifiedFiles) {
       return false
     }
-    const lines = this.modifiedTests[relativeTestSuitePath]
+    const lines = this.modifiedFiles[relativeTestSuitePath]
     if (!lines) {
       return false
     }
@@ -520,7 +520,7 @@ class CypressPlugin {
 
     if (this.isImpactedTestsEnabled) {
       try {
-        this.modifiedTests = getModifiedTests(this.testEnvironmentMetadata)
+        this.modifiedFiles = getModifiedFiles(this.testEnvironmentMetadata)
       } catch (error) {
         log.error(error)
         this.isImpactedTestsEnabled = false

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

@@ -50,6 +50,7 @@ const {
   TELEMETRY_CODE_COVERAGE_NUM_FILES,
   TELEMETRY_TEST_SESSION
 } = require('../../dd-trace/src/ci-visibility/telemetry')
+const log = require('../../dd-trace/src/log')
 
 const isJestWorker = !!getEnvironmentVariable('JEST_WORKER_ID')
 
@@ -102,6 +103,7 @@ class JestPlugin extends CiPlugin {
       }
       process.on('message', handler)
     }
+    this.testSuiteSpanPerTestSuiteAbsolutePath = new Map()
 
     this.addSub('ci:jest:session:finish', ({
       status,
@@ -196,7 +198,8 @@ class JestPlugin extends CiPlugin {
       testSourceFile,
       testEnvironmentOptions,
       frameworkVersion,
-      displayName
+      displayName,
+      testSuiteAbsolutePath
     }) => {
       const {
         _ddTestSessionId: testSessionId,
@@ -259,6 +262,7 @@ class JestPlugin extends CiPlugin {
       if (_ddTestCodeCoverageEnabled) {
         this.telemetry.ciVisEvent(TELEMETRY_CODE_COVERAGE_STARTED, 'suite', { library: 'istanbul' })
       }
+      this.testSuiteSpanPerTestSuiteAbsolutePath.set(testSuiteAbsolutePath, this.testSuiteSpan)
     })
 
     this.addSub('ci:jest:worker-report:coverage', data => {
@@ -272,25 +276,54 @@ class JestPlugin extends CiPlugin {
       })
     })
 
-    this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage, error }) => {
-      this.testSuiteSpan.setTag(TEST_STATUS, status)
+    this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage, error, testSuiteAbsolutePath }) => {
+      const testSuiteSpan = this.testSuiteSpanPerTestSuiteAbsolutePath.get(testSuiteAbsolutePath)
+      if (!testSuiteSpan) {
+        log.warn('"ci:jest:test-suite:finish": no span found for test suite absolute path %s', testSuiteAbsolutePath)
+        return
+      }
+      const hasStatus = testSuiteSpan.context()._tags[TEST_STATUS]
+      if (!hasStatus) {
+        // The status may have been set in 'ci:jest:test-suite:error'
+        testSuiteSpan.setTag(TEST_STATUS, status)
+      }
       if (error) {
-        this.testSuiteSpan.setTag('error', error)
+        testSuiteSpan.setTag('error', error)
+        testSuiteSpan.setTag(TEST_STATUS, 'fail')
       } else if (errorMessage) {
-        this.testSuiteSpan.setTag('error', new Error(errorMessage))
+        testSuiteSpan.setTag('error', new Error(errorMessage))
+        testSuiteSpan.setTag(TEST_STATUS, 'fail')
       }
-      this.testSuiteSpan.finish()
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
-      // Suites potentially run in a different process than the session,
-      // so calling finishAllTraceSpans on the session span is not enough
-      finishAllTraceSpans(this.testSuiteSpan)
-      // Flushing within jest workers is cheap, as it's just interprocess communication
-      // We do not want to flush after every suite if jest is running tests serially,
-      // as every flush is an HTTP request.
-      if (isJestWorker) {
-        this.tracer._exporter.flush()
+      // We need to give the potential error in 'ci:jest:test-suite:error' time to be published
+      process.nextTick(() => {
+        testSuiteSpan.finish()
+        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'suite')
+        // Suites potentially run in a different process than the session,
+        // so calling finishAllTraceSpans on the session span is not enough
+        finishAllTraceSpans(testSuiteSpan)
+        // Flushing within jest workers is cheap, as it's just interprocess communication
+        // We do not want to flush after every suite if jest is running tests serially,
+        // as every flush is an HTTP request.
+        if (isJestWorker) {
+          this.tracer._exporter.flush()
+        }
+        this.removeAllDiProbes()
+        this.testSuiteSpanPerTestSuiteAbsolutePath.delete(testSuiteAbsolutePath)
+      })
+    })
+
+    this.addSub('ci:jest:test-suite:error', ({ error, errorMessage, testSuiteAbsolutePath }) => {
+      const runningTestSuiteSpan = this.testSuiteSpanPerTestSuiteAbsolutePath.get(testSuiteAbsolutePath)
+      if (!runningTestSuiteSpan) {
+        log.warn('"ci:jest:test-suite:error": no span found for test suite absolute path %s', testSuiteAbsolutePath)
+        return
+      }
+      if (error) {
+        runningTestSuiteSpan.setTag('error', error)
+      } else if (errorMessage) {
+        runningTestSuiteSpan.setTag('error', new Error(errorMessage))
       }
-      this.removeAllDiProbes()
+      runningTestSuiteSpan.setTag(TEST_STATUS, 'fail')
     })
 
     /**
@@ -420,7 +453,8 @@ class JestPlugin extends CiPlugin {
       isJestRetry,
       isDisabled,
       isQuarantined,
-      isModified
+      isModified,
+      testSuiteAbsolutePath
     } = test
 
     const extraTags = {
@@ -468,8 +502,9 @@ class JestPlugin extends CiPlugin {
     if (isNew) {
       extraTags[TEST_IS_NEW] = 'true'
     }
+    const testSuiteSpan = this.testSuiteSpanPerTestSuiteAbsolutePath.get(testSuiteAbsolutePath) || this.testSuiteSpan
 
-    return super.startTestSpan(name, suite, this.testSuiteSpan, extraTags)
+    return super.startTestSpan(name, suite, testSuiteSpan, extraTags)
   }
 }
 

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

@@ -41,8 +41,11 @@ function getFormattedJestTestParameters (testParameters) {
   return formattedParameters
 }
 
+// Support for `@fast-check/jest`: this library modifies the test name to include the seed
+// A test name that keeps changing breaks some Test Optimization's features.
+const SEED_SUFFIX_RE = /\s*\(with seed=-?\d+\)\s*$/i
 // https://github.com/facebook/jest/blob/3e38157ad5f23fb7d24669d24fae8ded06a7ab75/packages/jest-circus/src/utils.ts#L396
-function getJestTestName (test) {
+function getJestTestName (test, shouldStripSeed = false) {
   const titles = []
   let parent = test
   do {
@@ -50,7 +53,12 @@ function getJestTestName (test) {
   } while ((parent = parent.parent))
 
   titles.shift() // remove TOP_DESCRIBE_BLOCK_NAME
-  return titles.join(' ')
+
+  const testName = titles.join(' ')
+  if (shouldStripSeed) {
+    return testName.replace(SEED_SUFFIX_RE, '')
+  }
+  return testName
 }
 
 function isMarkedAsUnskippable (test) {

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

@@ -169,13 +169,13 @@ class MochaPlugin extends CiPlugin {
       return ctx.currentStore
     })
 
-    this.addSub('ci:mocha:test:is-modified', ({ modifiedTests, file, onDone }) => {
+    this.addSub('ci:mocha:test:is-modified', ({ modifiedFiles, file, onDone }) => {
       const testPath = getTestSuitePath(file, this.repositoryRoot)
       const isModified = isModifiedTest(
         testPath,
         null,
         null,
-        modifiedTests,
+        modifiedFiles,
         this.constructor.id
       )
 

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

@@ -60,11 +60,11 @@ class PlaywrightPlugin extends CiPlugin {
 
     this.addSub('ci:playwright:test:is-modified', ({
       filePath,
-      modifiedTests,
+      modifiedFiles,
       onDone
     }) => {
       const testSuite = getTestSuitePath(filePath, this.repositoryRoot)
-      const isModified = isModifiedTest(testSuite, 0, 0, modifiedTests, this.constructor.id)
+      const isModified = isModifiedTest(testSuite, 0, 0, modifiedFiles, this.constructor.id)
       onDone({ isModified })
     })
 

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

@@ -90,9 +90,9 @@ class VitestPlugin extends CiPlugin {
       onDone(isQuarantined)
     })
 
-    this.addSub('ci:vitest:test:is-modified', ({ modifiedTests, testSuiteAbsolutePath, onDone }) => {
+    this.addSub('ci:vitest:test:is-modified', ({ modifiedFiles, testSuiteAbsolutePath, onDone }) => {
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
-      const isModified = isModifiedTest(testSuite, 0, 0, modifiedTests, this.constructor.id)
+      const isModified = isModifiedTest(testSuite, 0, 0, modifiedFiles, this.constructor.id)
 
       onDone(isModified)
     })

package/packages/datadog-plugin-ws/src/close.js

@@ -58,7 +58,7 @@ class WSClosePlugin extends TracingPlugin {
   }
 
   end (ctx) {
-    if (!Object.hasOwn(ctx, 'result')) return
+    if (!Object.hasOwn(ctx, 'result') || !ctx.span) return
 
     if (ctx.socket.spanContext) ctx.span.addLink({ context: ctx.socket.spanContext })
 

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

@@ -48,7 +48,7 @@ class WSProducerPlugin extends TracingPlugin {
   }
 
   end (ctx) {
-    if (!Object.hasOwn(ctx, 'result')) return
+    if (!Object.hasOwn(ctx, 'result') || !ctx.span) return
 
     if (ctx.socket.spanContext) {
       ctx.span.addLink({

package/packages/datadog-plugin-ws/src/receiver.js

@@ -58,7 +58,7 @@ class WSReceiverPlugin extends TracingPlugin {
   }
 
   end (ctx) {
-    if (!Object.hasOwn(ctx, 'result')) return
+    if (!Object.hasOwn(ctx, 'result') || !ctx.span) return
 
     if (ctx.socket.spanContext) {
       ctx.span.addLink({

package/packages/datadog-plugin-ws/src/server.js

@@ -21,8 +21,10 @@ class WSServerPlugin extends TracingPlugin {
 
     const protocol = `${getRequestProtocol(req)}:`
     const host = options.headers.host
-    const path = req.url
-    const uri = `${protocol}//${host}${path}`
+    const url = req.url
+    const indexOfParam = url.indexOf('?')
+    const route = indexOfParam === -1 ? url : url.slice(0, indexOfParam)
+    const uri = `${protocol}//${host}${route}`
 
     ctx.args = { options }
 
@@ -34,7 +36,7 @@ class WSServerPlugin extends TracingPlugin {
         'http.upgraded': 'websocket',
         'http.method': options.method,
         'http.url': uri,
-        'resource.name': `${options.method} ${path}`,
+        'resource.name': `${options.method} ${route}`,
         'span.kind': 'server'
 
       }

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

@@ -43,6 +43,7 @@ const { isInServerlessEnvironment } = require('../serverless')
 
 const responseAnalyzedSet = new WeakSet()
 const storedResponseHeaders = new WeakMap()
+const storedBodies = new WeakMap()
 
 let isEnabled = false
 let config
@@ -114,6 +115,11 @@ function onRequestBodyParsed ({ req, res, body, abortController }) {
   const rootSpan = web.root(req)
   if (!rootSpan) return
 
+  if (!req.body) {
+    // do not store body if it is in req.body
+    storedBodies.set(req, body)
+  }
+
   const results = waf.run({
     persistent: {
       [addresses.HTTP_INCOMING_BODY]: body
@@ -200,11 +206,13 @@ function incomingHttpEndTranslator ({ req, res }) {
 
   const storedHeaders = storedResponseHeaders.get(req) || {}
 
-  Reporter.finishRequest(req, res, storedHeaders)
+  const body = req.body || storedBodies.get(req)
+  Reporter.finishRequest(req, res, storedHeaders, body)
 
   if (storedHeaders) {
     storedResponseHeaders.delete(req)
   }
+  storedBodies.delete(req)
 }
 
 function onPassportVerify ({ framework, login, user, success, abortController }) {