dd-trace 5.53.0 → 5.54.0

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

@@ -29,7 +29,7 @@ class GraphQLResolvePlugin extends TracingPlugin {
     const document = context.source
     const fieldNode = info.fieldNodes.find(fieldNode => fieldNode.kind === 'Field')
     const loc = this.config.source && document && fieldNode && fieldNode.loc
-    const source = loc && document.substring(loc.start, loc.end)
+    const source = loc && document.slice(loc.start, loc.end)
 
     const span = this.startSpan('graphql.resolve', {
       service: this.config.service,
@@ -122,7 +122,7 @@ function getResolverInfo (info, args) {
   let resolverInfo = null
   const resolverVars = {}
 
-  if (args && Object.keys(args).length) {
+  if (args) {
     Object.assign(resolverVars, args)
   }
 

package/packages/datadog-plugin-graphql/src/tools/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable unicorn/no-abusive-eslint-disable */
 /* eslint-disable */
 // file mostly untouched from apollo-graphql
 

package/packages/datadog-plugin-graphql/src/tools/signature.js

@@ -1,3 +1,4 @@
+/* eslint-disable unicorn/no-abusive-eslint-disable */
 /* eslint-disable */
 // file mostly untouched from apollo-graphql
 

package/packages/datadog-plugin-graphql/src/tools/transforms.js

@@ -1,3 +1,4 @@
+/* eslint-disable unicorn/no-abusive-eslint-disable */
 /* eslint-disable */
 // file mostly untouched from apollo-graphql
 

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

@@ -87,8 +87,8 @@ class GrpcClientPlugin extends ClientPlugin {
       // more are supported by the library
       // https://github.com/grpc/grpc/blob/v1.60.0/doc/naming.md
       const parts = peer.split(':')
-      if (parts[parts.length - 1].match(/^\d+/)) {
-        const port = parts[parts.length - 1]
+      if (/^\d+/.test(parts.at(-1))) {
+        const port = parts.at(-1)
         const ip = parts.slice(0, -1).join(':')
         span.setTag('network.destination.ip', ip)
         span.setTag('network.destination.port', port)

package/packages/datadog-plugin-grpc/src/util.js

@@ -27,7 +27,7 @@ module.exports = {
       tags.service = service
       tags.package = pkg
     } else {
-      tags.name = methodParts[methodParts.length - 1]
+      tags.name = methodParts.at(-1)
     }
 
     return tags
@@ -49,7 +49,7 @@ module.exports = {
       return config[filter]
     }
 
-    if (config[filter] instanceof Array) {
+    if (Array.isArray(config[filter])) {
       return element => pick(element, config[filter])
     }
 

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

@@ -49,7 +49,7 @@ class HttpClientPlugin extends ClientPlugin {
         'out.host': hostname
       },
       metrics: {
-        [CLIENT_PORT_KEY]: parseInt(options.port)
+        [CLIENT_PORT_KEY]: Number.parseInt(options.port)
       }
     }, false)
 
@@ -202,15 +202,26 @@ function getFilter (config) {
 function getHeaders (config) {
   if (!Array.isArray(config.headers)) return []
 
-  return config.headers
-    .filter(key => typeof key === 'string')
-    .map(h => h.split(':'))
-    .map(([key, tag]) => [key.toLowerCase(), tag])
+  const result = []
+  for (const header of config.headers) {
+    if (typeof header === 'string') {
+      const separatorIndex = header.indexOf(':')
+      result.push(separatorIndex === -1
+        ? [header, undefined]
+        : [
+            header.slice(0, separatorIndex).toLowerCase(),
+            header.slice(separatorIndex + 1)
+          ]
+      )
+    }
+  }
+  return result
 }
 
+const noop = () => {}
+
 function getHooks (config) {
-  const noop = () => {}
-  const request = (config.hooks && config.hooks.request) || noop
+  const request = config.hooks?.request ?? noop
 
   return { request }
 }

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

@@ -51,7 +51,7 @@ class Http2ClientPlugin extends ClientPlugin {
         'out.host': sessionDetails.host
       },
       metrics: {
-        [CLIENT_PORT_KEY]: parseInt(sessionDetails.port)
+        [CLIENT_PORT_KEY]: Number.parseInt(sessionDetails.port)
       }
     }, false)
 
@@ -124,9 +124,9 @@ function extractSessionDetails (authority, options) {
   }
 
   const protocol = authority.protocol || options.protocol || 'https:'
-  let port = '' + (authority.port !== ''
-    ? authority.port
-    : (authority.protocol === 'http:' ? 80 : 443))
+  let port = '' + (authority.port === ''
+    ? (authority.protocol === 'http:' ? 80 : 443)
+    : authority.port)
   let host = authority.hostname || authority.host || 'localhost'
 
   if (protocol === 'https:' && options) {
@@ -138,26 +138,26 @@ function extractSessionDetails (authority, options) {
 }
 
 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 (path?.toLowerCase().includes('x-amz-signature=')) {
+    return true
+  }
 
-    if ([].concat(headers.authorization).some(startsWith('AWS4-HMAC-SHA256'))) {
-      return true
+  if (headers) {
+    for (const [key, value] of Object.entries(headers)) {
+      const lowerCaseKey = key.toLowerCase()
+      if (lowerCaseKey === 'x-amz-signature' && value) {
+        return true
+      }
+      if (lowerCaseKey === 'authorization' && value) {
+        const authorization = Array.isArray(value) ? value : [value]
+        if (authorization.some((val) => val.startsWith('AWS4-HMAC-SHA256'))) {
+          return true
+        }
+      }
     }
   }
 
-  return path && path.toLowerCase().indexOf('x-amz-signature=') !== -1
-}
-
-function startsWith (searchString) {
-  return value => String(value).startsWith(searchString)
+  return false
 }
 
 function getStatusValidator (config) {

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

@@ -31,7 +31,8 @@ const {
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_HAS_FAILED_ALL_RETRIES,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  TEST_IS_MODIFIED
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const id = require('../../dd-trace/src/id')
@@ -185,6 +186,7 @@ class JestPlugin extends CiPlugin {
         config._ddFlakyTestRetriesCount = this.libraryConfig?.flakyTestRetriesCount
         config._ddIsDiEnabled = this.libraryConfig?.isDiEnabled ?? false
         config._ddIsKnownTestsEnabled = this.libraryConfig?.isKnownTestsEnabled ?? false
+        config._ddIsImpactedTestsEnabled = this.libraryConfig?.isImpactedTestsEnabled ?? false
       })
     })
 
@@ -393,16 +395,14 @@ class JestPlugin extends CiPlugin {
     })
 
     this.addSub('ci:jest:test:err', ({ span, error, shouldSetProbe, promises }) => {
-      if (error) {
-        if (span) {
-          span.setTag(TEST_STATUS, 'fail')
-          span.setTag('error', getFormattedError(error, this.repositoryRoot))
-          if (shouldSetProbe) {
-            const probeInformation = this.addDiProbe(error)
-            if (probeInformation) {
-              const { setProbePromise } = probeInformation
-              promises.isProbeReady = withTimeout(setProbePromise, 2000)
-            }
+      if (error && span) {
+        span.setTag(TEST_STATUS, 'fail')
+        span.setTag('error', getFormattedError(error, this.repositoryRoot))
+        if (shouldSetProbe) {
+          const probeInformation = this.addDiProbe(error)
+          if (probeInformation) {
+            const { setProbePromise } = probeInformation
+            promises.isProbeReady = withTimeout(setProbePromise, 2000)
           }
         }
       }
@@ -438,7 +438,8 @@ class JestPlugin extends CiPlugin {
       isAttemptToFixRetry,
       isJestRetry,
       isDisabled,
-      isQuarantined
+      isQuarantined,
+      isModified
     } = test
 
     const extraTags = {
@@ -463,6 +464,12 @@ class JestPlugin extends CiPlugin {
     if (isAttemptToFixRetry) {
       extraTags[TEST_IS_RETRY] = 'true'
       extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.atf
+    } else if (isEfdRetry) {
+      extraTags[TEST_IS_RETRY] = 'true'
+      extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.efd
+    } else if (isJestRetry) {
+      extraTags[TEST_IS_RETRY] = 'true'
+      extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.ext
     }
 
     if (isDisabled) {
@@ -473,17 +480,12 @@ class JestPlugin extends CiPlugin {
       extraTags[TEST_MANAGEMENT_IS_QUARANTINED] = 'true'
     }
 
-    if (isNew) {
-      extraTags[TEST_IS_NEW] = 'true'
-      if (isEfdRetry) {
-        extraTags[TEST_IS_RETRY] = 'true'
-        extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.efd
-      }
+    if (isModified) {
+      extraTags[TEST_IS_MODIFIED] = 'true'
     }
 
-    if (isJestRetry) {
-      extraTags[TEST_IS_RETRY] = 'true'
-      extraTags[TEST_RETRY_REASON] = TEST_RETRY_REASON_TYPES.ext
+    if (isNew) {
+      extraTags[TEST_IS_NEW] = 'true'
     }
 
     return super.startTestSpan(name, suite, this.testSuiteSpan, extraTags)

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

@@ -25,15 +25,15 @@ function getFormattedJestTestParameters (testParameters) {
   // Way 2.
   const parameterKeys = parameterArray[0].split('|').map(key => key.trim())
   const formattedParameters = []
+  let lastFormattedParameter = {}
   for (let index = 0; index < parameterValues.length; index++) {
-    const parameterValue = parameterValues[index]
     const parameterIndex = index % parameterKeys.length
-    if (!parameterIndex) {
-      formattedParameters.push({})
+    if (parameterIndex === 0) {
+      lastFormattedParameter = {}
+      formattedParameters.push(lastFormattedParameter)
     }
-    const parameterKey = parameterKeys[parameterIndex]
-    const lastFormattedParameter = formattedParameters[formattedParameters.length - 1]
-    lastFormattedParameter[parameterKey] = parameterValue
+    const key = parameterKeys[parameterIndex]
+    lastFormattedParameter[key] = parameterValues[index]
   }
 
   return formattedParameters
@@ -57,7 +57,7 @@ function isMarkedAsUnskippable (test) {
   try {
     const testSource = readFileSync(test.path, 'utf8')
     docblocks = parse(extract(testSource))
-  } catch (e) {
+  } catch {
     // If we have issues parsing the file, we'll assume no unskippable was passed
     return false
   }
@@ -69,7 +69,7 @@ function isMarkedAsUnskippable (test) {
 
   try {
     return JSON.parse(docblocks.datadog).unskippable
-  } catch (e) {
+  } catch {
     // If the @datadog block comment is present but malformed, we'll run the suite
     log.warn('@datadog block comment is malformed.')
     return true

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

@@ -6,7 +6,9 @@ class KafkajsBatchConsumerPlugin extends ConsumerPlugin {
   static get id () { return 'kafkajs' }
   static get operation () { return 'consume-batch' }
 
-  start ({ topic, partition, messages, groupId, clusterId }) {
+  start (ctx) {
+    const { topic, messages, groupId, clusterId } = ctx.extractedArgs || ctx
+
     if (!this.config.dsmEnabled) return
     for (const message of messages) {
       if (!message || !message.headers) continue

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

@@ -64,7 +64,9 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
     }
   }
 
-  start ({ topic, partition, message, groupId, clusterId }) {
+  bindStart (ctx) {
+    const { topic, partition, message, groupId, clusterId } = ctx.extractedArgs || ctx
+
     let childOf
     const headers = convertToTextMap(message?.headers)
     if (headers) {
@@ -83,7 +85,7 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
       metrics: {
         'kafka.partition': partition
       }
-    })
+    }, ctx)
     if (message?.offset) span.setTag('kafka.message.offset', message?.offset)
 
     if (this.config.dsmEnabled && headers) {
@@ -97,16 +99,18 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
     }
 
     if (afterStartCh.hasSubscribers) {
-      afterStartCh.publish({ topic, partition, message, groupId })
+      afterStartCh.publish({ topic, partition, message, groupId, currentStore: ctx.currentStore })
     }
+
+    return ctx.currentStore
   }
 
-  finish () {
+  finish (ctx) {
     if (beforeFinishCh.hasSubscribers) {
       beforeFinishCh.publish()
     }
 
-    super.finish()
+    super.finish(ctx)
   }
 }
 

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

@@ -52,7 +52,9 @@ class KafkajsProducerPlugin extends ProducerPlugin {
    * @param {ProducerResponseItem[]} commitList
    * @returns {void}
    */
-  commit (commitList) {
+  commit (ctx) {
+    const commitList = ctx.result
+
     if (!this.config.dsmEnabled) return
     if (!commitList || !Array.isArray(commitList)) return
     const keys = [
@@ -67,7 +69,8 @@ class KafkajsProducerPlugin extends ProducerPlugin {
     }
   }
 
-  start ({ topic, messages, bootstrapServers, clusterId, disableHeaderInjection }) {
+  bindStart (ctx) {
+    const { topic, messages, bootstrapServers, clusterId, disableHeaderInjection } = ctx
     const span = this.startSpan({
       resource: topic,
       meta: {
@@ -79,7 +82,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
       metrics: {
         'kafka.batch_size': messages.length
       }
-    })
+    }, ctx)
     if (bootstrapServers) {
       span.setTag(BOOTSTRAP_SERVERS_KEY, bootstrapServers)
     }
@@ -105,6 +108,8 @@ class KafkajsProducerPlugin extends ProducerPlugin {
         }
       }
     }
+
+    return ctx.currentStore
   }
 }
 

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

@@ -4,7 +4,7 @@ function convertToTextMap (bufferMap) {
   if (!bufferMap) return null
 
   // rdKafka returns an array of header maps
-  if (bufferMap instanceof Array) {
+  if (Array.isArray(bufferMap)) {
     const headers = {}
     for (const headerMap of bufferMap) {
       for (const key of Object.keys(headerMap)) {

package/packages/datadog-plugin-langchain/src/handlers/chain.js

@@ -3,35 +3,35 @@
 const LangChainHandler = require('./default')
 
 class LangChainChainHandler extends LangChainHandler {
-  getSpanStartTags (ctx) {
+  getSpanStartTags (ctx, provider, span) {
     const tags = {}
 
-    if (!this.isPromptCompletionSampled()) return tags
+    if (!this.isPromptCompletionSampled(span)) return tags
 
     let inputs = ctx.args?.[0]
     inputs = Array.isArray(inputs) ? inputs : [inputs]
 
     for (const idx in inputs) {
       const input = inputs[idx]
-      if (typeof input !== 'object') {
-        tags[`langchain.request.inputs.${idx}`] = this.normalize(input)
-      } else {
+      if (typeof input === 'object') {
         for (const [key, value] of Object.entries(input)) {
         // these are mappings to the python client names, ie lc_kwargs
         // only present on BaseMessage types
           if (key.includes('lc_')) continue
           tags[`langchain.request.inputs.${idx}.${key}`] = this.normalize(value)
         }
+      } else {
+        tags[`langchain.request.inputs.${idx}`] = this.normalize(input)
       }
     }
 
     return tags
   }
 
-  getSpanEndTags (ctx) {
+  getSpanEndTags (ctx, span) {
     const tags = {}
 
-    if (!this.isPromptCompletionSampled()) return tags
+    if (!this.isPromptCompletionSampled(span)) return tags
 
     let outputs = ctx.result
     outputs = Array.isArray(outputs) ? outputs : [outputs]

package/packages/datadog-plugin-langchain/src/handlers/embedding.js

@@ -3,12 +3,12 @@
 const LangChainHandler = require('./default')
 
 class LangChainEmbeddingHandler extends LangChainHandler {
-  getSpanStartTags (ctx) {
+  getSpanStartTags (ctx, provider, span) {
     const tags = {}
 
     const inputTexts = ctx.args?.[0]
 
-    const sampled = this.isPromptCompletionSampled()
+    const sampled = this.isPromptCompletionSampled(span)
     if (typeof inputTexts === 'string') {
       // embed query
       if (sampled) {

package/packages/datadog-plugin-langchain/src/handlers/language_models/chat_model.js

@@ -5,7 +5,7 @@ const LangChainLanguageModelHandler = require('.')
 const COMPLETIONS = 'langchain.response.completions'
 
 class LangChainChatModelHandler extends LangChainLanguageModelHandler {
-  getSpanStartTags (ctx, provider) {
+  getSpanStartTags (ctx, provider, span) {
     const tags = {}
 
     const inputs = ctx.args?.[0]
@@ -15,7 +15,7 @@ class LangChainChatModelHandler extends LangChainLanguageModelHandler {
 
       for (const messageIndex in messageSet) {
         const message = messageSet[messageIndex]
-        if (this.isPromptCompletionSampled()) {
+        if (this.isPromptCompletionSampled(span)) {
           tags[`langchain.request.messages.${messageSetIndex}.${messageIndex}.content`] =
             this.normalize(message.content) || ''
         }
@@ -39,11 +39,13 @@ class LangChainChatModelHandler extends LangChainLanguageModelHandler {
     return tags
   }
 
-  getSpanEndTags (ctx) {
+  getSpanEndTags (ctx, span) {
     const { result } = ctx
 
     const tags = {}
 
+    const sampled = this.isPromptCompletionSampled(span)
+
     this.extractTokenMetrics(ctx.currentStore?.span, result)
 
     for (const messageSetIdx in result?.generations) {
@@ -56,7 +58,7 @@ class LangChainChatModelHandler extends LangChainLanguageModelHandler {
         const message = chatCompletion.message
         let toolCalls = message.tool_calls
 
-        if (text && this.isPromptCompletionSampled()) {
+        if (text && sampled) {
           tags[
           `${COMPLETIONS}.${messageSetIdx}.${chatCompletionIdx}.content`
           ] = this.normalize(text)

package/packages/datadog-plugin-langchain/src/handlers/language_models/llm.js

@@ -3,12 +3,12 @@
 const LangChainLanguageModelHandler = require('.')
 
 class LangChainLLMHandler extends LangChainLanguageModelHandler {
-  getSpanStartTags (ctx, provider) {
+  getSpanStartTags (ctx, provider, span) {
     const tags = {}
 
     const prompts = ctx.args?.[0]
     for (const promptIdx in prompts) {
-      if (!this.isPromptCompletionSampled()) continue
+      if (!this.isPromptCompletionSampled(span)) continue
 
       const prompt = prompts[promptIdx]
       tags[`langchain.request.prompts.${promptIdx}.content`] = this.normalize(prompt) || ''
@@ -30,16 +30,17 @@ class LangChainLLMHandler extends LangChainLanguageModelHandler {
     return tags
   }
 
-  getSpanEndTags (ctx) {
+  getSpanEndTags (ctx, span) {
     const { result } = ctx
 
     const tags = {}
+    const sampled = this.isPromptCompletionSampled(span)
 
     this.extractTokenMetrics(ctx.currentStore?.span, result)
 
     for (const completionIdx in result?.generations) {
       const completion = result.generations[completionIdx]
-      if (this.isPromptCompletionSampled()) {
+      if (sampled) {
         tags[`langchain.response.completions.${completionIdx}.text`] = this.normalize(completion[0].text) || ''
       }
 

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

@@ -49,23 +49,24 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
     const provider = handler.extractProvider(instance)
     const model = handler.extractModel(instance)
 
-    const tags = handler.getSpanStartTags(ctx, provider) || []
-
-    if (apiKey) tags[API_KEY] = apiKey
-    if (provider) tags[PROVIDER] = provider
-    if (model) tags[MODEL] = model
-    if (type) tags[TYPE] = type
-
     const span = this.startSpan('langchain.request', {
       service: this.config.service,
       resource,
       kind: 'client',
       meta: {
-        [MEASURED]: 1,
-        ...tags
+        [MEASURED]: 1
       }
     }, false)
 
+    const tags = handler.getSpanStartTags(ctx, provider, span) || []
+
+    if (apiKey) tags[API_KEY] = apiKey
+    if (provider) tags[PROVIDER] = provider
+    if (model) tags[MODEL] = model
+    if (type) tags[TYPE] = type
+
+    span.addTags(tags)
+
     const store = storage('legacy').getStore() || {}
     ctx.currentStore = { ...store, span }
 
@@ -78,7 +79,7 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
     const { type } = ctx
 
     const handler = this.handlers[type]
-    const tags = handler.getSpanEndTags(ctx) || {}
+    const tags = handler.getSpanEndTags(ctx, span) || {}
 
     span.addTags(tags)
 

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

@@ -3,8 +3,6 @@
 const { storage } = require('../../datadog-core')
 const MySQLPlugin = require('../../datadog-plugin-mysql/src')
 
-let skippedStore
-
 class MariadbPlugin extends MySQLPlugin {
   static get id () { return 'mariadb' }
   static get system () { return 'mariadb' }
@@ -12,14 +10,10 @@ class MariadbPlugin extends MySQLPlugin {
   constructor (...args) {
     super(...args)
 
-    this.addSub(`apm:${this.component}:pool:skip`, () => {
-      skippedStore = storage('legacy').getStore()
-      storage('legacy').enterWith({ noop: true })
-    })
+    this.addBind(`apm:${this.component}:pool:skip`, () => ({ noop: true }))
 
-    this.addSub(`apm:${this.component}:pool:unskip`, () => {
-      storage('legacy').enterWith(skippedStore)
-      skippedStore = undefined
+    this.addSub(`apm:${this.component}:command:add`, ctx => {
+      ctx.parentStore = storage('legacy').getStore()
     })
   }
 }