dd-trace 3.2.0 → 3.3.1

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

@@ -15,7 +15,7 @@ class Writer extends BaseWriter {
   constructor ({ url }) {
     super(...arguments)
     this._url = url
-    this._encoder = new CoverageCIVisibilityEncoder()
+    this._encoder = new CoverageCIVisibilityEncoder(this)
   }
 
   _sendPayload (form, _, done) {

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

@@ -25,10 +25,10 @@ class AgentlessCiVisibilityExporter {
     })
   }
 
-  exportCoverage ({ testSpan, coverageFiles }) {
+  exportCoverage ({ span, coverageFiles }) {
     const formattedCoverage = {
-      traceId: testSpan.context()._traceId,
-      spanId: testSpan.context()._spanId,
+      traceId: span.context()._traceId,
+      spanId: span.context()._spanId,
       files: coverageFiles
     }
     this._coverageWriter.append(formattedCoverage)

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

@@ -14,7 +14,7 @@ const fromEntries = Object.fromEntries || (entries =>
   entries.reduce((obj, [k, v]) => Object.assign(obj, { [k]: v }), {}))
 
 // eslint-disable-next-line max-len
-const qsRegex = '(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:"|%22)(?:%2[^2]|%[^2]|[^"%])+(?:"|%22))|bearer(?:\\s|%20)+[a-z0-9\\._\\-]|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+\\/=-]|%3D|%2F|%2B)+)?|[\\-]{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY[\\-]{5}[^\\-]+[\\-]{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY|ssh-rsa(?:\\s|%20)*(?:[a-z0-9\\/\\.+]|%2F|%5C|%2B){100,}'
+const qsRegex = '(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:"|%22)(?:%2[^2]|%[^2]|[^"%])+(?:"|%22))|bearer(?:\\s|%20)+[a-z0-9\\._\\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+\\/=-]|%3D|%2F|%2B)+)?|[\\-]{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY[\\-]{5}[^\\-]+[\\-]{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY|ssh-rsa(?:\\s|%20)*(?:[a-z0-9\\/\\.+]|%2F|%5C|%2B){100,}'
 
 function safeJsonParse (input) {
   try {
@@ -24,6 +24,16 @@ function safeJsonParse (input) {
   }
 }
 
+// Shallow clone with property name remapping
+function remapify (input, mappings) {
+  if (!input) return
+  const output = {}
+  for (const [key, value] of Object.entries(input)) {
+    output[key in mappings ? mappings[key] : key] = value
+  }
+  return output
+}
+
 class Config {
   constructor (options) {
     options = options || {}
@@ -257,7 +267,11 @@ ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)
         ingestion.sampleRate
       ),
       rateLimit: coalesce(options.rateLimit, process.env.DD_TRACE_RATE_LIMIT, ingestion.rateLimit),
-      rules: coalesce(options.samplingRules, safeJsonParse(process.env.DD_TRACE_SAMPLING_RULES), [])
+      rules: coalesce(options.samplingRules, safeJsonParse(process.env.DD_TRACE_SAMPLING_RULES), []).map(rule => {
+        return remapify(rule, {
+          sample_rate: 'sampleRate'
+        })
+      })
     }
 
     const inAWSLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined

package/packages/dd-trace/src/encode/0.4.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { truncateSpan, normalizeSpan } = require('./tags-processors')
 const Chunk = require('./chunk')
 const log = require('../log')
 
@@ -12,6 +13,10 @@ float64Array[0] = -1
 
 const bigEndian = uInt8Float64Array[7] === 0
 
+function formatSpan (span) {
+  return normalizeSpan(truncateSpan(span))
+}
+
 class AgentEncoder {
   constructor (writer, limit = SOFT_LIMIT) {
     this._limit = limit
@@ -66,7 +71,8 @@ class AgentEncoder {
   _encode (bytes, trace) {
     this._encodeArrayPrefix(bytes, trace)
 
-    for (const span of trace) {
+    for (let span of trace) {
+      span = formatSpan(span)
       bytes.reserve(1)
 
       if (span.type) {

package/packages/dd-trace/src/encode/0.5.js

@@ -1,10 +1,15 @@
 'use strict'
 
+const { truncateSpan, normalizeSpan } = require('./tags-processors')
 const { AgentEncoder: BaseEncoder } = require('./0.4')
 
 const ARRAY_OF_TWO = 0x92
 const ARRAY_OF_TWELVE = 0x9c
 
+function formatSpan (span) {
+  return normalizeSpan(truncateSpan(span))
+}
+
 class AgentEncoder extends BaseEncoder {
   makePayload () {
     const prefixSize = 1
@@ -27,7 +32,8 @@ class AgentEncoder extends BaseEncoder {
   _encode (bytes, trace) {
     this._encodeArrayPrefix(bytes, trace)
 
-    for (const span of trace) {
+    for (let span of trace) {
+      span = formatSpan(span)
       this._encodeByte(bytes, ARRAY_OF_TWELVE)
       this._encodeString(bytes, span.service)
       this._encodeString(bytes, span.name)

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

@@ -134,11 +134,11 @@ class AgentlessCiVisibilityEncoder extends AgentEncoder {
      */
     if (content.meta.test_session_id) {
       this._encodeString(bytes, 'test_session_id')
-      this._encodeId(bytes, id(content.meta.test_session_id))
+      this._encodeId(bytes, id(content.meta.test_session_id, 10))
       delete content.meta.test_session_id
 
       this._encodeString(bytes, 'test_suite_id')
-      this._encodeId(bytes, id(content.meta.test_suite_id))
+      this._encodeId(bytes, id(content.meta.test_suite_id, 10))
       delete content.meta.test_suite_id
     }
     this._encodeString(bytes, 'meta')

package/packages/dd-trace/src/encode/coverage-ci-visibility.js

@@ -1,6 +1,7 @@
 'use strict'
 const { AgentEncoder } = require('./0.4')
 const Chunk = require('./chunk')
+const log = require('../log')
 
 const FormData = require('../exporters/common/form-data')
 
@@ -13,17 +14,34 @@ class CoverageCIVisibilityEncoder extends AgentEncoder {
     super(...arguments)
     this.codeCoverageBuffers = []
     this._coverageBytes = new Chunk()
+    this.form = new FormData()
+    this.fileIndex = 1
     this.reset()
   }
 
   count () {
-    return this.codeCoverageBuffers.length
+    return this.fileIndex - 1
   }
 
   encode (coverage) {
     const bytes = this._coverageBytes
     const coverageBuffer = this.encodeCodeCoverage(bytes, coverage)
-    this.codeCoverageBuffers.push(coverageBuffer)
+    const coverageFilename = `coverage${this.fileIndex++}`
+
+    this.form.append(
+      coverageFilename,
+      coverageBuffer,
+      {
+        filename: `${coverageFilename}.msgpack`,
+        contentType: 'application/msgpack'
+      }
+    )
+
+    if (this.fileIndex === MAXIMUM_NUM_COVERAGE_FILES) {
+      log.debug('Coverage buffer reached the limit, flushing')
+      this._writer.flush()
+    }
+
     this.reset()
   }
 
@@ -58,24 +76,18 @@ class CoverageCIVisibilityEncoder extends AgentEncoder {
   }
 
   makePayload () {
-    const form = new FormData()
-
-    let coverageFileIndex = 1
-
-    for (const coverageBuffer of this.codeCoverageBuffers.slice(0, MAXIMUM_NUM_COVERAGE_FILES)) {
-      const coverageFilename = `coverage${coverageFileIndex++}`
-      form.append(
-        coverageFilename,
-        coverageBuffer,
-        {
-          filename: `${coverageFilename}.msgpack`,
-          contentType: 'application/msgpack'
-        }
-      )
-    }
-    // 'event' is a backend requirement
-    form.append('event', JSON.stringify({}), { filename: 'event.json', contentType: 'application/json' })
-    this.codeCoverageBuffers = this.codeCoverageBuffers.slice(MAXIMUM_NUM_COVERAGE_FILES)
+    this.form.append(
+      'event',
+      // The intake requires a populated dictionary here. Simply having {} is not valid.
+      // We use dummy: true but any other key/value pair would be valid.
+      JSON.stringify({ dummy: true }),
+      { filename: 'event.json', contentType: 'application/json' }
+    )
+
+    const form = this.form
+
+    this.form = new FormData()
+    this.fileIndex = 1
 
     return form
   }

package/packages/dd-trace/src/exporters/common/request.js

@@ -11,10 +11,10 @@ const { storage } = require('../../../../datadog-core')
 const log = require('../../log')
 
 const keepAlive = true
-const maxTotalSockets = 1
+const maxSockets = 1
 const maxActiveRequests = 8
-const httpAgent = new http.Agent({ keepAlive, maxTotalSockets })
-const httpsAgent = new https.Agent({ keepAlive, maxTotalSockets })
+const httpAgent = new http.Agent({ keepAlive, maxSockets })
+const httpsAgent = new https.Agent({ keepAlive, maxSockets })
 const containerId = docker.id()
 
 let activeRequests = 0

package/packages/dd-trace/src/opentracing/span.js

@@ -44,6 +44,9 @@ class DatadogSpan {
       metrics.increment('runtime.node.spans.unfinished')
       metrics.increment('runtime.node.spans.unfinished.by.name', `span_name:${operationName}`)
 
+      metrics.increment('runtime.node.spans.open') // unfinished for real
+      metrics.increment('runtime.node.spans.open.by.name', `span_name:${operationName}`)
+
       unfinishedRegistry.register(this, operationName, this)
     }
   }
@@ -121,6 +124,9 @@ class DatadogSpan {
       metrics.increment('runtime.node.spans.finished')
       metrics.increment('runtime.node.spans.finished.by.name', `span_name:${this._name}`)
 
+      metrics.decrement('runtime.node.spans.open') // unfinished for real
+      metrics.decrement('runtime.node.spans.open.by.name', `span_name:${this._name}`)
+
       unfinishedRegistry.unregister(this)
       finishedRegistry.register(this, this._name)
     }

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

@@ -7,6 +7,7 @@ module.exports = {
   get '@google-cloud/pubsub' () { return require('../../../datadog-plugin-google-cloud-pubsub/src') },
   get '@grpc/grpc-js' () { return require('../../../datadog-plugin-grpc/src') },
   get '@hapi/hapi' () { return require('../../../datadog-plugin-hapi/src') },
+  get '@jest/core' () { return require('../../../datadog-plugin-jest/src') },
   get '@koa/router' () { return require('../../../datadog-plugin-koa/src') },
   get '@node-redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get 'amqp10' () { return require('../../../datadog-plugin-amqp10/src') },
@@ -29,6 +30,8 @@ module.exports = {
   get 'http2' () { return require('../../../datadog-plugin-http2/src') },
   get 'https' () { return require('../../../datadog-plugin-http/src') },
   get 'ioredis' () { return require('../../../datadog-plugin-ioredis/src') },
+  get 'jest-circus' () { return require('../../../datadog-plugin-jest/src') },
+  get 'jest-config' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-environment-node' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-environment-jsdom' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-jasmine2' () { return require('../../../datadog-plugin-jest/src') },

package/packages/dd-trace/src/plugins/util/ip_blocklist.js

@@ -7,19 +7,45 @@ if (semver.satisfies(process.version, '>=14.18.0')) {
 
   module.exports = net.BlockList
 } else {
-  const CIDRMatcher = require('cidr-matcher')
+  const ipaddr = require('ipaddr.js')
 
   module.exports = class BlockList {
     constructor () {
-      this.matcher = new CIDRMatcher()
+      this.v4Ranges = []
+      this.v6Ranges = []
     }
 
     addSubnet (net, prefix, type) {
-      this.matcher.addNetworkClass(`${net}/${prefix}`)
+      this[type === 'ipv4' ? 'v4Ranges' : 'v6Ranges'].push(ipaddr.parseCIDR(`${net}/${prefix}`))
     }
 
     check (address, type) {
-      return this.matcher.contains(address)
+      try {
+        let ip = ipaddr.parse(address)
+
+        type = ip.kind()
+
+        if (type === 'ipv6') {
+          for (const range of this.v6Ranges) {
+            if (ip.match(range)) return true
+          }
+
+          if (ip.isIPv4MappedAddress()) {
+            ip = ip.toIPv4Address()
+            type = ip.kind()
+          }
+        }
+
+        if (type === 'ipv4') {
+          for (const range of this.v4Ranges) {
+            if (ip.match(range)) return true
+          }
+        }
+
+        return false
+      } catch {
+        return false
+      }
     }
   }
 }

package/packages/dd-trace/src/plugins/util/redis.js

@@ -1,74 +0,0 @@
-'use strict'
-
-const analyticsSampler = require('../../analytics_sampler')
-const urlFilter = require('../util/urlfilter')
-const tx = require('./tx')
-
-const redis = {
-  // Ensure the configuration has the correct structure and defaults.
-  normalizeConfig (config) {
-    const filter = urlFilter.getFilter(config)
-
-    return Object.assign({}, config, {
-      filter
-    })
-  },
-
-  // Start a span for a Redis command.
-  instrument (tracer, config, db, command, args) {
-    const childOf = tracer.scope().active()
-    const span = tracer.startSpan('redis.command', {
-      childOf,
-      tags: {
-        'span.kind': 'client',
-        'resource.name': command,
-        'span.type': 'redis',
-        'db.type': 'redis',
-        'db.name': db || '0',
-        'redis.raw_command': formatCommand(command, args)
-      }
-    })
-
-    span.setTag('service.name', config.service || `${span.context()._tags['service.name']}-redis`)
-
-    analyticsSampler.sample(span, config.measured)
-
-    return span
-  }
-}
-
-function formatCommand (command, args) {
-  command = command.toUpperCase()
-
-  if (!args || command === 'AUTH') return command
-
-  for (let i = 0, l = args.length; i < l; i++) {
-    if (typeof args[i] === 'function') continue
-
-    command = `${command} ${formatArg(args[i])}`
-
-    if (command.length > 1000) return trim(command, 1000)
-  }
-
-  return command
-}
-
-function formatArg (arg) {
-  switch (typeof arg) {
-    case 'string':
-    case 'number':
-      return trim(String(arg), 100)
-    default:
-      return '?'
-  }
-}
-
-function trim (str, maxlen) {
-  if (str.length > maxlen) {
-    str = str.substr(0, maxlen - 3) + '...'
-  }
-
-  return str
-}
-
-module.exports = Object.assign({}, tx, redis)

package/packages/dd-trace/src/plugins/util/tx.js

@@ -1,75 +0,0 @@
-'use strict'
-
-const tx = {
-  // Set the outgoing host.
-  setHost (span, hostname, port) {
-    hostname && span.setTag('out.host', hostname)
-    port && span.setTag('out.port', port)
-  },
-
-  // Wrap a promise or a callback to also finish the span.
-  wrap (span, done) {
-    if (typeof done === 'function' || !done) {
-      return wrapCallback(span, done)
-    } else if (isPromise(done)) {
-      return wrapPromise(span, done)
-    } else if (done && done.length) {
-      return wrapArguments(span, done)
-    }
-  }
-}
-
-function wrapCallback (span, callback) {
-  const scope = span.tracer().scope()
-  const previous = scope.active()
-
-  return function (err) {
-    finish(span, err)
-
-    if (callback) {
-      return scope.activate(previous, () => callback.apply(this, arguments))
-    }
-  }
-}
-
-function wrapPromise (span, promise) {
-  promise.then(
-    () => finish(span),
-    err => finish(span, err)
-  )
-
-  return promise
-}
-
-function wrapArguments (span, args) {
-  const lastIndex = args.length - 1
-  const callback = args[lastIndex]
-
-  if (typeof callback === 'function') {
-    args[lastIndex] = wrapCallback(span, args[lastIndex])
-  }
-
-  return args
-}
-
-function finish (span, error) {
-  if (error) {
-    span.addTags({
-      'error.type': error.name,
-      'error.msg': error.message,
-      'error.stack': error.stack
-    })
-  }
-
-  span.finish()
-}
-
-function isPromise (obj) {
-  return isObject(obj) && typeof obj.then === 'function'
-}
-
-function isObject (obj) {
-  return typeof obj === 'object' && obj !== null
-}
-
-module.exports = tx