dd-trace 5.55.0 → 5.57.0

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

@@ -5,7 +5,9 @@ const ServerPlugin = require('../../dd-trace/src/plugins/server')
 class SharedbPlugin extends ServerPlugin {
   static get id () { return 'sharedb' }
 
-  start ({ actionName, request }) {
+  bindStart (ctx) {
+    const { actionName, request } = ctx
+
     const span = this.startSpan('sharedb.request', {
       service: this.config.service,
       resource: getReadableResourceName(actionName, request.c, request.q),
@@ -13,19 +15,25 @@ class SharedbPlugin extends ServerPlugin {
       meta: {
         'sharedb.action': actionName
       }
-    })
+    }, ctx)
 
     if (this.config.hooks && this.config.hooks.receive) {
       this.config.hooks.receive(span, request)
     }
+
+    return ctx.currentStore
   }
 
-  finish ({ request, res }) {
-    const span = this.activeSpan
+  bindFinish (ctx) {
+    const { request, res } = ctx
+
+    const span = ctx.currentStore.span
     if (this.config.hooks && this.config.hooks.reply) {
       this.config.hooks.reply(span, request, res)
     }
-    super.finish()
+    super.finish(ctx)
+
+    return ctx.parentStore
   }
 }
 

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const LogPlugin = require('../../dd-trace/src/plugins/log_plugin')
+const StructuredLogPlugin = require('../../dd-trace/src/plugins/structured_log_plugin')
 
-class WinstonPlugin extends LogPlugin {
+class WinstonPlugin extends StructuredLogPlugin {
   static get id () {
     return 'winston'
   }

package/packages/dd-trace/src/appsec/channels.js

@@ -4,34 +4,39 @@ const dc = require('dc-polyfill')
 
 // TODO: use TBD naming convention
 module.exports = {
+  apolloChannel: dc.tracingChannel('datadog:apollo:request'),
+  apolloServerCoreChannel: dc.tracingChannel('datadog:apollo-server-core:request'),
   bodyParser: dc.channel('datadog:body-parser:read:finish'),
+  childProcessExecutionTracingChannel: dc.tracingChannel('datadog:child_process:execution'),
   cookieParser: dc.channel('datadog:cookie-parser:read:finish'),
-  multerParser: dc.channel('datadog:multer:read:finish'),
-  startGraphqlResolve: dc.channel('datadog:graphql:resolver:start'),
+  expressMiddlewareError: dc.channel('apm:express:middleware:error'),
+  expressProcessParams: dc.channel('datadog:express:process_params:start'),
+  expressSession: dc.channel('datadog:express-session:middleware:finish'),
+  fastifyBodyParser: dc.channel('datadog:fastify:body-parser:finish'),
+  fastifyResponseChannel: dc.channel('datadog:fastify:response:finish'),
+  fastifyQueryParams: dc.channel('datadog:fastify:query-params:finish'),
+  fastifyCookieParser: dc.channel('datadog:fastify-cookie:read:finish'),
+  fastifyPathParams: dc.channel('datadog:fastify:path-params:finish'),
+  fsOperationStart: dc.channel('apm:fs:operation:start'),
   graphqlMiddlewareChannel: dc.tracingChannel('datadog:apollo:middleware'),
-  apolloChannel: dc.tracingChannel('datadog:apollo:request'),
-  apolloServerCoreChannel: dc.tracingChannel('datadog:apollo-server-core:request'),
-  incomingHttpRequestStart: dc.channel('dd-trace:incomingHttpRequestStart'),
+  httpClientRequestStart: dc.channel('apm:http:client:request:start'),
   incomingHttpRequestEnd: dc.channel('dd-trace:incomingHttpRequestEnd'),
-  passportVerify: dc.channel('datadog:passport:verify:finish'),
-  passportUser: dc.channel('datadog:passport:deserializeUser:finish'),
-  expressSession: dc.channel('datadog:express-session:middleware:finish'),
-  queryParser: dc.channel('datadog:query:read:finish'),
-  setCookieChannel: dc.channel('datadog:iast:set-cookie'),
+  incomingHttpRequestStart: dc.channel('dd-trace:incomingHttpRequestStart'),
+  multerParser: dc.channel('datadog:multer:read:finish'),
+  mysql2OuterQueryStart: dc.channel('datadog:mysql2:outerquery:start'),
   nextBodyParsed: dc.channel('apm:next:body-parsed'),
   nextQueryParsed: dc.channel('apm:next:query-parsed'),
-  expressProcessParams: dc.channel('datadog:express:process_params:start'),
-  routerParam: dc.channel('datadog:router:param:start'),
+  passportUser: dc.channel('datadog:passport:deserializeUser:finish'),
+  passportVerify: dc.channel('datadog:passport:verify:finish'),
+  pgPoolQueryStart: dc.channel('datadog:pg:pool:query:start'),
+  pgQueryStart: dc.channel('apm:pg:query:start'),
+  queryParser: dc.channel('datadog:query:read:finish'),
   responseBody: dc.channel('datadog:express:response:json:start'),
-  responseWriteHead: dc.channel('apm:http:server:response:writeHead:start'),
-  httpClientRequestStart: dc.channel('apm:http:client:request:start'),
   responseSetHeader: dc.channel('datadog:http:server:response:set-header:start'),
+  responseWriteHead: dc.channel('apm:http:server:response:writeHead:start'),
+  routerParam: dc.channel('datadog:router:param:start'),
+  setCookieChannel: dc.channel('datadog:iast:set-cookie'),
   setUncaughtExceptionCaptureCallbackStart: dc.channel('datadog:process:setUncaughtExceptionCaptureCallback:start'),
-  pgQueryStart: dc.channel('apm:pg:query:start'),
-  pgPoolQueryStart: dc.channel('datadog:pg:pool:query:start'),
-  mysql2OuterQueryStart: dc.channel('datadog:mysql2:outerquery:start'),
-  wafRunFinished: dc.channel('datadog:waf:run:finish'),
-  fsOperationStart: dc.channel('apm:fs:operation:start'),
-  expressMiddlewareError: dc.channel('apm:express:middleware:error'),
-  childProcessExecutionTracingChannel: dc.tracingChannel('datadog:child_process:execution')
+  startGraphqlResolve: dc.channel('datadog:graphql:resolver:start'),
+  wafRunFinished: dc.channel('datadog:waf:run:finish')
 }

package/packages/dd-trace/src/appsec/iast/analyzers/sql-injection-analyzer.js

@@ -15,7 +15,7 @@ class SqlInjectionAnalyzer extends StoredInjectionAnalyzer {
 
   onConfigure () {
     this.addSub('apm:mysql:query:start', ({ sql }) => this.analyze(sql, undefined, 'MYSQL'))
-    this.addSub('apm:mysql2:query:start', ({ sql }) => this.analyze(sql, undefined, 'MYSQL'))
+    this.addSub('datadog:mysql2:outerquery:start', ({ sql }) => this.analyze(sql, undefined, 'MYSQL'))
     this.addSub('apm:pg:query:start', ({ query }) => this.analyze(query.text, undefined, 'POSTGRES'))
 
     this.addSub(

package/packages/dd-trace/src/appsec/iast/analyzers/unvalidated-redirect-analyzer.js

@@ -5,13 +5,17 @@ const { UNVALIDATED_REDIRECT } = require('../vulnerabilities')
 const { getNodeModulesPaths } = require('../path-line')
 const { getRanges } = require('../taint-tracking/operations')
 const {
-  HTTP_REQUEST_HEADER_VALUE,
-  HTTP_REQUEST_PATH_PARAM,
-  HTTP_REQUEST_URI
+  HTTP_REQUEST_BODY,
+  HTTP_REQUEST_PARAMETER
 } = require('../taint-tracking/source-types')
 
 const EXCLUDED_PATHS = getNodeModulesPaths('express/lib/response.js')
 
+const VULNERABLE_SOURCE_TYPES = new Set([
+  HTTP_REQUEST_BODY,
+  HTTP_REQUEST_PARAMETER
+])
+
 class UnvalidatedRedirectAnalyzer extends InjectionAnalyzer {
   constructor () {
     super(UNVALIDATED_REDIRECT)
@@ -35,28 +39,17 @@ class UnvalidatedRedirectAnalyzer extends InjectionAnalyzer {
     if (!value) return false
 
     const ranges = getRanges(iastContext, value)
-    return ranges && ranges.length > 0 && !this._areSafeRanges(ranges)
+    return ranges?.length > 0 && this._hasUnsafeRange(ranges)
   }
 
-  // Do not report vulnerability if ranges sources are exclusively url,
-  // path params or referer header to avoid false positives.
-  _areSafeRanges (ranges) {
-    return ranges && ranges.every(
-      range => this._isPathParam(range) || this._isUrl(range) || this._isRefererHeader(range)
+  _hasUnsafeRange (ranges) {
+    return ranges.some(
+      range => this._isVulnerableRange(range)
     )
   }
 
-  _isRefererHeader (range) {
-    return range.iinfo.type === HTTP_REQUEST_HEADER_VALUE &&
-      range.iinfo.parameterName && range.iinfo.parameterName.toLowerCase() === 'referer'
-  }
-
-  _isPathParam (range) {
-    return range.iinfo.type === HTTP_REQUEST_PATH_PARAM
-  }
-
-  _isUrl (range) {
-    return range.iinfo.type === HTTP_REQUEST_URI
+  _isVulnerableRange (range) {
+    return VULNERABLE_SOURCE_TYPES.has(range.iinfo.type)
   }
 
   _getExcludedPaths () {

package/packages/dd-trace/src/appsec/iast/security-controls/index.js

@@ -85,7 +85,7 @@ function hookModule (filename, module, controlsByFile) {
       }
     })
   } catch (e) {
-    log.error('[ASM] Error initializing IAST security control for %', filename, e)
+    log.error('[ASM] Error initializing IAST security control for %s', filename, e)
   }
 
   return module

package/packages/dd-trace/src/appsec/iast/taint-tracking/operations-taint-object.js

@@ -2,8 +2,11 @@
 
 const TaintedUtils = require('@datadog/native-iast-taint-tracking')
 const { IAST_TRANSACTION_ID } = require('../iast-context')
+const { HTTP_REQUEST_PARAMETER } = require('./source-types')
 const log = require('../../../log')
 
+const SEPARATOR = '\u0000' // Unit Separator (cannot be in URL keys)
+
 function taintObject (iastContext, object, type) {
   let result = object
   const transactionId = iastContext?.[IAST_TRANSACTION_ID]
@@ -40,6 +43,46 @@ function taintObject (iastContext, object, type) {
   return result
 }
 
+function taintQueryWithCache (iastContext, query) {
+  const transactionId = iastContext?.[IAST_TRANSACTION_ID]
+  if (!transactionId || !query) return query
+
+  iastContext.queryCache ??= new Map() // key: "a.b.c", value: tainted string
+
+  traverseAndTaint(query, '', iastContext.queryCache, transactionId)
+  return query
+}
+
+function traverseAndTaint (node, path, cache, transactionId) {
+  if (node == null) return node
+
+  if (typeof node === 'string') {
+    const cachedValue = cache.get(path)
+
+    if (cachedValue === node) {
+      return cachedValue
+    }
+
+    const tainted = TaintedUtils.newTaintedString(transactionId, node, path, HTTP_REQUEST_PARAMETER)
+    cache.set(path, tainted)
+
+    return tainted
+  }
+
+  if (typeof node === 'object') {
+    const keys = Array.isArray(node) ? node.keys() : Object.keys(node)
+
+    for (const key of keys) {
+      const childPath = path ? `${path}${SEPARATOR}${key}` : String(key)
+      const tainted = traverseAndTaint(node[key], childPath, cache, transactionId)
+      node[key] = tainted
+    }
+  }
+
+  return node
+}
+
 module.exports = {
-  taintObject
+  taintObject,
+  taintQueryWithCache
 }

package/packages/dd-trace/src/appsec/iast/taint-tracking/operations.js

@@ -11,7 +11,7 @@ const {
   getTaintTrackingNoop,
   lodashTaintTrackingHandler
 } = require('./taint-tracking-impl')
-const { taintObject } = require('./operations-taint-object')
+const { taintObject, taintQueryWithCache } = require('./operations-taint-object')
 
 const lodashOperationCh = dc.channel('datadog:lodash:operation')
 
@@ -98,6 +98,7 @@ module.exports = {
   newTaintedString,
   newTaintedObject,
   taintObject,
+  taintQueryWithCache,
   isTainted,
   getRanges,
   enableTaintOperations,

package/packages/dd-trace/src/appsec/iast/taint-tracking/plugin.js

@@ -3,7 +3,7 @@
 const { SourceIastPlugin } = require('../iast-plugin')
 const { getIastContext } = require('../iast-context')
 const { storage } = require('../../../../../datadog-core')
-const { taintObject, newTaintedString, getRanges } = require('./operations')
+const { taintObject, newTaintedString, getRanges, taintQueryWithCache } = require('./operations')
 const {
   HTTP_REQUEST_BODY,
   HTTP_REQUEST_COOKIE_VALUE,
@@ -63,7 +63,12 @@ class TaintTrackingPlugin extends SourceIastPlugin {
 
     this.addSub(
       { channelName: 'datadog:express:query:finish', tag: HTTP_REQUEST_PARAMETER },
-      ({ query }) => this._taintTrackingHandler(HTTP_REQUEST_PARAMETER, query)
+      ({ query }) => {
+        const iastContext = getIastContext(storage('legacy').getStore())
+        if (!iastContext || !query) return
+
+        taintQueryWithCache(iastContext, query)
+      }
     )
 
     this.addSub(

package/packages/dd-trace/src/appsec/iast/taint-tracking/source-types.js

@@ -7,7 +7,6 @@ module.exports = {
   HTTP_REQUEST_HEADER_NAME: 'http.request.header.name',
   HTTP_REQUEST_HEADER_VALUE: 'http.request.header',
   HTTP_REQUEST_PARAMETER: 'http.request.parameter',
-  HTTP_REQUEST_PATH: 'http.request.path',
   HTTP_REQUEST_PATH_PARAM: 'http.request.path.parameter',
   HTTP_REQUEST_URI: 'http.request.uri',
   KAFKA_MESSAGE_KEY: 'kafka.message.key',

package/packages/dd-trace/src/appsec/index.js

@@ -7,6 +7,8 @@ const {
   bodyParser,
   cookieParser,
   multerParser,
+  fastifyBodyParser,
+  fastifyCookieParser,
   incomingHttpRequestStart,
   incomingHttpRequestEnd,
   passportVerify,
@@ -16,10 +18,13 @@ const {
   nextBodyParsed,
   nextQueryParsed,
   expressProcessParams,
+  fastifyQueryParams,
   responseBody,
   responseWriteHead,
   responseSetHeader,
-  routerParam
+  routerParam,
+  fastifyResponseChannel,
+  fastifyPathParams
 } = require('./channels')
 const waf = require('./waf')
 const addresses = require('./addresses')
@@ -37,6 +42,7 @@ const rasp = require('./rasp')
 const { isInServerlessEnvironment } = require('../serverless')
 
 const responseAnalyzedSet = new WeakSet()
+const storedResponseHeaders = new WeakMap()
 
 let isEnabled = false
 let config
@@ -76,8 +82,13 @@ function enable (_config) {
     nextBodyParsed.subscribe(onRequestBodyParsed)
     nextQueryParsed.subscribe(onRequestQueryParsed)
     expressProcessParams.subscribe(onRequestProcessParams)
+    fastifyBodyParser.subscribe(onRequestBodyParsed)
+    fastifyQueryParams.subscribe(onRequestQueryParsed)
+    fastifyCookieParser.subscribe(onRequestCookieParser)
+    fastifyPathParams.subscribe(onRequestProcessParams)
     routerParam.subscribe(onRequestProcessParams)
     responseBody.subscribe(onResponseBody)
+    fastifyResponseChannel.subscribe(onResponseBody)
     responseWriteHead.subscribe(onResponseWriteHead)
     responseSetHeader.subscribe(onResponseSetHeader)
 
@@ -187,7 +198,13 @@ function incomingHttpEndTranslator ({ req, res }) {
 
   waf.disposeContext(req)
 
-  Reporter.finishRequest(req, res)
+  const storedHeaders = storedResponseHeaders.get(req) || {}
+
+  Reporter.finishRequest(req, res, storedHeaders)
+
+  if (storedHeaders) {
+    storedResponseHeaders.delete(req)
+  }
 }
 
 function onPassportVerify ({ framework, login, user, success, abortController }) {
@@ -285,6 +302,10 @@ function onResponseBody ({ req, res, body }) {
 }
 
 function onResponseWriteHead ({ req, res, abortController, statusCode, responseHeaders }) {
+  if (Object.keys(responseHeaders).length) {
+    storedResponseHeaders.set(req, responseHeaders)
+  }
+
   // avoid "write after end" error
   if (isBlocked(res)) {
     abortController?.abort()
@@ -356,8 +377,13 @@ function disable () {
   if (nextBodyParsed.hasSubscribers) nextBodyParsed.unsubscribe(onRequestBodyParsed)
   if (nextQueryParsed.hasSubscribers) nextQueryParsed.unsubscribe(onRequestQueryParsed)
   if (expressProcessParams.hasSubscribers) expressProcessParams.unsubscribe(onRequestProcessParams)
+  if (fastifyBodyParser.hasSubscribers) fastifyBodyParser.unsubscribe(onRequestBodyParsed)
+  if (fastifyQueryParams.hasSubscribers) fastifyQueryParams.unsubscribe(onRequestQueryParsed)
+  if (fastifyCookieParser.hasSubscribers) fastifyCookieParser.unsubscribe(onRequestCookieParser)
+  if (fastifyPathParams.hasSubscribers) fastifyPathParams.unsubscribe(onRequestProcessParams)
   if (routerParam.hasSubscribers) routerParam.unsubscribe(onRequestProcessParams)
   if (responseBody.hasSubscribers) responseBody.unsubscribe(onResponseBody)
+  if (fastifyResponseChannel.hasSubscribers) fastifyResponseChannel.unsubscribe(onResponseBody)
   if (responseWriteHead.hasSubscribers) responseWriteHead.unsubscribe(onResponseWriteHead)
   if (responseSetHeader.hasSubscribers) responseSetHeader.unsubscribe(onResponseSetHeader)
 }

package/packages/dd-trace/src/appsec/rasp/utils.js

@@ -58,11 +58,6 @@ function handleResult (result, req, res, abortController, config, raspRule) {
       const abortError = new DatadogRaspAbortError(req, res, blockingAction, raspRule, ruleTriggered)
       abortController.abort(abortError)
 
-      // TODO Delete this when support for node 16 is removed
-      if (!abortController.signal.reason) {
-        abortController.signal.reason = abortError
-      }
-
       return
     }
   }

package/packages/dd-trace/src/appsec/reporter.js

@@ -140,14 +140,16 @@ function filterExtendedHeaders (headers, excludedHeaderNames, tagPrefix, limit =
   return result
 }
 
-function getCollectedHeaders (req, res, shouldCollectEventHeaders) {
+function getCollectedHeaders (req, res, shouldCollectEventHeaders, storedResponseHeaders = {}) {
   // Mandatory
   const mandatoryCollectedHeaders = filterHeaders(req.headers, REQUEST_HEADERS_MAP)
 
   // Basic collection
   if (!shouldCollectEventHeaders) return mandatoryCollectedHeaders
 
-  const responseHeaders = res.getHeaders()
+  const responseHeaders = Object.keys(storedResponseHeaders).length === 0
+    ? res.getHeaders()
+    : { ...storedResponseHeaders, ...res.getHeaders() }
 
   const requestEventCollectedHeaders = filterHeaders(req.headers, EVENT_HEADERS_MAP)
   const responseEventCollectedHeaders = filterHeaders(responseHeaders, RESPONSE_HEADERS_MAP)
@@ -399,7 +401,7 @@ function reportDerivatives (derivatives) {
   rootSpan.addTags(tags)
 }
 
-function finishRequest (req, res) {
+function finishRequest (req, res, storedResponseHeaders) {
   const rootSpan = web.root(req)
   if (!rootSpan) return
 
@@ -453,7 +455,7 @@ function finishRequest (req, res) {
 
   const tags = rootSpan.context()._tags
 
-  const newTags = getCollectedHeaders(req, res, shouldCollectEventHeaders(tags))
+  const newTags = getCollectedHeaders(req, res, shouldCollectEventHeaders(tags), storedResponseHeaders)
 
   if (tags['appsec.event'] === 'true' && typeof req.route?.path === 'string') {
     newTags['http.endpoint'] = req.route.path

package/packages/dd-trace/src/baggage.js

@@ -13,7 +13,7 @@ function getBaggageItem (key) {
 }
 
 function getAllBaggageItems () {
-  return storage('baggage').getStore()
+  return storage('baggage').getStore() ?? {}
 }
 
 function removeBaggageItem (keyToRemove) {
@@ -23,7 +23,7 @@ function removeBaggageItem (keyToRemove) {
 }
 
 function removeAllBaggageItems () {
-  storage('baggage').enterWith({})
+  storage('baggage').enterWith()
   return storage('baggage').getStore()
 }
 

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/worker/index.js

@@ -30,7 +30,7 @@ const probeIdToBreakpointId = new Map()
 session.on('Debugger.paused', async ({ params: { hitBreakpoints: [hitBreakpoint], callFrames } }) => {
   const probe = breakpointIdToProbe.get(hitBreakpoint)
   if (!probe) {
-    log.warn(`No probe found for breakpoint ${hitBreakpoint}`)
+    log.warn('No probe found for breakpoint', hitBreakpoint)
     return session.post('Debugger.resume')
   }
 
@@ -95,13 +95,13 @@ async function addBreakpoint (probe) {
 
   const script = findScriptFromPartialPath(file)
   if (!script) {
-    log.error(`No loaded script found for ${file}`)
+    log.error('No loaded script found for', file)
     throw new Error(`No loaded script found for ${file}`)
   }
 
   const { url, scriptId, sourceMapURL, source } = script
 
-  log.warn(`Adding breakpoint at ${url}:${line}`)
+  log.warn('Adding breakpoint at %s:%s', url, line)
 
   let lineNumber = line
   let columnNumber = 0

package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js

@@ -96,7 +96,7 @@ function getKnownTests ({
         incrementCountMetric(TELEMETRY_KNOWN_TESTS_RESPONSE_TESTS, {}, numTests)
         distributionMetric(TELEMETRY_KNOWN_TESTS_RESPONSE_BYTES, {}, res.length)
 
-        log.debug(() => `Number of received known tests: ${numTests}`)
+        log.debug('Number of received known tests:', numTests)
 
         done(null, knownTests)
       } catch (err) {

package/packages/dd-trace/src/ci-visibility/exporters/agentless/coverage-writer.js

@@ -68,7 +68,7 @@ class Writer extends BaseWriter {
         done()
         return
       }
-      log.debug(`Response from the intake: ${res}`)
+      log.debug('Response from the intake:', res)
       done()
     })
   }

package/packages/dd-trace/src/ci-visibility/exporters/agentless/di-logs-writer.js

@@ -45,7 +45,7 @@ class DynamicInstrumentationLogsWriter extends BaseWriter {
         done()
         return
       }
-      log.debug(`Response from the logs intake: ${res}`)
+      log.debug('Response from the logs intake:', res)
       done()
     })
   }

package/packages/dd-trace/src/ci-visibility/exporters/agentless/writer.js

@@ -48,7 +48,7 @@ class Writer extends BaseWriter {
     const startRequestTime = Date.now()
 
     incrementCountMetric(TELEMETRY_ENDPOINT_PAYLOAD_REQUESTS, { endpoint: 'test_cycle' })
-    distributionMetric(TELEMETRY_ENDPOINT_PAYLOAD_BYTES, { endpoint: 'test_cycle' }, data.length)
+    distributionMetric(TELEMETRY_ENDPOINT_PAYLOAD_BYTES, { endpoint: 'test_cycle' }, Buffer.byteLength(data))
 
     request(data, options, (err, res, statusCode) => {
       distributionMetric(
@@ -69,7 +69,7 @@ class Writer extends BaseWriter {
         done()
         return
       }
-      log.debug(`Response from the intake: ${res}`)
+      log.debug('Response from the intake:', res)
       done()
     })
   }

package/packages/dd-trace/src/ci-visibility/exporters/git/git_metadata.js

@@ -105,9 +105,9 @@ function getCommitsToUpload ({ url, repositoryUrl, latestCommits, isEvpProxy, ev
       incrementCountMetric(TELEMETRY_GIT_REQUESTS_SEARCH_COMMITS_ERRORS, { errorType: 'network' })
       return callback(new Error(`Can't parse commits to exclude response: ${e.message}`))
     }
-    log.debug(`There are ${alreadySeenCommits.length} commits to exclude.`)
+    log.debug('There are %s commits to exclude.', alreadySeenCommits.length)
     const commitsToInclude = latestCommits.filter((commit) => !alreadySeenCommits.includes(commit))
-    log.debug(`There are ${commitsToInclude.length} commits to include.`)
+    log.debug('There are %s commits to include.', commitsToInclude.length)
 
     if (!commitsToInclude.length) {
       return callback(null, [])
@@ -195,11 +195,11 @@ function generateAndUploadPackFiles ({
   repositoryUrl,
   headCommit
 }, callback) {
-  log.debug(`There are ${commitsToUpload.length} commits to upload`)
+  log.debug('There are %s commits to upload', commitsToUpload.length)
 
   const packFilesToUpload = generatePackFilesForCommits(commitsToUpload)
 
-  log.debug(`Uploading ${packFilesToUpload.length} packfiles.`)
+  log.debug('Uploading %s packfiles.', packFilesToUpload.length)
 
   if (!packFilesToUpload.length) {
     return callback(new Error('Failed to generate packfiles'))
@@ -253,14 +253,14 @@ function sendGitMetadata (url, { isEvpProxy, evpProxyPrefix }, configRepositoryU
     repositoryUrl = getRepositoryUrl()
   }
 
-  log.debug(`Uploading git history for repository ${repositoryUrl}`)
+  log.debug('Uploading git history for repository', repositoryUrl)
 
   if (!repositoryUrl) {
     return callback(new Error('Repository URL is empty'))
   }
 
   let latestCommits = getLatestCommits()
-  log.debug(`There were ${latestCommits.length} commits since last month.`)
+  log.debug('There were %s commits since last month.', latestCommits.length)
 
   const getOnFinishGetCommitsToUpload = (hasCheckedShallow) => (err, commitsToUpload) => {
     if (err) {

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js

@@ -86,10 +86,9 @@ function getSkippableSuites ({
       incrementCountMetric(TELEMETRY_ITR_SKIPPABLE_TESTS_ERRORS, { statusCode })
       done(err)
     } else {
-      let skippableSuites = []
       try {
         const parsedResponse = JSON.parse(res)
-        skippableSuites = parsedResponse
+        const skippableSuites = parsedResponse
           .data
           .filter(({ type }) => type === testLevel)
           .map(({ attributes: { suite, name } }) => {
@@ -107,7 +106,7 @@ function getSkippableSuites ({
           skippableSuites.length
         )
         distributionMetric(TELEMETRY_ITR_SKIPPABLE_TESTS_RESPONSE_BYTES, {}, res.length)
-        log.debug(() => `Number of received skippable ${testLevel}s: ${skippableSuites.length}`)
+        log.debug('Number of received skippable %ss:', testLevel, skippableSuites.length)
         done(null, skippableSuites, correlationId)
       } catch (err) {
         done(err)

package/packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js

@@ -122,15 +122,15 @@ function getLibraryConfiguration ({
           isImpactedTestsEnabled
         }
 
-        log.debug(() => `Remote settings: ${JSON.stringify(settings)}`)
+        log.debug('Remote settings: %j', settings)
 
         if (getEnvironmentVariable('DD_CIVISIBILITY_DANGEROUSLY_FORCE_COVERAGE')) {
           settings.isCodeCoverageEnabled = true
-          log.debug(() => 'Dangerously set code coverage to true')
+          log.debug('Dangerously set code coverage to true')
         }
         if (getEnvironmentVariable('DD_CIVISIBILITY_DANGEROUSLY_FORCE_TEST_SKIPPING')) {
           settings.isSuitesSkippingEnabled = true
-          log.debug(() => 'Dangerously set test skipping to true')
+          log.debug('Dangerously set test skipping to true')
         }
 
         incrementCountMetric(TELEMETRY_GIT_REQUESTS_SETTINGS_RESPONSE, settings)