dd-trace 5.51.0 → 5.53.0

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/index.js

@@ -0,0 +1,19 @@
+'use strict'
+
+const ProducerPlugin = require('./producer')
+const ConsumerPlugin = require('./consumer')
+const BatchConsumerPlugin = require('./batch-consumer')
+const KafkajsPlugin = require('../../datadog-plugin-kafkajs/src/index')
+
+class ConfluentKafkaJsPlugin extends KafkajsPlugin {
+  static get id () { return '@confluentinc/kafka-javascript' }
+  static get plugins () {
+    return {
+      producer: ProducerPlugin,
+      consumer: ConsumerPlugin,
+      batchConsumer: BatchConsumerPlugin
+    }
+  }
+}
+
+module.exports = ConfluentKafkaJsPlugin

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/producer.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const KafkajsProducerPlugin = require('../../datadog-plugin-kafkajs/src/producer')
+
+class ConfluentKafkaJsProducerPlugin extends KafkajsProducerPlugin {
+  static get id () {
+    return '@confluentinc/kafka-javascript'
+  }
+}
+
+module.exports = ConfluentKafkaJsProducerPlugin

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

@@ -221,13 +221,8 @@ class CucumberPlugin extends CiPlugin {
       this.telemetry.ciVisEvent(TELEMETRY_CODE_COVERAGE_FINISHED, 'suite', { library: 'istanbul' })
     })
 
-    this.addSub('ci:cucumber:test:start', ({
-      testName,
-      testFileAbsolutePath,
-      testSourceLine,
-      isParallel,
-      promises
-    }) => {
+    this.addBind('ci:cucumber:test:start', (ctx) => {
+      const { testName, testFileAbsolutePath, testSourceLine, isParallel, promises } = ctx
       const store = storage('legacy').getStore()
       const testSuite = getTestSuitePath(testFileAbsolutePath, this.sourceRoot)
       const testSourceFile = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot)
@@ -240,22 +235,23 @@ class CucumberPlugin extends CiPlugin {
         extraTags[CUCUMBER_IS_PARALLEL] = 'true'
       }
 
-      const testSpan = this.startTestSpan(testName, testSuite, extraTags)
+      const span = this.startTestSpan(testName, testSuite, extraTags)
 
-      this.enter(testSpan, store)
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, span }
 
-      this.activeTestSpan = testSpan
+      this.activeTestSpan = span
       // Time we give the breakpoint to be hit
       if (promises && this.runningTestProbe) {
         promises.hitBreakpointPromise = new Promise((resolve) => {
           setTimeout(resolve, BREAKPOINT_HIT_GRACE_PERIOD_MS)
         })
       }
+
+      return ctx.currentStore
     })
 
