dd-trace 6.8.0 → 6.10.0

package/packages/datadog-plugin-aws-sdk/src/services/bedrockruntime/utils.js

@@ -487,16 +487,18 @@ function extractMessagesFromConverseContent (role, contentBlocks) {
   const toolCalls = []
   const toolResults = []
 
-  for (const block of contentBlocks || []) {
-    if (block == null || typeof block !== 'object') continue
-    if (typeof block.text === 'string') {
-      content += block.text
-    } else if (block.toolUse) {
-      toolCalls.push(buildToolCall(block.toolUse))
-    } else if (block.toolResult) {
-      toolResults.push(buildToolResult(block.toolResult))
-    } else {
-      content += `[Unsupported content type: ${getContentBlockType(block)}]`
+  if (contentBlocks) {
+    for (const block of contentBlocks) {
+      if (block == null || typeof block !== 'object') continue
+      if (typeof block.text === 'string') {
+        content += block.text
+      } else if (block.toolUse) {
+        toolCalls.push(buildToolCall(block.toolUse))
+      } else if (block.toolResult) {
+        toolResults.push(buildToolResult(block.toolResult))
+      } else {
+        content += `[Unsupported content type: ${getContentBlockType(block)}]`
+      }
     }
   }
 
@@ -572,14 +574,17 @@ function buildUsage (usage = {}) {
  */
 function extractConverseToolDefinitions (params) {
   const toolDefinitions = []
-  for (const tool of params.toolConfig?.tools || []) {
-    const toolSpec = tool?.toolSpec
-    if (!toolSpec?.name) continue
-    toolDefinitions.push({
-      name: toolSpec.name,
-      description: toolSpec.description ?? '',
-      schema: toolSpec.inputSchema ?? {},
-    })
+  const tools = params.toolConfig?.tools
+  if (tools) {
+    for (const tool of tools) {
+      const toolSpec = tool?.toolSpec
+      if (!toolSpec?.name) continue
+      toolDefinitions.push({
+        name: toolSpec.name,
+        description: toolSpec.description ?? '',
+        schema: toolSpec.inputSchema ?? {},
+      })
+    }
   }
   return toolDefinitions
 }
@@ -593,13 +598,17 @@ function extractConverseToolDefinitions (params) {
  */
 function extractRequestParamsConverse (params) {
   const prompt = []
-  for (const block of params.system || []) {
-    if (typeof block?.text === 'string') prompt.push({ content: block.text, role: 'system' })
+  if (params.system) {
+    for (const block of params.system) {
+      if (typeof block?.text === 'string') prompt.push({ content: block.text, role: 'system' })
+    }
   }
-  for (const msg of params.messages || []) {
-    if (msg == null || typeof msg !== 'object') continue
-    const message = extractMessagesFromConverseContent(msg.role || 'user', msg.content)
-    if (message) prompt.push(message)
+  if (params.messages) {
+    for (const msg of params.messages) {
+      if (msg == null || typeof msg !== 'object') continue
+      const message = extractMessagesFromConverseContent(msg.role || 'user', msg.content)
+      if (message) prompt.push(message)
+    }
   }
 
   const { temperature, topP, maxTokens, stopSequences } = params.inferenceConfig || {}
@@ -632,7 +641,7 @@ function extractTextAndResponseReasonConverse (response) {
  * response, spread across start/delta chunks. We reassemble those chunks
  * into a normalized content-block array and reuse the non-stream extractor.
  *
- * @param {Array<object>} chunks - Ordered ConverseStreamOutput events.
+ * @param {Array<object> | undefined} chunks - Ordered ConverseStreamOutput events.
  * @returns {Generation}
  */
 function extractTextAndResponseReasonConverseFromStream (chunks) {
@@ -641,29 +650,31 @@ function extractTextAndResponseReasonConverseFromStream (chunks) {
   let usage = {}
   const blocksByIdx = new Map()
 
-  for (const chunk of chunks || []) {
-    if (chunk.messageStart?.role) {
-      role = chunk.messageStart.role
-    } else if (chunk.messageStop?.stopReason) {
-      stopReason = chunk.messageStop.stopReason
-    } else if (chunk.metadata?.usage) {
-      usage = chunk.metadata.usage
-    } else if (chunk.contentBlockStart?.start?.toolUse) {
-      const { contentBlockIndex, start: { toolUse } } = chunk.contentBlockStart
-      blocksByIdx.set(contentBlockIndex, {
-        toolUse: { toolUseId: toolUse.toolUseId, name: toolUse.name, inputStr: '' },
-      })
-    } else if (chunk.contentBlockDelta) {
-      const { contentBlockIndex, delta } = chunk.contentBlockDelta
-      if (typeof delta?.text === 'string') {
-        const block = blocksByIdx.get(contentBlockIndex) ?? {}
-        block.text = (block.text ?? '') + delta.text
-        blocksByIdx.set(contentBlockIndex, block)
-      } else if (typeof delta?.toolUse?.input === 'string') {
-        const block = blocksByIdx.get(contentBlockIndex) ?? { toolUse: { inputStr: '' } }
-        block.toolUse ??= { inputStr: '' }
-        block.toolUse.inputStr += delta.toolUse.input
-        blocksByIdx.set(contentBlockIndex, block)
+  if (chunks) {
+    for (const chunk of chunks) {
+      if (chunk.messageStart?.role) {
+        role = chunk.messageStart.role
+      } else if (chunk.messageStop?.stopReason) {
+        stopReason = chunk.messageStop.stopReason
+      } else if (chunk.metadata?.usage) {
+        usage = chunk.metadata.usage
+      } else if (chunk.contentBlockStart?.start?.toolUse) {
+        const { contentBlockIndex, start: { toolUse } } = chunk.contentBlockStart
+        blocksByIdx.set(contentBlockIndex, {
+          toolUse: { toolUseId: toolUse.toolUseId, name: toolUse.name, inputStr: '' },
+        })
+      } else if (chunk.contentBlockDelta) {
+        const { contentBlockIndex, delta } = chunk.contentBlockDelta
+        if (typeof delta?.text === 'string') {
+          const block = blocksByIdx.get(contentBlockIndex) ?? {}
+          block.text = (block.text ?? '') + delta.text
+          blocksByIdx.set(contentBlockIndex, block)
+        } else if (typeof delta?.toolUse?.input === 'string') {
+          const block = blocksByIdx.get(contentBlockIndex) ?? { toolUse: { inputStr: '' } }
+          block.toolUse ??= { inputStr: '' }
+          block.toolUse.inputStr += delta.toolUse.input
+          blocksByIdx.set(contentBlockIndex, block)
+        }
       }
     }
   }

package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js

@@ -196,14 +196,11 @@ class Kinesis extends BaseAwsSdkPlugin {
       try {
         parsedAttributes = JSON.parse(recordDataAsString(record.Data))
       } catch {
-        // Non-JSON record. Skip DSM context for this entry; the
-        // checkpoint payload size below is still reported.
+        // Non-JSON record: it carries no context, so the checkpoint below starts a new pathway.
       }
 
       const payloadSize = getSizeOrZero(record.Data)
-      if (parsedAttributes?._datadog) {
-        this.tracer.decodeDataStreamsContext(parsedAttributes._datadog)
-      }
+      this.tracer.decodeDataStreamsContext(parsedAttributes?._datadog)
       this.tracer.setCheckpoint(tags, span, payloadSize)
     }
   }

package/packages/datadog-plugin-aws-sdk/src/services/sqs.js

@@ -275,11 +275,7 @@ class Sqs extends BaseAwsSdkPlugin {
     for (let i = 0; i < messages.length; i++) {
       const message = messages[i]
       const carrier = carriers === undefined ? this.parseMessageCarrier(message) : carriers[i]
-      if (carrier) {
-        // Inert for EventBridge until its producer emits a pathway (separate
-        // change) — no `dd-pathway-ctx-base64` to decode yet; SQS/SNS decode now.
-        this.tracer.decodeDataStreamsContext(carrier)
-      }
+      this.tracer.decodeDataStreamsContext(carrier)
       const payloadSize = getHeadersSize({
         Body: message.Body,
         MessageAttributes: message.MessageAttributes,

package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js

@@ -58,9 +58,7 @@ function scrubChildProcessCmd (expression) {
     for (let index = 0; index < expressionTokens.length; index++) {
       const token = expressionTokens[index]
 
-      if (token === null) {
-        continue
-      } else if (typeof token === 'object') {
+      if (token !== null && typeof token === 'object') {
         if (token.pattern) {
           result.push(token.pattern)
         } else if (token.op) {

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

@@ -308,6 +308,7 @@ class CucumberPlugin extends CiPlugin {
       isNew,
       isEfdRetry,
       isFlakyRetry,
+      isExternalRetry,
       isAttemptToFix,
       isAttemptToFixRetry,
       hasFailedAllRetries,
@@ -348,9 +349,12 @@ class CucumberPlugin extends CiPlugin {
         span.setTag(ERROR_MESSAGE, errorMessage)
       }
 
-      if (isFlakyRetry > 0) {
+      if (isFlakyRetry) {
         span.setTag(TEST_IS_RETRY, 'true')
         span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atr)
+      } else if (isExternalRetry) {
+        span.setTag(TEST_IS_RETRY, 'true')
+        span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.ext)
       }
 
       if (hasFailedAllRetries) {

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

@@ -8,6 +8,12 @@ const dateNow = Date.now
 const { createCoverageMap } = require('../../../vendor/dist/istanbul-lib-coverage')
 const satisfies = require('../../../vendor/dist/semifies')
 const { RUM_TEST_EXECUTION_ID_COOKIE_NAME } = require('../../dd-trace/src/ci-visibility/rum')
+const {
+  EMPTY_EFD_RETRY_POLICY,
+  getEfdRetryCountForDuration,
+  hasEfdRetries,
+  shouldSkipEfdRetry,
+} = require('../../dd-trace/src/ci-visibility/efd-retry-policy')
 const {
   TEST_STATUS,
   setRumTestTags,
@@ -72,16 +78,15 @@ const {
   TEST_HAS_DYNAMIC_NAME,
   getIsFaultyEarlyFlakeDetection,
   DYNAMIC_NAME_RE,
+  isMarkedAsUnskippable,
   recordAttemptToFixExecution,
+  recordTestManagementExecution,
   logAttemptToFixTestExecution,
   logTestOptimizationSummary,
-  getEfdRetryCount,
-  getMaxEfdRetryCount,
   getPullRequestBaseBranch,
   TEST_FINAL_STATUS,
   getTestOptimizationRequestResults,
 } = 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 { RESOURCE_NAME } = require('../../../ext/tags')
 const getConfig = require('../../dd-trace/src/config')
@@ -465,8 +470,7 @@ class CypressPlugin {
   isEarlyFlakeDetectionEnabled = false
   isEarlyFlakeDetectionFaulty = false
   isKnownTestsEnabled = false
-  earlyFlakeDetectionNumRetries = 0
-  earlyFlakeDetectionSlowTestRetries = {}
+  earlyFlakeDetectionRetryPolicy = EMPTY_EFD_RETRY_POLICY
   efdRetryCountByTest = {}
   efdSlowAbortedTests = {}
   earlyFlakeDetectionFaultyThreshold = 0
@@ -554,8 +558,7 @@ class CypressPlugin {
     this.isEarlyFlakeDetectionEnabled = false
     this.isEarlyFlakeDetectionFaulty = false
     this.isKnownTestsEnabled = false
-    this.earlyFlakeDetectionNumRetries = 0
-    this.earlyFlakeDetectionSlowTestRetries = {}
+    this.earlyFlakeDetectionRetryPolicy = EMPTY_EFD_RETRY_POLICY
     this.efdRetryCountByTest = {}
     this.efdSlowAbortedTests = {}
     this.earlyFlakeDetectionFaultyThreshold = 0
@@ -835,8 +838,7 @@ class CypressPlugin {
               isCodeCoverageEnabled,
               isCoverageReportUploadEnabled,
               isEarlyFlakeDetectionEnabled,
-              earlyFlakeDetectionNumRetries,
-              earlyFlakeDetectionSlowTestRetries,
+              earlyFlakeDetectionRetryPolicy,
               earlyFlakeDetectionFaultyThreshold,
               isFlakyTestRetriesEnabled,
               flakyTestRetriesCount,
@@ -851,8 +853,7 @@ class CypressPlugin {
           this.isCodeCoverageEnabled = isCodeCoverageEnabled
           this.isCoverageReportUploadEnabled = isCoverageReportUploadEnabled
           this.isEarlyFlakeDetectionEnabled = isEarlyFlakeDetectionEnabled
-          this.earlyFlakeDetectionNumRetries = earlyFlakeDetectionNumRetries
-          this.earlyFlakeDetectionSlowTestRetries = earlyFlakeDetectionSlowTestRetries ?? {}
+          this.earlyFlakeDetectionRetryPolicy = earlyFlakeDetectionRetryPolicy ?? EMPTY_EFD_RETRY_POLICY
           this.earlyFlakeDetectionFaultyThreshold = earlyFlakeDetectionFaultyThreshold
           this.isKnownTestsEnabled = isKnownTestsEnabled
           if (isFlakyTestRetriesEnabled && this.isTestIsolationEnabled) {
@@ -900,34 +901,6 @@ class CypressPlugin {
     return { isAttemptToFix, isDisabled, isQuarantined }
   }
 
-  /**
-   * Returns how many EFD retries must be scheduled before the first duration is known.
-   *
-   * @returns {number}
-   */
-  getConfiguredEfdRetryCount () {
-    const { earlyFlakeDetectionSlowTestRetries } = this
-    if (!earlyFlakeDetectionSlowTestRetries || !Object.keys(earlyFlakeDetectionSlowTestRetries).length) {
-      return this.earlyFlakeDetectionNumRetries
-    }
-    return getMaxEfdRetryCount(earlyFlakeDetectionSlowTestRetries)
-  }
-
-  /**
-   * Returns the selected EFD retry count for a test, or the scheduling count if it has not run yet.
-   *
-   * @param {string} testSuite
-   * @param {string} testName
-   * @returns {number}
-   */
-  getEfdRetryCountForTest (testSuite, testName) {
-    const testSuiteRetries = this.efdRetryCountByTest[testSuite]
-    if (!testSuiteRetries || testSuiteRetries[testName] === undefined) {
-      return this.getConfiguredEfdRetryCount()
-    }
-    return testSuiteRetries[testName]
-  }
-
   /**
    * Stores the selected EFD retry count for a test after its first execution duration is known.
    *
@@ -940,7 +913,7 @@ class CypressPlugin {
     if (!this.efdRetryCountByTest[testSuite]) {
       this.efdRetryCountByTest[testSuite] = {}
     }
-    const retryCount = getEfdRetryCount(duration ?? 0, this.earlyFlakeDetectionSlowTestRetries)
+    const retryCount = getEfdRetryCountForDuration(duration ?? 0, this.earlyFlakeDetectionRetryPolicy)
     this.efdRetryCountByTest[testSuite][testName] = retryCount
     if (retryCount === 0) {
       if (!this.efdSlowAbortedTests[testSuite]) {
@@ -961,7 +934,7 @@ class CypressPlugin {
    */
   shouldSkipEfdRetry (testSuite, testName, efdRetryIndex) {
     const testSuiteRetries = this.efdRetryCountByTest[testSuite]
-    return testSuiteRetries?.[testName] !== undefined && efdRetryIndex > testSuiteRetries[testName]
+    return shouldSkipEfdRetry(efdRetryIndex, testSuiteRetries?.[testName])
   }
 
   getTestSuiteSpan ({ testSuite, testSuiteAbsolutePath }) {
@@ -1431,7 +1404,8 @@ class CypressPlugin {
         skippedTestSpan.setTag(ITR_CORRELATION_ID, this.itrCorrelationId)
       }
 
-      const { isDisabled, isQuarantined } = this.getTestProperties(spec.relative, cypressTestName)
+      const { isAttemptToFix, isDisabled, isQuarantined } =
+        this.getTestProperties(spec.relative, cypressTestName)
 
       if (isDisabled) {
         skippedTestSpan.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
@@ -1439,6 +1413,24 @@ class CypressPlugin {
         skippedTestSpan.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
       }
 
+      recordTestManagementExecution({
+        testSuite: spec.relative,
+        testName: cypressTestName,
+        status: 'skip',
+        isAttemptToFix,
+        isDisabled,
+        isQuarantined,
+      })
+      if (isAttemptToFix) {
+        recordAttemptToFixExecution(this.attemptToFixExecutions, {
+          testSuite: spec.relative,
+          testName: cypressTestName,
+          status: 'skip',
+          isDisabled,
+          isQuarantined,
+        })
+      }
+
       skippedTestSpan.finish()
     }
 
@@ -1522,6 +1514,15 @@ class CypressPlugin {
             finishedTest.testSpan.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
           }
         }
+        const testManagementTags = finishedTest.testSpan.context().getTags()
+        recordTestManagementExecution({
+          testSuite: spec.relative,
+          testName,
+          status: testManagementTags[TEST_STATUS] || cypressTestStatus,
+          isAttemptToFix: finishedTest.isAttemptToFix,
+          isDisabled: testManagementTags[TEST_MANAGEMENT_IS_DISABLED] === 'true',
+          isQuarantined: testManagementTags[TEST_MANAGEMENT_IS_QUARANTINED] === 'true',
+        })
         if (this.itrCorrelationId) {
           finishedTest.testSpan.setTag(ITR_CORRELATION_ID, this.itrCorrelationId)
         }
@@ -1671,10 +1672,10 @@ class CypressPlugin {
     return {
       'dd:testSuiteStart': ({ testSuite, testSuiteAbsolutePath }) => {
         const suitePayload = {
-          isEarlyFlakeDetectionEnabled: this.isEarlyFlakeDetectionEnabled,
+          isEarlyFlakeDetectionEnabled:
+            this.isEarlyFlakeDetectionEnabled && hasEfdRetries(this.earlyFlakeDetectionRetryPolicy),
           knownTestsForSuite: this.knownTestsByTestSuite?.[testSuite] || [],
-          earlyFlakeDetectionNumRetries: this.getConfiguredEfdRetryCount(),
-          earlyFlakeDetectionSlowTestRetries: this.earlyFlakeDetectionSlowTestRetries,
+          earlyFlakeDetectionSchedulingRetryCount: this.earlyFlakeDetectionRetryPolicy.schedulingRetryCount,
           isKnownTestsEnabled: this.isKnownTestsEnabled,
           isTestManagementEnabled: this.isTestManagementTestsEnabled,
           testManagementAttemptToFixRetries: this.testManagementAttemptToFixRetries,
@@ -1784,7 +1785,10 @@ class CypressPlugin {
           }
           this.tracer._tracer._exporter.exportCoverage(formattedCoverage)
         }
-        const isEfdManagedTest = (isNew || isModified) && this.isEarlyFlakeDetectionEnabled && !isAttemptToFix
+        const isEfdManagedTest = (isNew || isModified) &&
+          this.isEarlyFlakeDetectionEnabled &&
+          hasEfdRetries(this.earlyFlakeDetectionRetryPolicy) &&
+          !isAttemptToFix
         let testStatus = CYPRESS_STATUS_TO_TEST_STATUS[state]
         let didAbortSlowEfdRetries = false
         if (isEfdManagedTest && !isEfdRetry && this.efdRetryCountByTest[testSuite]?.[testName] === undefined) {
@@ -1858,7 +1862,7 @@ class CypressPlugin {
         }
         // Check if all EFD retries failed
         if (isEfdManagedTest) {
-          const efdRetryCount = this.getEfdRetryCountForTest(testSuite, testName)
+          const efdRetryCount = this.efdRetryCountByTest[testSuite]?.[testName]
           const isLastEfdAttempt = testStatuses.length === efdRetryCount + 1
           if (efdRetryCount > 0 && isLastEfdAttempt && testStatuses.every(status => status === 'fail')) {
             this.activeTestSpan.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')

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

@@ -1,12 +1,15 @@
 'use strict'
 
+// No optional chaining or nullish coalescing in this file: Cypress 12 bundles it with webpack 4,
+// whose parser predates both, and its babel-loader skips node_modules.
+
 let rumFlushWaitMillis = 500
 let rumTestExecutionIdCookieName
 
 let isEarlyFlakeDetectionEnabled = false
 let isKnownTestsEnabled = false
 let knownTestsForSuite = []
-let earlyFlakeDetectionNumRetries = 0
+let earlyFlakeDetectionSchedulingRetryCount = 0
 let isTestManagementEnabled = false
 let testManagementAttemptToFixRetries = 0
 let testManagementTests = {}
@@ -336,7 +339,7 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
     } else if (isModified && isEarlyFlakeDetectionEnabled) {
       disableFrameworkRetries(test)
       retryMessage = 'to detect flakes because it is modified'
-      retriedTests = getRetriedTests(test, earlyFlakeDetectionNumRetries, [
+      retriedTests = getRetriedTests(test, earlyFlakeDetectionSchedulingRetryCount, [
         '_ddIsModified',
         '_ddIsEfdRetry',
         isKnownTestsEnabled && isNewTest(test) && '_ddIsNew',
@@ -344,7 +347,7 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
     } else if (isNew && isEarlyFlakeDetectionEnabled) {
       disableFrameworkRetries(test)
       retryMessage = 'to detect flakes because it is new'
-      retriedTests = getRetriedTests(test, earlyFlakeDetectionNumRetries, ['_ddIsNew', '_ddIsEfdRetry'])
+      retriedTests = getRetriedTests(test, earlyFlakeDetectionSchedulingRetryCount, ['_ddIsNew', '_ddIsEfdRetry'])
     }
 
     testsWithRetries.push(...retriedTests)
@@ -428,7 +431,7 @@ before(function () {
       isEarlyFlakeDetectionEnabled = suiteConfig.isEarlyFlakeDetectionEnabled
       isKnownTestsEnabled = suiteConfig.isKnownTestsEnabled
       knownTestsForSuite = suiteConfig.knownTestsForSuite
-      earlyFlakeDetectionNumRetries = suiteConfig.earlyFlakeDetectionNumRetries
+      earlyFlakeDetectionSchedulingRetryCount = suiteConfig.earlyFlakeDetectionSchedulingRetryCount
       isTestManagementEnabled = suiteConfig.isTestManagementEnabled
       testManagementAttemptToFixRetries = suiteConfig.testManagementAttemptToFixRetries
       testManagementTests = suiteConfig.testManagementTests

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

@@ -64,12 +64,18 @@ class ElectronRequestPlugin extends HttpClientPlugin {
     const responseHead = ctx.res?._responseHead
     const { statusCode } = responseHead || {}
 
-    for (const header in ctx.req._urlLoaderOptions?.headers || {}) {
-      reqHeaders[header.name] = header.value
+    const requestHeaders = ctx.req._urlLoaderOptions?.headers
+    if (requestHeaders) {
+      for (const header in requestHeaders) {
+        reqHeaders[header.name] = header.value
+      }
     }
 
-    for (const header in responseHead?.rawHeaders || {}) {
-      resHeaders[header.name] = header.value
+    const responseHeaders = responseHead?.rawHeaders
+    if (responseHeaders) {
+      for (const header in responseHeaders) {
+        resHeaders[header.name] = header.value
+      }
     }
 
     ctx.req = { headers: reqHeaders }

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

@@ -1,8 +1,17 @@
 'use strict'
 
-const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
+const {
+  readDatadogParentId,
+  readDatadogSamplingPriority,
+  readDatadogTraceId,
+  readTraceparent,
+  writeDatadogParentId,
+  writeDatadogSamplingPriority,
+  writeDatadogTraceId,
+} = require('../../dd-trace/src/carrier')
 const { DsmPathwayCodec, getHeadersSize } = require('../../dd-trace/src/datastreams')
 const id = require('../../dd-trace/src/id')
+const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
 class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
   static id = 'google-cloud-pubsub'
@@ -21,7 +30,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
 
   handleMessagePublish ({ attributes, pubsub, topicName }) {
     // Skip if message already has trace context from upstream
-    if (attributes['x-datadog-trace-id'] || attributes.traceparent) return
+    if (readDatadogTraceId(attributes) || readTraceparent(attributes)) return
 
     const activeSpan = this.tracer.scope().active()
     if (!activeSpan) return
@@ -62,7 +71,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
     const messages = request.messages || []
     const topic = request.topic
     const messageCount = messages.length
-    const hasTraceContext = messages[0]?.attributes?.['x-datadog-trace-id']
+    const hasTraceContext = messages[0]?.attributes && readDatadogTraceId(messages[0].attributes)
 
     /**
      * Batch Publishing Strategy:
@@ -82,12 +91,14 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
     }
 
     const firstAttrs = messages[0]?.attributes
-    const parentData = firstAttrs?.['x-datadog-trace-id'] && firstAttrs['x-datadog-parent-id']
+    const traceId = firstAttrs && readDatadogTraceId(firstAttrs)
+    const spanId = firstAttrs && readDatadogParentId(firstAttrs)
+    const parentData = traceId && spanId
       ? {
-          traceId: firstAttrs['x-datadog-trace-id'],
-          spanId: firstAttrs['x-datadog-parent-id'],
+          traceId,
+          spanId,
           traceIdUpper: firstAttrs['_dd.p.tid'],
-          samplingPriority: firstAttrs['x-datadog-sampling-priority'],
+          samplingPriority: readDatadogSamplingPriority(firstAttrs),
         }
       : null
 
@@ -174,33 +185,36 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
   }
 
   #extractSpanLink (attrs) {
-    if (!attrs?.['x-datadog-trace-id'] || !attrs['x-datadog-parent-id']) return null
+    if (!attrs) return null
+    const traceId = readDatadogTraceId(attrs)
+    const spanId = readDatadogParentId(attrs)
+    if (!traceId || !spanId) return null
 
     // Convert to hex strings
-    const lowerHex = id(attrs['x-datadog-trace-id']).toString(16)
-    const spanIdHex = id(attrs['x-datadog-parent-id']).toString(16)
+    const lowerHex = id(traceId).toString(16)
+    const spanIdHex = id(spanId).toString(16)
 
     // Build full 128-bit trace ID
     const traceIdHex = attrs['_dd.p.tid']
       ? attrs['_dd.p.tid'] + lowerHex
       : lowerHex.padStart(32, '0')
 
+    const samplingPriority = readDatadogSamplingPriority(attrs)
     return {
       traceId: traceIdHex,
       spanId: spanIdHex,
-      samplingPriority: attrs['x-datadog-sampling-priority']
-        ? Number.parseInt(attrs['x-datadog-sampling-priority'], 10)
+      samplingPriority: samplingPriority
+        ? Number.parseInt(samplingPriority, 10)
         : undefined,
     }
   }
 
   #extractParentContext (data) {
-    const carrier = {
-      'x-datadog-trace-id': data.traceId,
-      'x-datadog-parent-id': data.spanId,
-    }
+    const carrier = /** @type {Record<string, unknown>} */ ({})
+    writeDatadogTraceId(carrier, data.traceId)
+    writeDatadogParentId(carrier, data.spanId)
     if (data.traceIdUpper) carrier['_dd.p.tid'] = data.traceIdUpper
-    if (data.samplingPriority) carrier['x-datadog-sampling-priority'] = String(data.samplingPriority)
+    if (data.samplingPriority) writeDatadogSamplingPriority(carrier, String(data.samplingPriority))
 
     return this.tracer.extract('text_map', carrier)
   }

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

@@ -56,7 +56,7 @@ class HttpClientPlugin extends ClientPlugin {
         'out.host': hostname,
       },
       metrics: {
-        [CLIENT_PORT_KEY]: Number.parseInt(options.port),
+        [CLIENT_PORT_KEY]: Number.parseInt(options.port, 10),
       },
     }, false)
 

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

@@ -55,7 +55,7 @@ class Http2ClientPlugin extends ClientPlugin {
         'out.host': sessionDetails.host,
       },
       metrics: {
-        [CLIENT_PORT_KEY]: Number.parseInt(sessionDetails.port),
+        [CLIENT_PORT_KEY]: Number.parseInt(sessionDetails.port, 10),
       },
     }, false)