dd-trace 5.84.0 → 5.86.0

package/packages/datadog-plugin-protobufjs/src/schema_iterator.js

@@ -7,11 +7,11 @@ const {
   SCHEMA_NAME,
   SCHEMA_OPERATION,
   SCHEMA_WEIGHT,
-  SCHEMA_TYPE
+  SCHEMA_TYPE,
 } = require('../../dd-trace/src/constants')
 const log = require('../../dd-trace/src/log')
 const {
-  SchemaBuilder
+  SchemaBuilder,
 } = require('../../dd-trace/src/datastreams')
 
 class SchemaExtractor {
@@ -39,7 +39,7 @@ class SchemaExtractor {
       Enum: ['enum', null],
       Type: ['type', null],
       map: ['map', null],
-      repeated: ['array', null]
+      repeated: ['array', null],
     }
 
     return typeFormatMapping[type] || ['string', null]

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

@@ -31,8 +31,8 @@ class RedisPlugin extends CachePlugin {
         'db.name': db || '0',
         [`${this._spanType}.raw_command`]: formatCommand(normalizedCommand, args),
         'out.host': connectionOptions.host,
-        [CLIENT_PORT_KEY]: connectionOptions.port
-      }
+        [CLIENT_PORT_KEY]: connectionOptions.port,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -21,7 +21,7 @@ class RestifyPlugin extends RouterPlugin {
   configure (config) {
     return super.configure({
       ...config,
-      middleware: false // not supported
+      middleware: false, // not supported
     })
   }
 }

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

@@ -27,8 +27,8 @@ class RheaConsumerPlugin extends ConsumerPlugin {
       meta: {
         component: 'rhea',
         'amqp.link.source.address': name,
-        'amqp.link.role': 'receiver'
-      }
+        'amqp.link.role': 'receiver',
+      },
     }, ctx)
 
     if (

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

@@ -9,7 +9,7 @@ class RheaPlugin extends CompositePlugin {
   static get plugins () {
     return {
       producer: ProducerPlugin,
-      consumer: ConsumerPlugin
+      consumer: ConsumerPlugin,
     }
   }
 }

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

@@ -23,8 +23,8 @@ class RheaProducerPlugin extends ProducerPlugin {
         'amqp.link.target.address': name,
         'amqp.link.role': 'sender',
         'out.host': host,
-        [CLIENT_PORT_KEY]: port
-      }
+        [CLIENT_PORT_KEY]: port,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -9,26 +9,31 @@ const { COMPONENT } = require('../../dd-trace/src/constants')
 class RouterPlugin extends WebPlugin {
   static id = 'router'
 
+  #storeStacks = new WeakMap()
+  #contexts = new WeakMap()
+
   constructor (...args) {
     super(...args)
 
-    this._storeStack = []
-    this._contexts = new WeakMap()
-
     this.addSub(`apm:${this.constructor.id}:middleware:enter`, ({ req, name, route }) => {
-      const childOf = this._getActive(req) || this._getStoreSpan()
+      const childOf = this.#getActive(req) || this.#getStoreSpan()
 
       if (!childOf) return
 
-      const span = this._getMiddlewareSpan(name, childOf)
-      const context = this._createContext(req, route, childOf)
+      const span = this.#getMiddlewareSpan(name, childOf)
+      const context = this.#createContext(req, route, childOf)
 
       if (childOf !== span) {
         context.middleware.push(span)
       }
 
       const store = storage('legacy').getStore()
-      this._storeStack.push(store)
+      let storeStack = this.#storeStacks.get(req)
+      if (!storeStack) {
+        storeStack = []
+        this.#storeStacks.set(req, storeStack)
+      }
+      storeStack.push(store)
       this.enter(span, store)
 
       web.patch(req)
@@ -36,7 +41,7 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub(`apm:${this.constructor.id}:middleware:next`, ({ req }) => {
-      const context = this._contexts.get(req)
+      const context = this.#contexts.get(req)
 
       if (!context) return
 
@@ -44,7 +49,7 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub(`apm:${this.constructor.id}:middleware:finish`, ({ req }) => {
-      const context = this._contexts.get(req)
+      const context = this.#contexts.get(req)
 
       if (!context || context.middleware.length === 0) return
 
@@ -52,7 +57,11 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub(`apm:${this.constructor.id}:middleware:exit`, ({ req }) => {
-      const savedStore = this._storeStack.pop()
+      const storeStack = this.#storeStacks.get(req)
+      const savedStore = storeStack && storeStack.pop()
+      if (storeStack && storeStack.length === 0) {
+        this.#storeStacks.delete(req)
+      }
       const span = savedStore && savedStore.span
       this.enter(span, savedStore)
     })
@@ -62,7 +71,7 @@ class RouterPlugin extends WebPlugin {
 
       if (!this.config.middleware) return
 
-      const span = this._getActive(req)
+      const span = this.#getActive(req)
 
       if (!span) return
 
@@ -70,7 +79,7 @@ class RouterPlugin extends WebPlugin {
     })
 
     this.addSub('apm:http:server:request:finish', ({ req }) => {
-      const context = this._contexts.get(req)
+      const context = this.#contexts.get(req)
 
       if (!context) return
 
@@ -82,8 +91,8 @@ class RouterPlugin extends WebPlugin {
     })
   }
 
-  _getActive (req) {
-    const context = this._contexts.get(req)
+  #getActive (req) {
+    const context = this.#contexts.get(req)
 
     if (!context) return
     if (context.middleware.length === 0) return context.span
@@ -91,13 +100,13 @@ class RouterPlugin extends WebPlugin {
     return context.middleware.at(-1)
   }
 
-  _getStoreSpan () {
+  #getStoreSpan () {
     const store = storage('legacy').getStore()
 
     return store && store.span
   }
 
-  _getMiddlewareSpan (name, childOf) {
+  #getMiddlewareSpan (name, childOf) {
     if (this.config.middleware === false) {
       return childOf
     }
@@ -107,8 +116,8 @@ class RouterPlugin extends WebPlugin {
       integrationName: this.constructor.id,
       tags: {
         [COMPONENT]: this.constructor.id,
-        'resource.name': name || '<anonymous>'
-      }
+        'resource.name': name || '<anonymous>',
+      },
     })
 
     analyticsSampler.sample(span, this.config.measured)
@@ -116,8 +125,8 @@ class RouterPlugin extends WebPlugin {
     return span
   }
 
-  _createContext (req, route, span) {
-    let context = this._contexts.get(req)
+  #createContext (req, route, span) {
+    let context = this.#contexts.get(req)
 
     if (!route || route === '/' || route === '*') {
       route = ''
@@ -137,10 +146,10 @@ class RouterPlugin extends WebPlugin {
         span,
         stack: [route],
         route,
-        middleware: []
+        middleware: [],
       }
 
-      this._contexts.set(req, context)
+      this.#contexts.set(req, context)
     }
 
     return context

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

@@ -9,7 +9,7 @@ const {
   TEST_BROWSER_DRIVER_VERSION,
   TEST_BROWSER_NAME,
   TEST_BROWSER_VERSION,
-  TEST_TYPE
+  TEST_TYPE,
 } = require('../../dd-trace/src/plugins/util/test')
 const { SPAN_TYPE } = require('../../../ext/tags')
 
@@ -37,7 +37,7 @@ class SeleniumPlugin extends CiPlugin {
       seleniumVersion,
       browserName,
       browserVersion,
-      isRumActive
+      isRumActive,
     }) => {
       const store = storage('legacy').getStore()
       const span = store?.span

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

@@ -13,8 +13,8 @@ class SharedbPlugin extends ServerPlugin {
       resource: getReadableResourceName(actionName, request.c, request.q),
       kind: 'server',
       meta: {
-        'sharedb.action': actionName
-      }
+        'sharedb.action': actionName,
+      },
     }, ctx)
 
     if (this.config.hooks && this.config.hooks.receive) {

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

@@ -22,8 +22,8 @@ class TediousPlugin extends DatabasePlugin {
         [CLIENT_PORT_KEY]: ctx.connectionConfig.options.port,
         'db.user': ctx.connectionConfig.userName || ctx.connectionConfig.authentication.options.userName,
         'db.name': ctx.connectionConfig.options.database,
-        'db.instance': ctx.connectionConfig.options.instanceName
-      }
+        'db.instance': ctx.connectionConfig.options.instanceName,
+      },
     }, ctx)
 
     // SQL Server includes comments when caching queries

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

@@ -71,14 +71,14 @@ class UndiciPlugin extends HttpClientPlugin {
         'span.kind': 'client',
         'http.method': method,
         'http.url': uri,
-        'out.host': hostname
+        'out.host': hostname,
       },
       metrics: {
-        [CLIENT_PORT_KEY]: port ? Number.parseInt(port, 10) : undefined
+        [CLIENT_PORT_KEY]: port ? Number.parseInt(port, 10) : undefined,
       },
       service: this.serviceName({ pluginConfig: this.config, sessionDetails: { host: hostname, port } }),
       resource: method,
-      type: 'http'
+      type: 'http',
     }, false)
 
     // Disable recording if not allowed
@@ -108,7 +108,7 @@ class UndiciPlugin extends HttpClientPlugin {
     requestContexts.set(request, {
       span,
       store,
-      uri
+      uri,
     })
 
     // Enter the span context
@@ -285,7 +285,7 @@ function normalizeConfig (config) {
   return {
     ...config,
     validateStatus,
-    hooks
+    hooks,
   }
 }
 

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

@@ -32,13 +32,13 @@ const {
   getLibraryCapabilitiesTags,
   TEST_RETRY_REASON_TYPES,
   isModifiedTest,
-  TEST_IS_MODIFIED
+  TEST_IS_MODIFIED,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
   TELEMETRY_EVENT_CREATED,
   TELEMETRY_EVENT_FINISHED,
-  TELEMETRY_TEST_SESSION
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 const { DD_MAJOR } = require('../../../version')
 
@@ -69,7 +69,7 @@ class VitestPlugin extends CiPlugin {
       testManagementTests,
       testSuiteAbsolutePath,
       testName,
-      onDone
+      onDone,
     }) => {
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
       const { isAttemptToFix } = this.getTestProperties(testManagementTests, testSuite, testName)
@@ -101,7 +101,7 @@ class VitestPlugin extends CiPlugin {
     this.addSub('ci:vitest:is-early-flake-detection-faulty', ({
       knownTests,
       testFilepaths,
-      onDone
+      onDone,
     }) => {
       const isFaulty = getIsFaultyEarlyFlakeDetection(
         testFilepaths.map(testFilepath => getTestSuitePath(testFilepath, this.repositoryRoot)),
@@ -124,14 +124,14 @@ class VitestPlugin extends CiPlugin {
         isRetryReasonEfd,
         isRetryReasonAttemptToFix,
         isRetryReasonAtr,
-        isModified
+        isModified,
       } = ctx
 
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
       const store = storage('legacy').getStore()
 
       const extraTags = {
-        [TEST_SOURCE_FILE]: testSuite
+        [TEST_SOURCE_FILE]: testSuite,
       }
       if (isRetry) {
         extraTags[TEST_IS_RETRY] = 'true'
@@ -206,9 +206,7 @@ class VitestPlugin extends CiPlugin {
 
     this.addSub('ci:vitest:test:pass', ({ span, task }) => {
       if (span) {
-        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-          hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS]
-        })
+        this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(span))
         span.setTag(TEST_STATUS, 'pass')
         span.finish(this.taskToFinishTime.get(task))
         finishAllTraceSpans(span)
@@ -222,7 +220,7 @@ class VitestPlugin extends CiPlugin {
       shouldSetProbe,
       promises,
       hasFailedAllRetries,
-      attemptToFixFailed
+      attemptToFixFailed,
     }) => {
       if (!span) {
         return
@@ -236,9 +234,7 @@ class VitestPlugin extends CiPlugin {
           promises.setProbePromise = setProbePromise
         }
       }
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-        hasCodeowners: !!span.context()._tags[TEST_CODE_OWNERS]
-      })
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(span))
       span.setTag(TEST_STATUS, 'fail')
 
       if (error) {
@@ -269,12 +265,10 @@ class VitestPlugin extends CiPlugin {
           [TEST_SOURCE_START]: 1, // we can't get the proper start line in vitest
           [TEST_STATUS]: 'skip',
           ...(isDisabled ? { [TEST_MANAGEMENT_IS_DISABLED]: 'true' } : {}),
-          ...(isNew ? { [TEST_IS_NEW]: 'true' } : {})
+          ...(isNew ? { [TEST_IS_NEW]: 'true' } : {}),
         }
       )
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', {
-        hasCodeowners: !!testSpan.context()._tags[TEST_CODE_OWNERS]
-      })
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(testSpan))
       testSpan.finish()
     })
 
@@ -285,7 +279,7 @@ class VitestPlugin extends CiPlugin {
       this.frameworkVersion = frameworkVersion
       const testSessionSpanContext = this.tracer.extract('text_map', {
         'x-datadog-trace-id': getValueFromEnvSources('DD_CIVISIBILITY_TEST_SESSION_ID'),
-        'x-datadog-parent-id': getValueFromEnvSources('DD_CIVISIBILITY_TEST_MODULE_ID')
+        'x-datadog-parent-id': getValueFromEnvSources('DD_CIVISIBILITY_TEST_MODULE_ID'),
       })
 
       const trimmedCommand = DD_MAJOR < 6 ? this.command : 'vitest run'
@@ -294,14 +288,14 @@ class VitestPlugin extends CiPlugin {
       const metadataTags = {}
       for (const testLevel of TEST_LEVEL_EVENT_TYPES) {
         metadataTags[testLevel] = {
-          [TEST_SESSION_NAME]: testSessionName
+          [TEST_SESSION_NAME]: testSessionName,
         }
       }
       if (this.tracer._exporter.addMetadataTags) {
         const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id)
         metadataTags.test = {
           ...metadataTags.test,
-          ...libraryCapabilitiesTags
+          ...libraryCapabilitiesTags,
         }
         this.tracer._exporter.addMetadataTags(metadataTags)
       }
@@ -326,8 +320,8 @@ class VitestPlugin extends CiPlugin {
         tags: {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
-          ...testSuiteMetadata
-        }
+          ...testSuiteMetadata,
+        },
       })
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
       const store = storage('legacy').getStore()
@@ -374,7 +368,7 @@ class VitestPlugin extends CiPlugin {
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
       vitestPool,
-      onFinish
+      onFinish,
     }) => {
       this.testSessionSpan.setTag(TEST_STATUS, status)
       this.testModuleSpan.setTag(TEST_STATUS, status)
@@ -401,14 +395,37 @@ class VitestPlugin extends CiPlugin {
       this.testModuleSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
       this.testSessionSpan.finish()
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session', {
+        hasFailedTestReplay: this.libraryConfig?.isDiEnabled || undefined,
+      })
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
       })
       this.tracer._exporter.flush(onFinish)
     })
