dd-trace 6.8.0 → 6.10.0

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

@@ -5,6 +5,7 @@ const realSetTimeout = setTimeout
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { writeDatadogParentId, writeDatadogTraceId } = require('../../dd-trace/src/carrier')
 const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 
@@ -197,7 +198,7 @@ class JestPlugin extends CiPlugin {
         config._ddRequestErrorTags = this.getSessionRequestErrorTags()
         config._ddItrCorrelationId = this.itrCorrelationId
         config._ddIsEarlyFlakeDetectionEnabled = !!this.libraryConfig?.isEarlyFlakeDetectionEnabled
-        config._ddEarlyFlakeDetectionSlowTestRetries = this.libraryConfig?.earlyFlakeDetectionSlowTestRetries ?? {}
+        config._ddEarlyFlakeDetectionRetryPolicy = this.libraryConfig?.earlyFlakeDetectionRetryPolicy
         config._ddRepositoryRoot = this.repositoryRoot
         config._ddIsFlakyTestRetriesEnabled = this.libraryConfig?.isFlakyTestRetriesEnabled ?? false
         config._ddIsTestManagementTestsEnabled = this.libraryConfig?.isTestManagementEnabled ?? false
@@ -230,10 +231,10 @@ class JestPlugin extends CiPlugin {
         _ddItrSkippingEnabledTags: itrSkippingEnabledTags,
       } = testEnvironmentOptions
 
-      const testSessionSpanContext = this.tracer.extract('text_map', {
-        'x-datadog-trace-id': testSessionId,
-        'x-datadog-parent-id': testModuleId,
-      })
+      const carrier = /** @type {Record<string, unknown>} */ ({})
+      writeDatadogTraceId(carrier, testSessionId)
+      writeDatadogParentId(carrier, testModuleId)
+      const testSessionSpanContext = this.tracer.extract('text_map', carrier)
 
       const testSuiteMetadata = {
         ...getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, 'jest'),
@@ -299,23 +300,6 @@ class JestPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:jest:worker-report:telemetry', data => {
-      const telemetryEvents = JSON.parse(data)
-      for (const event of telemetryEvents) {
-        if (event.type === 'ciVisEvent') {
-          this.telemetry.ciVisEvent(event.name, event.testLevel, {
-            ...event.tags,
-            testFramework: event.testFramework,
-            isUnsupportedCIProvider: event.isUnsupportedCIProvider,
-          })
-        } else if (event.type === 'count') {
-          this.telemetry.count(event.name, event.tags, event.value)
-        } else if (event.type === 'distribution') {
-          this.telemetry.distribution(event.name, event.tags, event.measure)
-        }
-      }
-    })
-
     this.addSub('ci:jest:test-suite:finish', ({
       status,
       errorMessage,

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

@@ -1,8 +1,7 @@
 'use strict'
 
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
-const { getMessageSize } = require('../../dd-trace/src/datastreams')
-const { convertToTextMap } = require('./utils')
+const { convertToTextMap, getKafkaMessageSize } = require('./utils')
 
 class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
   static id = 'kafkajs'
@@ -39,7 +38,7 @@ class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
       }
 
       if (!this.config.dsmEnabled) continue
-      const payloadSize = getMessageSize(message)
+      const payloadSize = getKafkaMessageSize(message)
       this.tracer.decodeDataStreamsContext(headers)
       const edgeTags = ['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka']
       if (clusterId) {

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

@@ -1,9 +1,8 @@
 'use strict'
 
 const dc = require('dc-polyfill')
-const { getMessageSize } = require('../../dd-trace/src/datastreams')
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
-const { convertToTextMap } = require('./utils')
+const { convertToTextMap, getKafkaMessageSize } = require('./utils')
 const afterStartCh = dc.channel('dd-trace:kafkajs:consumer:afterStart')
 const beforeFinishCh = dc.channel('dd-trace:kafkajs:consumer:beforeFinish')
 
@@ -69,7 +68,7 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
     if (!headers) return
 
     const { span } = ctx.currentStore
-    const payloadSize = getMessageSize(message)
+    const payloadSize = getKafkaMessageSize(message)
     this.tracer.decodeDataStreamsContext(headers)
     const edgeTags = ['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka']
     if (clusterId) {

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

@@ -1,7 +1,8 @@
 'use strict'
 
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
-const { DsmPathwayCodec, getMessageSize } = require('../../dd-trace/src/datastreams')
+const { DsmPathwayCodec } = require('../../dd-trace/src/datastreams')
+const { getKafkaMessageSize } = require('./utils')
 
 const BOOTSTRAP_SERVERS_KEY = 'messaging.kafka.bootstrap.servers'
 const MESSAGING_DESTINATION_KEY = 'messaging.destination.name'
@@ -29,12 +30,13 @@ class KafkajsProducerPlugin extends ProducerPlugin {
   /**
    *
    * @typedef {object} ProducerResponseItem
-   * @property {string} topic
+   * @property {string} topicName
    * @property {number} partition
    * @property {import('kafkajs/utils/long').Long} [offset]
    * @property {import('kafkajs/utils/long').Long} [baseOffset]
    *
    * @param {ProducerResponseItem} response
+   * @param {string} [clusterId]
    * @returns {ProducerBacklog}
    */
   transformProduceResponse (response, clusterId) {
@@ -76,7 +78,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
 
     for (const message of messages) {
       if (message !== null && typeof message === 'object') {
-        const payloadSize = getMessageSize(message)
+        const payloadSize = getKafkaMessageSize(message)
         const edgeTags = ['direction:out', `topic:${topic}`, 'type:kafka']
 
         if (clusterId) {

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

@@ -1,27 +1,85 @@
 'use strict'
 
+const { getSizeOrZero } = require('../../dd-trace/src/datastreams')
+
+/** @typedef {string | Buffer | null | undefined} KafkaHeaderValue */
+/** @typedef {Record<string, KafkaHeaderValue | KafkaHeaderValue[]>} KafkaHeaderMap */
+/** @typedef {Array<Record<string, KafkaHeaderValue>>} NativeHeaderList */
+
+/** @typedef {Record<string, string | string[]>} TextMap */
+
+/**
+ * @param {TextMap} textMap
+ * @param {string} key
+ * @param {KafkaHeaderValue} value
+ */
+function addHeaderValue (textMap, key, value) {
+  if (value === null || value === undefined) return
+
+  const existing = textMap[key]
+  if (existing === undefined) {
+    textMap[key] = value.toString()
+  } else if (typeof existing === 'string') {
+    textMap[key] = [existing, value.toString()]
+  } else {
+    existing.push(value.toString())
+  }
+}
+
+/** @param {KafkaHeaderMap | NativeHeaderList | null | undefined} bufferMap */
 function convertToTextMap (bufferMap) {
   if (!bufferMap) return null
 
-  // rdKafka returns an array of header maps
+  // A `toString` or `__proto__` wire key would read an inherited value back as a repeat.
+  /** @type {TextMap} */
+  const textMap = Object.create(null)
+
+  // rdKafka reports one single-key record per wire field.
   if (Array.isArray(bufferMap)) {
-    const headers = {}
     for (const headerMap of bufferMap) {
       for (const key of Object.keys(headerMap)) {
-        headers[key] = headerMap[key].toString()
+        addHeaderValue(textMap, key, headerMap[key])
       }
     }
-    return headers
+    return textMap
   }
 
-  const textMap = {}
   for (const key of Object.keys(bufferMap)) {
-    if (bufferMap[key] === null || bufferMap[key] === undefined) continue
-    textMap[key] = bufferMap[key].toString()
+    const value = bufferMap[key]
+    if (Array.isArray(value)) {
+      for (const repeated of value) {
+        addHeaderValue(textMap, key, repeated)
+      }
+    } else {
+      addHeaderValue(textMap, key, value)
+    }
   }
   return textMap
 }
 
+/**
+ * A KafkaJS header value array becomes one wire record per element, so its key
+ * counts once per value. A native header array already holds one record per
+ * entry, where the array indices are not wire bytes.
+ *
+ * @param {{ key?: unknown, value?: unknown,
+ *   headers?: KafkaHeaderMap | NativeHeaderList | null }} message
+ */
+function getKafkaMessageSize (message) {
+  const { key, value, headers } = message
+  let size = getSizeOrZero(key) + getSizeOrZero(value)
+  if (headers === undefined || headers === null) return size
+  if (Array.isArray(headers)) return size + getSizeOrZero(headers)
+
+  for (const headerKey of Object.keys(headers)) {
+    const headerValue = headers[headerKey]
+    const keySize = Buffer.byteLength(headerKey, 'utf8')
+    size += (Array.isArray(headerValue) ? keySize * headerValue.length : keySize) + getSizeOrZero(headerValue)
+  }
+  return size
+}
+
 module.exports = {
   convertToTextMap,
+  getKafkaMessageSize,
 }