-    this.addSub('ci:cucumber:test:retry', ({ isFirstAttempt, error, isAtrRetry }) => {
-      const store = storage('legacy').getStore()
-      const span = store.span
+    this.addSub('ci:cucumber:test:retry', ({ span, isFirstAttempt, error, isAtrRetry }) => {
       if (!isFirstAttempt) {
         span.setTag(TEST_IS_RETRY, 'true')
         if (isAtrRetry) {
@@ -284,7 +280,9 @@ class CucumberPlugin extends CiPlugin {
       finishAllTraceSpans(span)
     })
 
-    this.addSub('ci:cucumber:test-step:start', ({ resource }) => {
+    this.addBind('ci:cucumber:test-step:start', (ctx) => {
+      const { resource } = ctx
+
       const store = storage('legacy').getStore()
       const childOf = store ? store.span : store
       const span = this.tracer.startSpan('cucumber.step', {
@@ -295,7 +293,10 @@ class CucumberPlugin extends CiPlugin {
           [RESOURCE_NAME]: resource
         }
       })
-      this.enter(span, store)
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, span }
+
+      return ctx.currentStore
     })
 
     this.addSub('ci:cucumber:worker-report:trace', (traces) => {
@@ -329,6 +330,7 @@ class CucumberPlugin extends CiPlugin {
     })
 
     this.addSub('ci:cucumber:test:finish', ({
+      span,
       isStep,
       status,
       skipReason,
@@ -341,10 +343,10 @@ class CucumberPlugin extends CiPlugin {
       isAttemptToFixRetry,
       hasFailedAllRetries,
       hasPassedAllRetries,
+      hasFailedAttemptToFix,
       isDisabled,
       isQuarantined
     }) => {
-      const span = storage('legacy').getStore().span
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
       span.setTag(statusTag, status)
@@ -385,6 +387,8 @@ class CucumberPlugin extends CiPlugin {
         span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.atf)
         if (hasPassedAllRetries) {
           span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+        } else if (hasFailedAttemptToFix) {
+          span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
         }
       }
 
@@ -422,11 +426,21 @@ class CucumberPlugin extends CiPlugin {
       }
     })
 
-    this.addSub('ci:cucumber:error', (err) => {
+    this.addBind('ci:cucumber:error', (ctx) => {
+      const { err } = ctx
       if (err) {
-        const span = storage('legacy').getStore().span
+        const span = ctx.currentStore.span
         span.setTag('error', err)
+
+        ctx.parentStore = ctx.currentStore
+        ctx.currentStore = { ...ctx.currentStore, span }
       }
+
+      return ctx.currentStore
+    })
+
+    this.addBind('ci:cucumber:test:fn', (ctx) => {
+      return ctx.currentStore
     })
   }
 

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

@@ -838,6 +838,9 @@ class CypressPlugin {
           }
           const isLastAttempt = testStatuses.length === this.testManagementAttemptToFixRetries + 1
           if (isLastAttempt) {
+            if (testStatuses.some(status => status === 'fail')) {
+              this.activeTestSpan.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
+            }
             if (testStatuses.every(status => status === 'fail')) {
               this.activeTestSpan.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
             } else if (testStatuses.every(status => status === 'pass')) {

package/packages/datadog-plugin-dns/src/lookup.js

@@ -6,7 +6,9 @@ class DNSLookupPlugin extends ClientPlugin {
   static get id () { return 'dns' }
   static get operation () { return 'lookup' }
 
-  start ([hostname]) {
+  bindStart (ctx) {
+    const [hostname] = ctx.args
+
     this.startSpan('dns.lookup', {
       service: this.config.service,
       resource: hostname,
@@ -16,11 +18,14 @@ class DNSLookupPlugin extends ClientPlugin {
         'dns.address': '',
         'dns.addresses': ''
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 
-  finish (result) {
-    const span = this.activeSpan
+  bindFinish (ctx) {
+    const span = ctx.currentStore.span
+    const result = ctx.result
 
     if (Array.isArray(result)) {
       const addresses = Array.isArray(result)
@@ -33,7 +38,7 @@ class DNSLookupPlugin extends ClientPlugin {
       span.setTag('dns.address', result)
     }
 
-    super.finish()
+    return ctx.parentStore
   }
 }
 

package/packages/datadog-plugin-dns/src/lookup_service.js

@@ -6,7 +6,9 @@ class DNSLookupServicePlugin extends ClientPlugin {
   static get id () { return 'dns' }
   static get operation () { return 'lookup_service' }
 
-  start ([address, port]) {
+  bindStart (ctx) {
+    const [address, port] = ctx.args
+
     this.startSpan('dns.lookup_service', {
       service: this.config.service,
       resource: `${address}:${port}`,
@@ -17,7 +19,9 @@ class DNSLookupServicePlugin extends ClientPlugin {
       metrics: {
         'dns.port': port
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-dns/src/resolve.js

@@ -6,7 +6,8 @@ class DNSResolvePlugin extends ClientPlugin {
   static get id () { return 'dns' }
   static get operation () { return 'resolve' }
 
-  start ([hostname, maybeType]) {
+  bindStart (ctx) {
+    const [hostname, maybeType] = ctx.args
     const rrtype = typeof maybeType === 'string' ? maybeType : 'A'
 
     this.startSpan('dns.resolve', {
@@ -17,7 +18,9 @@ class DNSResolvePlugin extends ClientPlugin {
         'dns.hostname': hostname,
         'dns.rrtype': rrtype
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-dns/src/reverse.js

@@ -6,7 +6,9 @@ class DNSReversePlugin extends ClientPlugin {
   static get id () { return 'dns' }
   static get operation () { return 'reverse' }
 
-  start ([ip]) {
+  bindStart (ctx) {
+    const [ip] = ctx.args
+
     this.startSpan('dns.reverse', {
       service: this.config.service,
       resource: ip,
@@ -14,7 +16,9 @@ class DNSReversePlugin extends ClientPlugin {
       meta: {
         'dns.ip': ip
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -10,9 +10,10 @@ class FsPlugin extends TracingPlugin {
     return super.configure(...args)
   }
 
-  start ({ operation, ...params }) {
+  bindStart (ctx) {
     if (!this.activeSpan) return this.skip()
 
+    const { operation, ...params } = ctx
     const lowerOp = operation.toLowerCase()
     const flag = params.flag || params.flags || (params.options && (params.options.flag || params.options.flags))
     const defaultFlag = ((lowerOp.includes('open') || lowerOp.includes('read')) && 'r') ||
@@ -38,7 +39,13 @@ class FsPlugin extends TracingPlugin {
         'file.src': params.src || params.oldPath || params.existingPath || params.target,
         'file.uid': uid || ''
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
+  }
+
+  bindFinish (ctx) {
+    return ctx.parentStore
   }
 }
 

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

@@ -0,0 +1,18 @@
+'use strict'
+
+const RedisPlugin = require('../../datadog-plugin-redis/src')
+
+class IOValkeyPlugin extends RedisPlugin {
+  static get id () {
+    return 'iovalkey'
+  }
+
+  static get system () { return 'valkey' }
+
+  constructor (...args) {
+    super(...args)
+    this._spanType = 'valkey'
+  }
+}
+
+module.exports = IOValkeyPlugin

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

@@ -333,28 +333,39 @@ class JestPlugin extends CiPlugin {
       this.telemetry.distribution(TELEMETRY_CODE_COVERAGE_NUM_FILES, {}, files.length)
     })
 
-    this.addSub('ci:jest:test:start', (test) => {
+    this.addBind('ci:jest:test:start', (ctx) => {
       const store = storage('legacy').getStore()
-      const span = this.startTestSpan(test)
+      const span = this.startTestSpan(ctx)
+
+      ctx.parentStore = store
+      ctx.currentStore = { ...store, span }
 
-      this.enter(span, store)
       this.activeTestSpan = span
+
+      return ctx.currentStore
+    })
+
+    this.addBind('ci:jest:test:fn', (ctx) => {
+      return ctx.currentStore
     })
 
     this.addSub('ci:jest:test:finish', ({
+      span,
       status,
       testStartLine,
       attemptToFixPassed,
       failedAllTests,
+      attemptToFixFailed,
       isAtrRetry
     }) => {
-      const span = storage('legacy').getStore().span
       span.setTag(TEST_STATUS, status)
       if (testStartLine) {
         span.setTag(TEST_SOURCE_START, testStartLine)
       }
       if (attemptToFixPassed) {
         span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'true')
+      } else if (attemptToFixFailed) {
+        span.setTag(TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED, 'false')
       }
       if (failedAllTests) {
         span.setTag(TEST_HAS_FAILED_ALL_RETRIES, 'true')
@@ -381,11 +392,9 @@ class JestPlugin extends CiPlugin {
       this.activeTestSpan = null
     })
 
-    this.addSub('ci:jest:test:err', ({ error, shouldSetProbe, promises }) => {
+    this.addSub('ci:jest:test:err', ({ span, error, shouldSetProbe, promises }) => {
       if (error) {
-        const store = storage('legacy').getStore()
-        if (store && store.span) {
-          const span = store.span
+        if (span) {
           span.setTag(TEST_STATUS, 'fail')
           span.setTag('error', getFormattedError(error, this.repositoryRoot))
           if (shouldSetProbe) {

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

@@ -1,5 +1,6 @@
 const ConsumerPlugin = require('../../dd-trace/src/plugins/consumer')
 const { getMessageSize } = require('../../dd-trace/src/datastreams')
+const { convertToTextMap } = require('./utils')
 
 class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
   static get id () { return 'kafkajs' }
@@ -10,7 +11,7 @@ class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
     for (const message of messages) {
       if (!message || !message.headers) continue
       const payloadSize = getMessageSize(message)
-      this.tracer.decodeDataStreamsContext(message.headers)
+      this.tracer.decodeDataStreamsContext(convertToTextMap(message.headers))
       const edgeTags = ['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka']
       if (clusterId) {
         edgeTags.push(`kafka_cluster_id:${clusterId}`)

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

@@ -3,7 +3,7 @@
 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 afterStartCh = dc.channel('dd-trace:kafkajs:consumer:afterStart')
 const beforeFinishCh = dc.channel('dd-trace:kafkajs:consumer:beforeFinish')
 
@@ -15,7 +15,7 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
 
   constructor () {
     super(...arguments)
-    this.addSub('apm:kafkajs:consume:commit', message => this.commit(message))
+    this.addSub(`apm:${this.constructor.id}:consume:commit`, message => this.commit(message))
   }
 
   /**
@@ -65,15 +65,18 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
   }
 
   start ({ topic, partition, message, groupId, clusterId }) {
-    const childOf = extract(this.tracer, message.headers)
+    let childOf
+    const headers = convertToTextMap(message?.headers)
+    if (headers) {
+      childOf = this.tracer.extract('text_map', headers)
+    }
     const span = this.startSpan({
       childOf,
       resource: topic,
       type: 'worker',
       meta: {
-        component: 'kafkajs',
+        component: this.constructor.id,
         'kafka.topic': topic,
-        'kafka.message.offset': message.offset,
         'kafka.cluster_id': clusterId,
         [MESSAGING_DESTINATION_KEY]: topic
       },
@@ -81,9 +84,11 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
         'kafka.partition': partition
       }
     })
-    if (this.config.dsmEnabled && message?.headers) {
+    if (message?.offset) span.setTag('kafka.message.offset', message?.offset)
+
+    if (this.config.dsmEnabled && headers) {
       const payloadSize = getMessageSize(message)
-      this.tracer.decodeDataStreamsContext(message.headers)
+      this.tracer.decodeDataStreamsContext(headers)
       const edgeTags = ['direction:in', `group:${groupId}`, `topic:${topic}`, 'type:kafka']
       if (clusterId) {
         edgeTags.push(`kafka_cluster_id:${clusterId}`)
@@ -105,18 +110,4 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
   }
 }
 
-function extract (tracer, bufferMap) {
-  if (!bufferMap) return null
-
-  const textMap = {}
-
-  for (const key of Object.keys(bufferMap)) {
-    if (bufferMap[key] === null || bufferMap[key] === undefined) continue
-
-    textMap[key] = bufferMap[key].toString()
-  }
-
-  return tracer.extract('text_map', textMap)
-}
-
 module.exports = KafkajsConsumerPlugin

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

@@ -13,7 +13,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
 
   constructor () {
     super(...arguments)
-    this.addSub('apm:kafkajs:produce:commit', message => this.commit(message))
+    this.addSub(`apm:${this.constructor.id}:produce:commit`, message => this.commit(message))
   }
 
   /**
@@ -54,6 +54,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
    */
   commit (commitList) {
     if (!this.config.dsmEnabled) return
+    if (!commitList || !Array.isArray(commitList)) return
     const keys = [
       'type',
       'partition',
@@ -66,11 +67,11 @@ class KafkajsProducerPlugin extends ProducerPlugin {
     }
   }
 
-  start ({ topic, messages, bootstrapServers, clusterId }) {
+  start ({ topic, messages, bootstrapServers, clusterId, disableHeaderInjection }) {
     const span = this.startSpan({
       resource: topic,
       meta: {
-        component: 'kafkajs',
+        component: this.constructor.id,
         'kafka.topic': topic,
         'kafka.cluster_id': clusterId,
         [MESSAGING_DESTINATION_KEY]: topic
@@ -84,7 +85,11 @@ class KafkajsProducerPlugin extends ProducerPlugin {
     }
     for (const message of messages) {
       if (message !== null && typeof message === 'object') {
-        this.tracer.inject(span, 'text_map', message.headers)
+        // message headers are not supported for kafka broker versions <0.11
+        if (!disableHeaderInjection) {
+          message.headers ??= {}
+          this.tracer.inject(span, 'text_map', message.headers)
+        }
         if (this.config.dsmEnabled) {
           const payloadSize = getMessageSize(message)
           const edgeTags = ['direction:out', `topic:${topic}`, 'type:kafka']
@@ -94,7 +99,9 @@ class KafkajsProducerPlugin extends ProducerPlugin {
           }
 
           const dataStreamsContext = this.tracer.setCheckpoint(edgeTags, span, payloadSize)
-          DsmPathwayCodec.encode(dataStreamsContext, message.headers)
+          if (!disableHeaderInjection) {
+            DsmPathwayCodec.encode(dataStreamsContext, message.headers)
+          }
         }
       }
     }

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

@@ -0,0 +1,27 @@
+'use strict'
+
+function convertToTextMap (bufferMap) {
+  if (!bufferMap) return null
+
+  // rdKafka returns an array of header maps
+  if (bufferMap instanceof Array) {
+    const headers = {}
+    for (const headerMap of bufferMap) {
+      for (const key of Object.keys(headerMap)) {
+        headers[key] = headerMap[key].toString()
+      }
+    }
+    return headers
+  }
+
+  const textMap = {}
+  for (const key of Object.keys(bufferMap)) {
+    if (bufferMap[key] === null || bufferMap[key] === undefined) continue
+    textMap[key] = bufferMap[key].toString()
+  }
+  return textMap
+}
+
+module.exports = {
+  convertToTextMap
+}

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

@@ -2,7 +2,6 @@
 
 const langChainTracingPlugins = require('./tracing')
 const langChainLLMObsPlugins = require('../../dd-trace/src/llmobs/plugins/langchain')
-// const LangChainLLMObsPlugin = require('../../dd-trace/src/llmobs/plugins/langchain')
 const CompositePlugin = require('../../dd-trace/src/plugins/composite')
 
 const plugins = {}