dd-trace 5.21.0 → 5.23.0

package/packages/datadog-plugin-http/src/client.js

@@ -58,7 +58,7 @@ class HttpClientPlugin extends ClientPlugin {
       span._spanContext._trace.record = false
     }
 
-    if (this.shouldInjectTraceHeaders(options, uri)) {
+    if (this.config.propagationFilter(uri)) {
       this.tracer.inject(span, HTTP_HEADERS, options.headers)
     }
 
@@ -71,18 +71,6 @@ class HttpClientPlugin extends ClientPlugin {
     return message.currentStore
   }
 
-  shouldInjectTraceHeaders (options, uri) {
-    if (hasAmazonSignature(options) && !this.config.enablePropagationWithAmazonHeaders) {
-      return false
-    }
-
-    if (!this.config.propagationFilter(uri)) {
-      return false
-    }
-
-    return true
-  }
-
   bindAsyncStart ({ parentStore }) {
     return parentStore
   }
@@ -212,31 +200,6 @@ function getHooks (config) {
   return { request }
 }
 
-function hasAmazonSignature (options) {
-  if (!options) {
-    return false
-  }
-
-  if (options.headers) {
-    const headers = Object.keys(options.headers)
-      .reduce((prev, next) => Object.assign(prev, {
-        [next.toLowerCase()]: options.headers[next]
-      }), {})
-
-    if (headers['x-amz-signature']) {
-      return true
-    }
-
-    if ([].concat(headers.authorization).some(startsWith('AWS4-HMAC-SHA256'))) {
-      return true
-    }
-  }
-
-  const search = options.search || options.path
-
-  return search && search.toLowerCase().indexOf('x-amz-signature=') !== -1
-}
-
 function extractSessionDetails (options) {
   if (typeof options === 'string') {
     return new URL(options).host
@@ -248,8 +211,4 @@ function extractSessionDetails (options) {
   return { host, port }
 }
 
-function startsWith (searchString) {
-  return value => String(value).startsWith(searchString)
-}
-
 module.exports = HttpClientPlugin

package/packages/datadog-plugin-http2/src/client.js

@@ -62,9 +62,7 @@ class Http2ClientPlugin extends ClientPlugin {
 
     addHeaderTags(span, headers, HTTP_REQUEST_HEADERS, this.config)
 
-    if (!hasAmazonSignature(headers, path)) {
-      this.tracer.inject(span, HTTP_HEADERS, headers)
-    }
+    this.tracer.inject(span, HTTP_HEADERS, headers)
 
     message.parentStore = store
     message.currentStore = { ...store, span }
@@ -134,29 +132,6 @@ function extractSessionDetails (authority, options) {
   return { protocol, port, host }
 }
 
-function hasAmazonSignature (headers, path) {
-  if (headers) {
-    headers = Object.keys(headers)
-      .reduce((prev, next) => Object.assign(prev, {
-        [next.toLowerCase()]: headers[next]
-      }), {})
-
-    if (headers['x-amz-signature']) {
-      return true
-    }
-
-    if ([].concat(headers.authorization).some(startsWith('AWS4-HMAC-SHA256'))) {
-      return true
-    }
-  }
-
-  return path && path.toLowerCase().indexOf('x-amz-signature=') !== -1
-}
-
-function startsWith (searchString) {
-  return value => String(value).startsWith(searchString)
-}
-
 function getStatusValidator (config) {
   if (typeof config.validateStatus === 'function') {
     return config.validateStatus

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

@@ -154,10 +154,17 @@ class JestPlugin extends CiPlugin {
         config._ddEarlyFlakeDetectionNumRetries = this.libraryConfig?.earlyFlakeDetectionNumRetries ?? 0
         config._ddRepositoryRoot = this.repositoryRoot
         config._ddIsFlakyTestRetriesEnabled = this.libraryConfig?.isFlakyTestRetriesEnabled ?? false
+        config._ddFlakyTestRetriesCount = this.libraryConfig?.flakyTestRetriesCount
       })
     })
 
-    this.addSub('ci:jest:test-suite:start', ({ testSuite, testEnvironmentOptions, frameworkVersion, displayName }) => {
+    this.addSub('ci:jest:test-suite:start', ({
+      testSuite,
+      testSourceFile,
+      testEnvironmentOptions,
+      frameworkVersion,
+      displayName
+    }) => {
       const {
         _ddTestSessionId: testSessionId,
         _ddTestCommand: testCommand,
@@ -195,6 +202,16 @@ class JestPlugin extends CiPlugin {
       if (displayName) {
         testSuiteMetadata[JEST_DISPLAY_NAME] = displayName
       }
+      if (testSourceFile) {
+        testSuiteMetadata[TEST_SOURCE_FILE] = testSourceFile
+        // Test suite is the whole test file, so we can use the first line as the start
+        testSuiteMetadata[TEST_SOURCE_START] = 1
+      }
+
+      const codeOwners = this.getCodeOwners(testSuiteMetadata)
+      if (codeOwners) {
+        testSuiteMetadata[TEST_CODE_OWNERS] = codeOwners
+      }
 
       this.testSuiteSpan = this.tracer.startSpan('jest.test_suite', {
         childOf: testSessionSpanContext,

package/packages/datadog-plugin-kafkajs/src/batch-consumer.js

@@ -0,0 +1,20 @@
+const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
+const { getMessageSize } = require('../../dd-trace/src/datastreams/processor')
+
+class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
+  static get id () { return 'kafkajs' }
+  static get operation () { return 'consume-batch' }
+
+  start ({ topic, partition, messages, groupId }) {
+    if (!this.config.dsmEnabled) return
+    for (const message of messages) {
+      if (!message || !message.headers) continue
+      const payloadSize = getMessageSize(message)
+      this.tracer.decodeDataStreamsContext(message.headers)
+      this.tracer
+        .setCheckpoint(['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka'], null, payloadSize)
+    }
+  }
+}
+
+module.exports = KafkajsBatchConsumerPlugin

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

@@ -2,7 +2,6 @@
 
 const dc = require('dc-polyfill')
 const { getMessageSize } = require('../../dd-trace/src/datastreams/processor')
-const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams/pathway')
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 
 const afterStartCh = dc.channel('dd-trace:kafkajs:consumer:afterStart')
@@ -78,7 +77,7 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
         'kafka.partition': partition
       }
     })
-    if (this.config.dsmEnabled && message?.headers && DsmPathwayCodec.contextExists(message.headers)) {
+    if (this.config.dsmEnabled && message?.headers) {
       const payloadSize = getMessageSize(message)
       this.tracer.decodeDataStreamsContext(message.headers)
       this.tracer

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

@@ -2,6 +2,7 @@
 
 const ProducerPlugin = require('./producer')
 const ConsumerPlugin = require('./consumer')
+const BatchConsumerPlugin = require('./batch-consumer')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 class KafkajsPlugin extends CompositePlugin {
@@ -9,7 +10,8 @@ class KafkajsPlugin extends CompositePlugin {
   static get plugins () {
     return {
       producer: ProducerPlugin,
-      consumer: ConsumerPlugin
+      consumer: ConsumerPlugin,
+      batchConsumer: BatchConsumerPlugin
     }
   }
 }

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

@@ -21,6 +21,7 @@ const {
   TEST_IS_NEW,
   TEST_IS_RETRY,
   TEST_EARLY_FLAKE_ENABLED,
+  TEST_EARLY_FLAKE_ABORT_REASON,
   TEST_SESSION_ID,
   TEST_MODULE_ID,
   TEST_MODULE,
@@ -124,6 +125,19 @@ class MochaPlugin extends CiPlugin {
         testSuiteMetadata[TEST_ITR_FORCED_RUN] = 'true'
         this.telemetry.count(TELEMETRY_ITR_FORCED_TO_RUN, { testLevel: 'suite' })
       }
+      if (this.repositoryRoot !== this.sourceRoot && !!this.repositoryRoot) {
+        testSuiteMetadata[TEST_SOURCE_FILE] = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
+      } else {
+        testSuiteMetadata[TEST_SOURCE_FILE] = testSuite
+      }
+      if (testSuiteMetadata[TEST_SOURCE_FILE]) {
+        testSuiteMetadata[TEST_SOURCE_START] = 1
+      }
+
+      const codeOwners = this.getCodeOwners(testSuiteMetadata)
+      if (codeOwners) {
+        testSuiteMetadata[TEST_CODE_OWNERS] = codeOwners
+      }
 
       const testSuiteSpan = this.tracer.startSpan('mocha.test_suite', {
         childOf: this.testModuleSpan,
@@ -267,6 +281,7 @@ class MochaPlugin extends CiPlugin {
       hasUnskippableSuites,
       error,
       isEarlyFlakeDetectionEnabled,
+      isEarlyFlakeDetectionFaulty,
       isParallel
     }) => {
       if (this.testSessionSpan) {
@@ -301,6 +316,9 @@ class MochaPlugin extends CiPlugin {
         if (isEarlyFlakeDetectionEnabled) {
           this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ENABLED, 'true')
         }
+        if (isEarlyFlakeDetectionFaulty) {
+          this.testSessionSpan.setTag(TEST_EARLY_FLAKE_ABORT_REASON, 'faulty')
+        }
 
         this.testModuleSpan.finish()
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')

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

@@ -31,6 +31,9 @@ class OpenApiPlugin extends TracingPlugin {
   static get id () { return 'openai' }
   static get operation () { return 'request' }
   static get system () { return 'openai' }
+  static get prefix () {
+    return 'tracing:apm:openai:request'
+  }
 
   constructor (...args) {
     super(...args)
@@ -55,8 +58,10 @@ class OpenApiPlugin extends TracingPlugin {
     super.configure(config)
   }
 
-  start ({ methodName, args, basePath, apiKey }) {
+  bindStart (ctx) {
+    const { methodName, args, basePath, apiKey } = ctx
     const payload = normalizeRequestPayload(methodName, args)
+    const store = storage.getStore() || {}
 
     const span = this.startSpan('openai.request', {
       service: this.config.service,
@@ -87,18 +92,16 @@ class OpenApiPlugin extends TracingPlugin {
         'openai.request.user': payload.user,
         'openai.request.file_id': payload.file_id // deleteFile, retrieveFile, downloadFile
       }
-    })
+    }, false)
 
-    const fullStore = storage.getStore() || {} // certain request body fields are later used for logs
-    const store = Object.create(null)
-    fullStore.openai = store // namespacing these fields
+    const openaiStore = Object.create(null)
 
     const tags = {} // The remaining tags are added one at a time
 
     // createChatCompletion, createCompletion, createImage, createImageEdit, createTranscription, createTranslation
     if (payload.prompt) {
       const prompt = payload.prompt
-      store.prompt = prompt
+      openaiStore.prompt = prompt
       if (typeof prompt === 'string' || (Array.isArray(prompt) && typeof prompt[0] === 'number')) {
         // This is a single prompt, either String or [Number]
         tags['openai.request.prompt'] = normalizeStringOrTokenArray(prompt, true)
@@ -114,7 +117,7 @@ class OpenApiPlugin extends TracingPlugin {
     if (payload.input) {
       const normalized = normalizeStringOrTokenArray(payload.input, false)
       tags['openai.request.input'] = truncateText(normalized)
-      store.input = normalized
+      openaiStore.input = normalized
     }
 
     // createChatCompletion, createCompletion
@@ -141,12 +144,12 @@ class OpenApiPlugin extends TracingPlugin {
       case 'images.edit':
       case 'createImageVariation':
       case 'images.createVariation':
-        commonCreateImageRequestExtraction(tags, payload, store)
+        commonCreateImageRequestExtraction(tags, payload, openaiStore)
         break
 
       case 'createChatCompletion':
       case 'chat.completions.create':
-        createChatCompletionRequestExtraction(tags, payload, store)
+        createChatCompletionRequestExtraction(tags, payload, openaiStore)
         break
 
       case 'createFile':
@@ -160,7 +163,7 @@ class OpenApiPlugin extends TracingPlugin {
       case 'audio.transcriptions.create':
       case 'createTranslation':
       case 'audio.translations.create':
-        commonCreateAudioRequestExtraction(tags, payload, store)
+        commonCreateAudioRequestExtraction(tags, payload, openaiStore)
         break
 
       case 'retrieveModel':
@@ -184,23 +187,32 @@ class OpenApiPlugin extends TracingPlugin {
 
       case 'createEdit':
       case 'edits.create':
-        createEditRequestExtraction(tags, payload, store)
+        createEditRequestExtraction(tags, payload, openaiStore)
         break
     }
 
     span.addTags(tags)
+
+    ctx.currentStore = { ...store, span, openai: openaiStore }
+
+    return ctx.currentStore
   }
 
-  finish (response) {
-    const span = this.activeSpan
+  asyncEnd (ctx) {
+    const { result } = ctx
+    const store = ctx.currentStore
+
+    const span = store?.span
+    if (!span) return
+
     const error = !!span.context()._tags.error
 
     let headers, body, method, path
     if (!error) {
-      headers = response.headers
-      body = response.body
-      method = response.method
-      path = response.path
+      headers = result.headers
+      body = result.data
+      method = result.request.method
+      path = result.request.path
     }
 
     if (!error && headers?.constructor.name === 'Headers') {
@@ -210,10 +222,9 @@ class OpenApiPlugin extends TracingPlugin {
 
     body = coerceResponseBody(body, methodName)
 
-    const fullStore = storage.getStore()
-    const store = fullStore.openai
+    const openaiStore = store.openai
 
-    if (!error && (path.startsWith('https://') || path.startsWith('http://'))) {
+    if (!error && (path?.startsWith('https://') || path?.startsWith('http://'))) {
       // basic checking for if the path was set as a full URL
       // not using a full regex as it will likely be "https://api.openai.com/..."
       path = new URL(path).pathname
@@ -239,11 +250,11 @@ class OpenApiPlugin extends TracingPlugin {
           'openai.response.created_at': body.created_at
         }
 
-    responseDataExtractionByMethod(methodName, tags, body, store)
+    responseDataExtractionByMethod(methodName, tags, body, openaiStore)
     span.addTags(tags)
 
-    super.finish()
-    this.sendLog(methodName, span, tags, store, error)
+    span.finish()
+    this.sendLog(methodName, span, tags, openaiStore, error)
     this.sendMetrics(headers, body, endpoint, span._duration, error, tags)
   }
 
@@ -265,25 +276,34 @@ class OpenApiPlugin extends TracingPlugin {
     const completionTokens = spanTags['openai.response.usage.completion_tokens']
     const completionTokensEstimated = spanTags['openai.response.usage.completion_tokens_estimated']
 
+    const totalTokens = spanTags['openai.response.usage.total_tokens']
+
     if (!error) {
-      if (promptTokensEstimated) {
-        this.metrics.distribution(
-          'openai.tokens.prompt', promptTokens, [...tags, 'openai.estimated:true'])
-      } else {
-        this.metrics.distribution('openai.tokens.prompt', promptTokens, tags)
+      if (promptTokens != null) {
+        if (promptTokensEstimated) {
+          this.metrics.distribution(
+            'openai.tokens.prompt', promptTokens, [...tags, 'openai.estimated:true'])
+        } else {
+          this.metrics.distribution('openai.tokens.prompt', promptTokens, tags)
+        }
       }
-      if (completionTokensEstimated) {
-        this.metrics.distribution(
-          'openai.tokens.completion', completionTokens, [...tags, 'openai.estimated:true'])
-      } else {
-        this.metrics.distribution('openai.tokens.completion', completionTokens, tags)
+
+      if (completionTokens != null) {
+        if (completionTokensEstimated) {
+          this.metrics.distribution(
+            'openai.tokens.completion', completionTokens, [...tags, 'openai.estimated:true'])
+        } else {
+          this.metrics.distribution('openai.tokens.completion', completionTokens, tags)
+        }
       }
 
-      if (promptTokensEstimated || completionTokensEstimated) {
-        this.metrics.distribution(
-          'openai.tokens.total', promptTokens + completionTokens, [...tags, 'openai.estimated:true'])
-      } else {
-        this.metrics.distribution('openai.tokens.total', promptTokens + completionTokens, tags)
+      if (totalTokens != null) {
+        if (promptTokensEstimated || completionTokensEstimated) {
+          this.metrics.distribution(
+            'openai.tokens.total', totalTokens, [...tags, 'openai.estimated:true'])
+        } else {
+          this.metrics.distribution('openai.tokens.total', totalTokens, tags)
+        }
       }
     }
 
@@ -308,15 +328,15 @@ class OpenApiPlugin extends TracingPlugin {
     }
   }
 
-  sendLog (methodName, span, tags, store, error) {
-    if (!store) return
-    if (!Object.keys(store).length) return
+  sendLog (methodName, span, tags, openaiStore, error) {
+    if (!openaiStore) return
+    if (!Object.keys(openaiStore).length) return
     if (!this.sampler.isSampled()) return
 
     const log = {
       status: error ? 'error' : 'info',
       message: `sampled ${methodName}`,
-      ...store
+      ...openaiStore
     }
 
     this.logger.log(log, span, tags)
@@ -400,21 +420,21 @@ function countTokens (content, model) {
   }
 }
 
-function createEditRequestExtraction (tags, payload, store) {
+function createEditRequestExtraction (tags, payload, openaiStore) {
   const instruction = payload.instruction
   tags['openai.request.instruction'] = instruction
-  store.instruction = instruction
+  openaiStore.instruction = instruction
 }
 
 function retrieveModelRequestExtraction (tags, payload) {
   tags['openai.request.id'] = payload.id
 }
 
-function createChatCompletionRequestExtraction (tags, payload, store) {
+function createChatCompletionRequestExtraction (tags, payload, openaiStore) {
   const messages = payload.messages
   if (!defensiveArrayLength(messages)) return
 
-  store.messages = payload.messages
+  openaiStore.messages = payload.messages
   for (let i = 0; i < payload.messages.length; i++) {
     const message = payload.messages[i]
     tagChatCompletionRequestContent(message.content, i, tags)
@@ -424,20 +444,20 @@ function createChatCompletionRequestExtraction (tags, payload, store) {
   }
 }
 
-function commonCreateImageRequestExtraction (tags, payload, store) {
+function commonCreateImageRequestExtraction (tags, payload, openaiStore) {
   // createImageEdit, createImageVariation
   const img = payload.file || payload.image
   if (img !== null && typeof img === 'object' && img.path) {
     const file = path.basename(img.path)
     tags['openai.request.image'] = file
-    store.file = file
+    openaiStore.file = file
   }
 
   // createImageEdit
   if (payload.mask !== null && typeof payload.mask === 'object' && payload.mask.path) {
     const mask = path.basename(payload.mask.path)
     tags['openai.request.mask'] = mask
-    store.mask = mask
+    openaiStore.mask = mask
   }
 
   tags['openai.request.size'] = payload.size
@@ -445,7 +465,7 @@ function commonCreateImageRequestExtraction (tags, payload, store) {
   tags['openai.request.language'] = payload.language
 }
 
-function responseDataExtractionByMethod (methodName, tags, body, store) {
+function responseDataExtractionByMethod (methodName, tags, body, openaiStore) {
   switch (methodName) {
     case 'createModeration':
     case 'moderations.create':
@@ -458,7 +478,7 @@ function responseDataExtractionByMethod (methodName, tags, body, store) {
     case 'chat.completions.create':
     case 'createEdit':
     case 'edits.create':
-      commonCreateResponseExtraction(tags, body, store, methodName)
+      commonCreateResponseExtraction(tags, body, openaiStore, methodName)
       break
 
     case 'listFiles':
@@ -474,7 +494,7 @@ function responseDataExtractionByMethod (methodName, tags, body, store) {
 
     case 'createEmbedding':
     case 'embeddings.create':
-      createEmbeddingResponseExtraction(tags, body)
+      createEmbeddingResponseExtraction(tags, body, openaiStore)
       break
 
     case 'createFile':
@@ -629,14 +649,14 @@ function deleteFileResponseExtraction (tags, body) {
   tags['openai.response.id'] = body.id
 }
 
-function commonCreateAudioRequestExtraction (tags, body, store) {
+function commonCreateAudioRequestExtraction (tags, body, openaiStore) {
   tags['openai.request.response_format'] = body.response_format
   tags['openai.request.language'] = body.language
 
   if (body.file !== null && typeof body.file === 'object' && body.file.path) {
     const filename = path.basename(body.file.path)
     tags['openai.request.filename'] = filename
-    store.file = filename
+    openaiStore.file = filename
   }
 }
 
@@ -659,8 +679,8 @@ function createRetrieveFileResponseExtraction (tags, body) {
   tags['openai.response.status_details'] = body.status_details
 }
 
-function createEmbeddingResponseExtraction (tags, body) {
-  usageExtraction(tags, body)
+function createEmbeddingResponseExtraction (tags, body, openaiStore) {
+  usageExtraction(tags, body, openaiStore)
 
   if (!body.data) return
 
@@ -694,14 +714,14 @@ function createModerationResponseExtraction (tags, body) {
 }
 
 // createCompletion, createChatCompletion, createEdit
-function commonCreateResponseExtraction (tags, body, store, methodName) {
-  usageExtraction(tags, body, methodName)
+function commonCreateResponseExtraction (tags, body, openaiStore, methodName) {
+  usageExtraction(tags, body, methodName, openaiStore)
 
   if (!body.choices) return
 
   tags['openai.response.choices_count'] = body.choices.length
 
-  store.choices = body.choices
+  openaiStore.choices = body.choices
 
   for (let choiceIdx = 0; choiceIdx < body.choices.length; choiceIdx++) {
     const choice = body.choices[choiceIdx]
@@ -735,7 +755,7 @@ function commonCreateResponseExtraction (tags, body, store, methodName) {
 }
 
 // createCompletion, createChatCompletion, createEdit, createEmbedding
-function usageExtraction (tags, body, methodName) {
+function usageExtraction (tags, body, methodName, openaiStore) {
   let promptTokens = 0
   let completionTokens = 0
   let totalTokens = 0
@@ -743,14 +763,14 @@ function usageExtraction (tags, body, methodName) {
     promptTokens = body.usage.prompt_tokens
     completionTokens = body.usage.completion_tokens
     totalTokens = body.usage.total_tokens
-  } else if (['chat.completions.create', 'completions.create'].includes(methodName)) {
+  } else if (body.model && ['chat.completions.create', 'completions.create'].includes(methodName)) {
     // estimate tokens based on method name for completions and chat completions
     const { model } = body
     let promptEstimated = false
     let completionEstimated = false
 
     // prompt tokens
-    const payload = storage.getStore().openai
+    const payload = openaiStore
     const promptTokensCount = countPromptTokens(methodName, payload, model)
     promptTokens = promptTokensCount.promptTokens
     promptEstimated = promptTokensCount.promptEstimated
@@ -766,9 +786,9 @@ function usageExtraction (tags, body, methodName) {
     if (completionEstimated) tags['openai.response.usage.completion_tokens_estimated'] = true
   }
 
-  if (promptTokens) tags['openai.response.usage.prompt_tokens'] = promptTokens
-  if (completionTokens) tags['openai.response.usage.completion_tokens'] = completionTokens
-  if (totalTokens) tags['openai.response.usage.total_tokens'] = totalTokens
+  if (promptTokens != null) tags['openai.response.usage.prompt_tokens'] = promptTokens
+  if (completionTokens != null) tags['openai.response.usage.completion_tokens'] = completionTokens
+  if (totalTokens != null) tags['openai.response.usage.total_tokens'] = totalTokens
 }
 
 function truncateApiKey (apiKey) {

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

@@ -69,6 +69,7 @@ class PlaywrightPlugin extends CiPlugin {
     this.addSub('ci:playwright:test-suite:start', (testSuiteAbsolutePath) => {
       const store = storage.getStore()
       const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
+      const testSourceFile = getTestSuitePath(testSuiteAbsolutePath, this.repositoryRoot)
 
       const testSuiteMetadata = getTestSuiteCommonTags(
         this.command,
@@ -76,6 +77,14 @@ class PlaywrightPlugin extends CiPlugin {
         testSuite,
         'playwright'
       )
+      if (testSourceFile) {
+        testSuiteMetadata[TEST_SOURCE_FILE] = testSourceFile
+        testSuiteMetadata[TEST_SOURCE_START] = 1
+      }
+      const codeOwners = this.getCodeOwners(testSuiteMetadata)
+      if (codeOwners) {
+        testSuiteMetadata[TEST_CODE_OWNERS] = codeOwners
+      }
 
       const testSuiteSpan = this.tracer.startSpan('playwright.test_suite', {
         childOf: this.testModuleSpan,

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

@@ -3,7 +3,6 @@
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 const { storage } = require('../../datadog-core')
 const { getAmqpMessageSize } = require('../../dd-trace/src/datastreams/processor')
-const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams/pathway')
 
 class RheaConsumerPlugin extends ConsumerPlugin {
   static get id () { return 'rhea' }
@@ -34,8 +33,7 @@ class RheaConsumerPlugin extends ConsumerPlugin {
 
     if (
       this.config.dsmEnabled &&
-      msgObj?.message?.delivery_annotations &&
-      DsmPathwayCodec.contextExists(msgObj.message.delivery_annotations)
+      msgObj?.message?.delivery_annotations
     ) {
       const payloadSize = getAmqpMessageSize(
         { headers: msgObj.message.delivery_annotations, content: msgObj.message.body }