dd-trace 5.53.0 → 5.55.0

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

@@ -7,7 +7,9 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
   static get id () { return 'google-cloud-pubsub' }
   static get operation () { return 'request' }
 
-  start ({ request, api, projectId }) {
+  bindStart (ctx) {
+    const { request, api, projectId } = ctx
+
     if (api !== 'publish') return
 
     const messages = request.messages || []
@@ -19,7 +21,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
         'pubsub.method': api, // TODO: remove
         'pubsub.topic': topic
       }
-    })
+    }, ctx)
 
     for (const msg of messages) {
       if (!msg.attributes) {
@@ -33,6 +35,8 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
         DsmPathwayCodec.encode(dataStreamsContext, msg.attributes)
       }
     }
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-google-cloud-vertexai/src/tracing.js

@@ -25,18 +25,18 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
   bindStart (ctx) {
     const { instance, request, resource, stream } = ctx
 
-    const tags = this.tagRequest(request, instance, stream)
-
     const span = this.startSpan('vertexai.request', {
       service: this.config.service,
       resource,
       kind: 'client',
       meta: {
-        [MEASURED]: 1,
-        ...tags
+        [MEASURED]: 1
       }
     }, false)
 
+    const tags = this.tagRequest(request, instance, stream, span)
+    span.addTags(tags)
+
     const store = storage('legacy').getStore() || {}
     ctx.currentStore = { ...store, span }
 
@@ -51,14 +51,23 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
 
     const response = result?.response
     if (response) {
-      const tags = this.tagResponse(response)
+      const tags = this.tagResponse(response, span)
       span.addTags(tags)
     }
 
     span.finish()
   }
 