+
+    this.addSub('ci:vitest:coverage-report', ({ rootDir, onDone }) => {
+      this.handleCoverageReport(rootDir, onDone)
+    })
+  }
+
+  /**
+   * Handles the coverage report by discovering and uploading it if enabled.
+   * @param {string} rootDir - The root directory where coverage reports are located.
+   * @param {Function} [onDone] - Callback to signal completion.
+   */
+  handleCoverageReport (rootDir, onDone) {
+    if (!this.libraryConfig?.isCoverageReportUploadEnabled) {
+      onDone()
+      return
+    }
+    this.uploadCoverageReports({
+      rootDir,
+      testEnvironmentMetadata: this.testEnvironmentMetadata,
+      onDone,
+    })
   }
 
   getTestProperties (testManagementTests, testSuite, testName) {

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

@@ -4,12 +4,12 @@ const TracingPlugin = require('../../dd-trace/src/plugins/tracing.js')
 const {
   WEBSOCKET_PTR_KIND,
   SPAN_POINTER_DIRECTION,
-  SPAN_POINTER_DIRECTION_NAME
+  SPAN_POINTER_DIRECTION_NAME,
 } = require('../../dd-trace/src/constants')
 const {
   incrementWebSocketCounter,
   buildWebSocketSpanPointerHash,
-  hasDistributedTracingContext
+  hasDistributedTracingContext,
 } = require('./util')
 
 class WSClosePlugin extends TracingPlugin {
@@ -21,14 +21,14 @@ class WSClosePlugin extends TracingPlugin {
   bindStart (ctx) {
     const {
       traceWebsocketMessagesInheritSampling,
-      traceWebsocketMessagesSeparateTraces
+      traceWebsocketMessagesSeparateTraces,
     } = this.config
 
     const { code, data, socket, isPeerClose } = ctx
     if (!socket?.spanContext) return
 
     const spanKind = isPeerClose ? 'consumer' : 'producer'
-    const spanTags = socket.spanContext.spanTags
+    const spanTags = socket.spanTags
     const path = spanTags['resource.name'].split(' ')[1]
     const service = this.serviceName({ pluginConfig: this.config })
     const span = this.startSpan(this.operationName(), {
@@ -37,9 +37,9 @@ class WSClosePlugin extends TracingPlugin {
         'resource.name': `websocket ${path}`,
         'span.type': 'websocket',
         'span.kind': spanKind,
-        'websocket.close.code': code
+        'websocket.close.code': code,
 
-      }
+      },
     }, ctx)
 
     if (data?.toString().length > 0) {
@@ -76,14 +76,13 @@ class WSClosePlugin extends TracingPlugin {
       linkAttributes['dd.kind'] = isIncoming ? 'executed_by' : 'resuming'
 
       // Add span pointer for context propagation
-      if (this.config.traceWebsocketMessagesEnabled && ctx.socket.handshakeSpan) {
-        const handshakeSpan = ctx.socket.handshakeSpan
+      if (this.config.traceWebsocketMessagesEnabled && ctx.socket.spanContext) {
+        const handshakeContext = ctx.socket.spanContext
 
         // Only add span pointers if distributed tracing is enabled and handshake has distributed context
-        if (hasDistributedTracingContext(handshakeSpan, ctx.socket)) {
+        if (hasDistributedTracingContext(handshakeContext, ctx.socket)) {
           const counterType = isIncoming ? 'receiveCounter' : 'sendCounter'
           const counter = incrementWebSocketCounter(ctx.socket, counterType)
-          const handshakeContext = handshakeSpan.context()
 
           const ptrHash = buildWebSocketSpanPointerHash(
             handshakeContext._traceId,
@@ -111,7 +110,7 @@ class WSClosePlugin extends TracingPlugin {
 
       ctx.span.addLink({
         context: ctx.socket.spanContext,
-        attributes: linkAttributes
+        attributes: linkAttributes,
       })
     }
 

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

@@ -14,7 +14,7 @@ class WSPlugin extends CompositePlugin {
       server: WSServerPlugin,
       producer: WSProducerPlugin,
       receiver: WSReceiverPlugin,
-      close: WSClosePlugin
+      close: WSClosePlugin,
     }
   }
 

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

@@ -4,12 +4,12 @@ const TracingPlugin = require('../../dd-trace/src/plugins/tracing.js')
 const {
   WEBSOCKET_PTR_KIND,
   SPAN_POINTER_DIRECTION,
-  SPAN_POINTER_DIRECTION_NAME
+  SPAN_POINTER_DIRECTION_NAME,
 } = require('../../dd-trace/src/constants')
 const {
   incrementWebSocketCounter,
   buildWebSocketSpanPointerHash,
-  hasDistributedTracingContext
+  hasDistributedTracingContext,
 } = require('./util')
 
 class WSProducerPlugin extends TracingPlugin {
@@ -22,7 +22,7 @@ class WSProducerPlugin extends TracingPlugin {
     const { byteLength, socket, binary } = ctx
     if (!socket.spanContext) return
 
-    const spanTags = socket.spanContext.spanTags
+    const spanTags = socket.spanTags
     const path = spanTags['resource.name'].split(' ')[1]
     const opCode = binary ? 'binary' : 'text'
     const service = this.serviceName({ pluginConfig: this.config })
@@ -36,8 +36,8 @@ class WSProducerPlugin extends TracingPlugin {
 
       },
       metrics: {
-        'websocket.message.length': byteLength
-      }
+        'websocket.message.length': byteLength,
+      },
 
     }, ctx)
 
@@ -61,13 +61,12 @@ class WSProducerPlugin extends TracingPlugin {
       const linkAttributes = { 'dd.kind': 'resuming' }
 
       // Add span pointer for context propagation
-      if (this.config.traceWebsocketMessagesEnabled && ctx.socket.handshakeSpan) {
-        const handshakeSpan = ctx.socket.handshakeSpan
+      if (this.config.traceWebsocketMessagesEnabled && ctx.socket.spanContext) {
+        const handshakeContext = ctx.socket.spanContext
 
         // Only add span pointers if distributed tracing is enabled and handshake has distributed context
-        if (hasDistributedTracingContext(handshakeSpan, ctx.socket)) {
+        if (hasDistributedTracingContext(handshakeContext, ctx.socket)) {
           const counter = incrementWebSocketCounter(ctx.socket, 'sendCounter')
-          const handshakeContext = handshakeSpan.context()
 
           const ptrHash = buildWebSocketSpanPointerHash(
             handshakeContext._traceId,

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

@@ -4,12 +4,12 @@ const TracingPlugin = require('../../dd-trace/src/plugins/tracing.js')
 const {
   WEBSOCKET_PTR_KIND,
   SPAN_POINTER_DIRECTION,
-  SPAN_POINTER_DIRECTION_NAME
+  SPAN_POINTER_DIRECTION_NAME,
 } = require('../../dd-trace/src/constants')
 const {
   incrementWebSocketCounter,
   buildWebSocketSpanPointerHash,
-  hasDistributedTracingContext
+  hasDistributedTracingContext,
 } = require('./util')
 
 class WSReceiverPlugin extends TracingPlugin {
@@ -21,13 +21,13 @@ class WSReceiverPlugin extends TracingPlugin {
   bindStart (ctx) {
     const {
       traceWebsocketMessagesInheritSampling,
-      traceWebsocketMessagesSeparateTraces
+      traceWebsocketMessagesSeparateTraces,
     } = this.config
 
     const { byteLength, socket, binary } = ctx
     if (!socket.spanContext) return
 
-    const spanTags = socket.spanContext.spanTags
+    const spanTags = socket.spanTags
     const path = spanTags['resource.name'].split(' ')[1]
     const opCode = binary ? 'binary' : 'text'
 
@@ -43,7 +43,7 @@ class WSReceiverPlugin extends TracingPlugin {
       },
       metrics: {
         'websocket.message.length': byteLength,
-      }
+      },
 
     }, ctx)
 
@@ -72,13 +72,12 @@ class WSReceiverPlugin extends TracingPlugin {
       const linkAttributes = { 'dd.kind': 'executed_by' }
 
       // Add span pointer for context propagation
-      if (this.config.traceWebsocketMessagesEnabled && ctx.socket.handshakeSpan) {
-        const handshakeSpan = ctx.socket.handshakeSpan
+      if (this.config.traceWebsocketMessagesEnabled && ctx.socket.spanContext) {
+        const handshakeContext = ctx.socket.spanContext
 
         // Only add span pointers if distributed tracing is enabled and handshake has distributed context
-        if (hasDistributedTracingContext(handshakeSpan, ctx.socket)) {
+        if (hasDistributedTracingContext(handshakeContext, ctx.socket)) {
           const counter = incrementWebSocketCounter(ctx.socket, 'receiveCounter')
-          const handshakeContext = handshakeSpan.context()
 
           const ptrHash = buildWebSocketSpanPointerHash(
             handshakeContext._traceId,