-  tagRequest (request, instance, stream) {
+  /**
+   * Generate the request tags.
+   *
+   * @param {Object} request
+   * @param {Object} instance
+   * @param {boolean} stream
+   * @param {Span} span
+   * @returns {Object}
+   */
+  tagRequest (request, instance, stream, span) {
     const model = extractModel(instance)
     const tags = {
       'vertexai.request.model': model
@@ -73,7 +82,7 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
 
     const generationConfig = instance.generationConfig || {}
     for (const key of Object.keys(generationConfig)) {
-      const transformedKey = key.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
+      const transformedKey = key.replaceAll(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase()
       tags[`vertexai.request.generation_config.${transformedKey}`] = JSON.stringify(generationConfig[key])
     }
 
@@ -81,7 +90,7 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
       tags['vertexai.request.stream'] = true
     }
 
-    if (!this.isPromptCompletionSampled()) return tags
+    if (!this.isPromptCompletionSampled(span)) return tags
 
     const systemInstructions = extractSystemInstructions(instance)
 
@@ -141,8 +150,16 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
     }
   }
 
-  tagResponse (response) {
+  /**
+   * Generate the response tags.
+   *
+   * @param {Object} response
+   * @param {Span} span
+   * @returns {Object}
+   */
+  tagResponse (response, span) {
     const tags = {}
+    const isSampled = this.isPromptCompletionSampled(span)
 
     const candidates = response.candidates
     for (const [candidateIdx, candidate] of candidates.entries()) {
@@ -154,7 +171,7 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
       const role = candidateContent.role
       tags[`vertexai.response.candidates.${candidateIdx}.content.role`] = role
 
-      if (!this.isPromptCompletionSampled()) continue
+      if (!isSampled) continue
 
       const parts = candidateContent.parts
       for (const [partIdx, part] of parts.entries()) {

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

@@ -70,12 +70,12 @@ function getSignature (document, operationName, operationType, calculate) {
       }
 
       return tools.defaultEngineReportingSignature(document, operationName)
-    } catch (e) {
+    } catch {
       // safety net
     }
   }
 
-  return [operationType, operationName].filter(val => val).join(' ')
+  return [operationType, operationName].filter(Boolean).join(' ')
 }
 
 module.exports = GraphQLExecutePlugin

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

@@ -27,12 +27,13 @@ class GraphQLPlugin extends CompositePlugin {
 // config validator helpers
 
 function validateConfig (config) {
-  return Object.assign({}, config, {
+  return {
+    ...config,
     depth: getDepth(config),
     variables: getVariablesFilter(config),
     collapse: config.collapse === undefined || !!config.collapse,
     hooks: getHooks(config)
-  })
+  }
 }
 
 function getDepth (config) {
@@ -47,7 +48,7 @@ function getDepth (config) {
 function getVariablesFilter (config) {
   if (typeof config.variables === 'function') {
     return config.variables
-  } else if (config.variables instanceof Array) {
+  } else if (Array.isArray(config.variables)) {
     return variables => pick(variables, config.variables)
   } else if (config.hasOwnProperty('variables')) {
     log.error('Expected `variables` to be an array or function.')
@@ -55,11 +56,12 @@ function getVariablesFilter (config) {
   return null
 }
 
-function getHooks (config) {
-  const noop = () => { }
-  const execute = config.hooks?.execute || noop
-  const parse = config.hooks?.parse || noop
-  const validate = config.hooks?.validate || noop
+const noop = () => {}
+
+function getHooks ({ hooks }) {
+  const execute = hooks?.execute ?? noop
+  const parse = hooks?.parse ?? noop
+  const validate = hooks?.validate ?? noop
 
   return { execute, parse, validate }
 }

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

@@ -16,20 +16,21 @@ class GraphQLResolvePlugin extends TracingPlugin {
     const computedPathString = path.join('.')
 
     if (this.config.collapse) {
+      if (context.fields[computedPathString]) return
+
       if (!context[collapsedPathSym]) {
         context[collapsedPathSym] = {}
+      } else if (context[collapsedPathSym][computedPathString]) {
+        return
       }
 
-      if (context.fields[computedPathString]) return
-      if (context[collapsedPathSym][computedPathString]) return
-
       context[collapsedPathSym][computedPathString] = true
     }
 
     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,
@@ -47,10 +48,9 @@ class GraphQLResolvePlugin extends TracingPlugin {
       const variables = this.config.variables(info.variableValues)
 
       fieldNode.arguments
-        .filter(arg => arg.value && arg.value.kind === 'Variable')
-        .filter(arg => arg.value.name && variables[arg.value.name.value])
-        .map(arg => arg.value.name.value)
-        .forEach(name => {
+        .filter(arg => arg.value?.name && arg.value.kind === 'Variable' && variables[arg.value.name.value])
+        .forEach(arg => {
+          const name = arg.value.name.value
           span.setTag(`graphql.variables.${name}`, variables[name])
         })
     }
@@ -89,7 +89,12 @@ class GraphQLResolvePlugin extends TracingPlugin {
 // helpers
 
 function shouldInstrument (config, path) {
-  const depth = path.filter(item => typeof item === 'string').length
+  let depth = 0
+  for (const item of path) {
+    if (typeof item === 'string') {
+      depth += 1
+    }
+  }
 
   return config.depth < 0 || config.depth >= depth
 }
@@ -122,10 +127,11 @@ function getResolverInfo (info, args) {
   let resolverInfo = null
   const resolverVars = {}
 
-  if (args && Object.keys(args).length) {
+  if (args) {
     Object.assign(resolverVars, args)
   }
 
+  let hasResolvers = false
   const directives = info.fieldNodes?.[0]?.directives
   if (Array.isArray(directives)) {
     for (const directive of directives) {
@@ -134,13 +140,14 @@ function getResolverInfo (info, args) {
         argList[argument.name.value] = argument.value.value
       }
 
-      if (Object.keys(argList).length) {
+      if (directive.arguments.length > 0) {
+        hasResolvers = true
         resolverVars[directive.name.value] = argList
       }
     }
   }
 
-  if (Object.keys(resolverVars).length) {
+  if (hasResolvers || args && Object.keys(resolverVars).length) {
     resolverInfo = { [info.fieldName]: resolverVars }
   }
 

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)
 
@@ -63,7 +63,7 @@ class HttpClientPlugin extends ClientPlugin {
       // Implemented due to aws-sdk issue where request signing is broken if we mutate the headers
       // Explained further in:
       // https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1609#issuecomment-1826167348
-      options.headers = Object.assign({}, options.headers)
+      options.headers = { ...options.headers }
       this.tracer.inject(span, HTTP_HEADERS, options.headers)
     }
 
@@ -173,13 +173,14 @@ function normalizeClientConfig (config) {
   const headers = getHeaders(config)
   const hooks = getHooks(config)
 
-  return Object.assign({}, config, {
+  return {
+    ...config,
     validateStatus,
     filter,
     propagationFilter,
     headers,
     hooks
-  })
+  }
 }
 
 function getStatusValidator (config) {
@@ -192,9 +193,7 @@ function getStatusValidator (config) {
 }
 
 function getFilter (config) {
-  config = Object.assign({}, config, {
-    blocklist: config.blocklist || []
-  })
+  config = { ...config, blocklist: config.blocklist || [] }
 
   return urlFilter.getFilter(config)
 }
@@ -202,15 +201,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'
+    : String(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) {
@@ -174,17 +174,16 @@ function normalizeConfig (config) {
   const filter = getFilter(config)
   const headers = getHeaders(config)
 
-  return Object.assign({}, config, {
+  return {
+    ...config,
     validateStatus,
     filter,
     headers
-  })
+  }
 }
 
 function getFilter (config) {
-  config = Object.assign({}, config, {
-    blocklist: config.blocklist || []
-  })
+  config = { ...config, blocklist: config.blocklist || [] }
 
   return urlFilter.getFilter(config)
 }

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

@@ -1,5 +1,6 @@
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 const {
   TEST_STATUS,
@@ -31,7 +32,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')
@@ -47,7 +49,7 @@ const {
   TELEMETRY_TEST_SESSION
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
-const isJestWorker = !!process.env.JEST_WORKER_ID
+const isJestWorker = !!getEnvironmentVariable('JEST_WORKER_ID')
 
 // https://github.com/facebook/jest/blob/d6ad15b0f88a05816c2fe034dd6900d28315d570/packages/jest-worker/src/types.ts#L38
 const CHILD_MESSAGE_END = 2
@@ -157,7 +159,7 @@ class JestPlugin extends CiPlugin {
 
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!process.env.DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER
+        autoInjected: !!getEnvironmentVariable('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
       })
 
       this.tracer._exporter.flush(() => {
@@ -185,6 +187,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 +396,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 +439,8 @@ class JestPlugin extends CiPlugin {
       isAttemptToFixRetry,
       isJestRetry,
       isDisabled,
-      isQuarantined
+      isQuarantined,
+      isModified
     } = test
 
     const extraTags = {
@@ -463,6 +465,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 +481,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