dd-trace 0.36.1 → 0.36.5

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

@@ -1,5 +1,7 @@
 'use strict'
 
+// TODO: either instrument all or none of the render functions
+
 function createWrapHandleRequest (tracer, config) {
   return function wrapHandleRequest (handleRequest) {
     return function handleRequestWithTrace (req, res, pathname, query) {
@@ -28,6 +30,22 @@ function createWrapHandleApiRequest (tracer, config) {
   }
 }
 
+function createWrapRenderToResponse (tracer, config) {
+  return function wrapRenderToResponse (renderToResponse) {
+    return function renderToResponseWithTrace (ctx) {
+      return trace(tracer, config, ctx.req, ctx.res, () => renderToResponse.apply(this, arguments))
+    }
+  }
+}
+
+function createWrapRenderErrorToResponse (tracer, config) {
+  return function wrapRenderErrorToResponse (renderErrorToResponse) {
+    return function renderErrorToResponseWithTrace (ctx) {
+      return trace(tracer, config, ctx.req, ctx.res, () => renderErrorToResponse.apply(this, arguments))
+    }
+  }
+}
+
 function createWrapRenderToHTML (tracer, config) {
   return function wrapRenderToHTML (renderToHTML) {
     return function renderToHTMLWithTrace (req, res, pathname, query, parsedUrl) {
@@ -36,12 +54,26 @@ function createWrapRenderToHTML (tracer, config) {
   }
 }
 
-function createWrapRenderToHTMLWithComponents (tracer, config) {
-  return function wrapHandleRenderToHTMLWithComponents (renderToHTMLWithComponents) {
-    return function renderToHTMLWithComponentsWithTrace (req, res, page) {
-      addPage(req, page)
+function createWrapRenderErrorToHTML (tracer, config) {
+  return function wrapRenderErrorToHTML (renderErrorToHTML) {
+    return function renderErrorToHTMLWithTrace (err, req, res, pathname, query) {
+      return trace(tracer, config, req, res, () => renderErrorToHTML.apply(this, arguments))
+    }
+  }
+}
 
-      return renderToHTMLWithComponents.apply(this, arguments)
+function createWrapFindPageComponents (tracer, config) {
+  return function wrapFindPageComponents (findPageComponents) {
+    return function findPageComponentsWithTrace (pathname, query) {
+      const result = findPageComponents.apply(this, arguments)
+      const span = tracer.scope().active()
+      const req = span && span._nextReq
+
+      if (result) {
+        addPage(req, pathname)
+      }
+
+      return result
     }
   }
 }
@@ -75,6 +107,10 @@ function trace (tracer, config, req, res, handler) {
 
   const promise = scope.activate(span, handler)
 
+  // HACK: Store the request object on the span for findPageComponents.
+  // TODO: Use CLS when it will be available in core.
+  span._nextReq = req
+
   promise.then(() => finish(span, config, req, res), err => {
     span.setTag('error', err)
     finish(span, config, req, res)
@@ -84,6 +120,8 @@ function trace (tracer, config, req, res, handler) {
 }
 
 function addPage (req, page) {
+  if (!req || !req._datadog_next) return
+
   req._datadog_next.span.addTags({
     'resource.name': `${req.method} ${page}`.trim(),
     'next.page': page
@@ -114,7 +152,7 @@ function getHooks (config) {
 module.exports = [
   {
     name: 'next',
-    versions: ['>=9.5'],
+    versions: ['>=9.5 <11.1'],
     file: 'dist/next-server/server/next-server.js',
     patch ({ default: Server }, tracer, config) {
       config = normalizeConfig(config)
@@ -122,13 +160,37 @@ module.exports = [
       this.wrap(Server.prototype, 'handleRequest', createWrapHandleRequest(tracer, config))
       this.wrap(Server.prototype, 'handleApiRequest', createWrapHandleApiRequest(tracer, config))
       this.wrap(Server.prototype, 'renderToHTML', createWrapRenderToHTML(tracer, config))
-      this.wrap(Server.prototype, 'renderToHTMLWithComponents', createWrapRenderToHTMLWithComponents(tracer, config))
+      this.wrap(Server.prototype, 'renderErrorToHTML', createWrapRenderErrorToHTML(tracer, config))
+      this.wrap(Server.prototype, 'findPageComponents', createWrapFindPageComponents(tracer, config))
     },
     unpatch ({ default: Server }) {
       this.unwrap(Server.prototype, 'handleRequest')
       this.unwrap(Server.prototype, 'handleApiRequest')
       this.unwrap(Server.prototype, 'renderToHTML')
-      this.unwrap(Server.prototype, 'renderToHTMLWithComponents')
+      this.unwrap(Server.prototype, 'renderErrorToHTML')
+      this.unwrap(Server.prototype, 'findPageComponents')
+    }
+  },
+
+  {
+    name: 'next',
+    versions: ['>=11.1'],
+    file: 'dist/server/next-server.js',
+    patch ({ default: Server }, tracer, config) {
+      config = normalizeConfig(config)
+
+      this.wrap(Server.prototype, 'handleRequest', createWrapHandleRequest(tracer, config))
+      this.wrap(Server.prototype, 'handleApiRequest', createWrapHandleApiRequest(tracer, config))
+      this.wrap(Server.prototype, 'renderToResponse', createWrapRenderToResponse(tracer, config))
+      this.wrap(Server.prototype, 'renderErrorToResponse', createWrapRenderErrorToResponse(tracer, config))
+      this.wrap(Server.prototype, 'findPageComponents', createWrapFindPageComponents(tracer, config))
+    },
+    unpatch ({ default: Server }) {
+      this.unwrap(Server.prototype, 'handleRequest')
+      this.unwrap(Server.prototype, 'handleApiRequest')
+      this.unwrap(Server.prototype, 'renderToResponse')
+      this.unwrap(Server.prototype, 'renderErrorToResponse')
+      this.unwrap(Server.prototype, 'findPageComponents')
     }
   }
 ]

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

@@ -5,8 +5,6 @@ const Kinds = require('../../../ext/kinds')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 const tx = require('../../dd-trace/src/plugins/util/tx')
 
-const procnameRegex = /^sp_[a-z]+$/
-
 function createWrapMakeRequest (tracer, config) {
   return function wrapMakeRequest (makeRequest) {
     return function makeRequestWithTrace (request) {
@@ -33,7 +31,6 @@ function createWrapMakeRequest (tracer, config) {
 
       addConnectionTags(span, connectionConfig)
       addDatabaseTags(span, connectionConfig)
-      addProcIdTags(span, request)
 
       analyticsSampler.sample(span, config.analytics)
       request.callback = tx.wrap(span, request.callback)
@@ -77,11 +74,6 @@ function addDatabaseTags (span, connectionConfig) {
   span.setTag('db.instance', connectionConfig.options.instanceName)
 }
 
-function addProcIdTags (span, request) {
-  if (!procnameRegex.test(request.sqlTextOrProcedure)) return
-  span.setTag('tds.proc.name', request.sqlTextOrProcedure)
-}
-
 module.exports = [
   {
     name: 'tedious',

package/packages/dd-trace/lib/version.js

@@ -1 +1 @@
-module.exports = '0.36.1'
+module.exports = '0.36.5'

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

@@ -1,7 +1,8 @@
 'use strict'
 
-const dgram = require('dgram')
 const lookup = require('dns').lookup // cache to avoid instrumentation
+const dgram = require('dgram')
+const isIP = require('net').isIP
 const log = require('./log')
 
 const MAX_BUFFER_SIZE = 1024 // limit from the agent
@@ -11,6 +12,7 @@ class Client {
     options = options || {}
 
     this._host = options.host || 'localhost'
+    this._family = isIP(this._host)
     this._port = options.port || 8125
     this._prefix = options.prefix || ''
     this._tags = options.tags || []
@@ -36,11 +38,14 @@ class Client {
 
     this._queue = []
 
-    lookup(this._host, (err, address, family) => {
-      if (err) return log.error(err)
-
-      queue.forEach(buffer => this._send(address, family, buffer))
-    })
+    if (this._family !== 0) {
+      this._sendAll(queue, this._host, this._family)
+    } else {
+      lookup(this._host, (err, address, family) => {
+        if (err) return log.error(err)
+        this._sendAll(queue, address, family)
+      })
+    }
   }
 
   _send (address, family, buffer) {
@@ -51,6 +56,10 @@ class Client {
     socket.send(buffer, 0, buffer.length, this._port, address)
   }
 
+  _sendAll (queue, address, family) {
+    queue.forEach((buffer) => this._send(address, family, buffer))
+  }
+
   _add (stat, value, type, tags) {
     const message = `${this._prefix + stat}:${value}|${type}`
 

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

@@ -1,15 +1,9 @@
 'use strict'
 
-const hdr = require('hdr-histogram-js')
-
-const highestTrackableValue = 3.6e12 // 1 hour
+const { DDSketch } = require('@datadog/sketches-js')
 
 class Histogram {
   constructor () {
-    this._histogram = hdr.build({
-      highestTrackableValue
-    })
-
     this.reset()
   }
 
@@ -22,7 +16,7 @@ class Histogram {
   get p95 () { return this.percentile(95) }
 
   percentile (percentile) {
-    return this._histogram.getValueAtPercentile(percentile)
+    return this._histogram.getValueAtQuantile(percentile / 100) || 0
   }
 
   record (value) {
@@ -36,7 +30,7 @@ class Histogram {
     this._count++
     this._sum += value
 
-    this._histogram.recordValue(value)
+    this._histogram.accept(value)
   }
 
   reset () {
@@ -45,7 +39,7 @@ class Histogram {
     this._sum = 0
     this._count = 0
 
-    this._histogram.reset()
+    this._histogram = new DDSketch()
   }
 }
 

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

@@ -302,6 +302,7 @@ function addAllowHeaders (req, headers) {
   const allowHeaders = splitHeader(headers['access-control-allow-headers'])
   const requestHeaders = splitHeader(req.headers['access-control-request-headers'])
   const contextHeaders = [
+    'x-datadog-origin',
     'x-datadog-parent-id',
     'x-datadog-sampled',
     'x-datadog-sampling-priority',

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

@@ -6,7 +6,6 @@ const DatadogTracer = require('./tracer')
 const Config = require('./config')
 const Instrumenter = require('./instrumenter')
 const metrics = require('./metrics')
-const profiler = require('./profiler')
 const log = require('./log')
 const { setStartupLogInstrumenter } = require('./startup-log')
 const analyticsSampler = require('./analytics_sampler')
@@ -33,7 +32,15 @@ class Tracer extends BaseTracer {
         log.use(config.logger)
         log.toggle(config.debug, config.logLevel, this)
 
-        profiler.start(config)
+        if (config.hasOwnProperty('profiling') && config.profiling.enabled) {
+          // do not stop tracer initialization if the profiler fails to be imported
+          try {
+            const profiler = require('./profiler')
+            profiler.start(config)
+          } catch (e) {
+            log.error(e)
+          }
+        }
 
         if (config.enabled) {
           if (config.runtimeMetrics) {

package/scripts/check_licenses.js

@@ -6,13 +6,16 @@ const readline = require('readline')
 const pkg = require(path.join(__dirname, '..', '/package.json'))
 
 const filePath = path.join(__dirname, '..', '/LICENSE-3rdparty.csv')
-const deps = Object.keys(pkg.dependencies || {})
-  .concat(Object.keys(pkg.devDependencies || {}))
-  .concat(Object.keys(pkg.optionalDependencies || {}))
-  .sort()
+const deps = new Set(Object.keys(pkg.dependencies || {}))
+const devDeps = new Set(Object.keys(pkg.devDependencies || {}))
 
 let index = 0
-const licenses = []
+
+const licenses = {
+  require: new Set(),
+  dev: new Set(),
+  file: new Set()
+}
 
 const lineReader = readline.createInterface({
   input: fs.createReadStream(filePath)
@@ -24,25 +27,43 @@ lineReader.on('line', line => {
     const type = columns[0]
     const license = columns[1]
 
-    if (type === 'require' || type === 'dev') {
-      licenses.push(license)
-    }
+    licenses[type].add(license)
   }
 
   index++
 })
 
 lineReader.on('close', () => {
+  if (!checkLicenses(deps, 'require') || !checkLicenses(devDeps, 'dev')) {
+    process.exit(1)
+  }
+})
+
+function checkLicenses (typeDeps, type) {
   /* eslint-disable no-console */
 
-  if (JSON.stringify(deps) !== JSON.stringify(licenses.sort())) {
-    console.log('Dependencies:')
-    console.log(deps.join(','))
-    console.log()
-    console.log('Licenses:')
-    console.log(licenses.join(','))
-    console.log()
+  const missing = []
+  const extraneous = []
 
-    throw new Error(`Dependencies and 3rd party licenses mismatch`)
+  for (const dep of typeDeps) {
+    if (!licenses[type].has(dep)) {
+      missing.push(dep)
+    }
   }
-})
+
+  for (const dep of licenses[type]) {
+    if (!typeDeps.has(dep)) {
+      extraneous.push(dep)
+    }
+  }
+
+  if (missing.length) {
+    console.log(`Missing 3rd-party license for ${missing.join(', ')}.`)
+  }
+
+  if (extraneous.length) {
+    console.log(`Extraneous 3rd-party license for ${extraneous.join(', ')}.`)
+  }
+
+  return missing.length === 0 && extraneous.length === 0
+}

package/scripts/postpublish.js

@@ -4,8 +4,21 @@ const exec = require('./helpers/exec')
 
 const pkg = require('../package.json')
 
-const betaExpr = /\d+\.\d+\.\d+-beta\.\d+/
+const betaExpr = /\d+\.\d+\.\d+-.*/
+const legacyExpr = /0\.\d+\.\d+/
 
-if (!betaExpr.test(pkg.version)) {
-  exec(`node scripts/publish_docs.js "v${pkg.version}"`)
+if (!betaExpr.test(pkg.version) && !legacyExpr.test(pkg.version)) {
+  const releaseBranches = exec.pipe('git fetch && git branch -a | grep -E "/v\\d+\\.x"')
+    .trim()
+    .split(/\s+/)
+  const releaseMajors = releaseBranches
+    .map(branch => parseInt(branch.replace(/[^0-9]/g, '')))
+    .sort()
+    .reverse()
+  const latestMajor = releaseMajors[0]
+  const currentMajor = parseInt(pkg.version.split('.')[0])
+
+  if (currentMajor === latestMajor) {
+    exec(`node scripts/publish_docs.js "v${pkg.version}"`)
+  }
 }

package/scripts/prebuilds.js

@@ -50,7 +50,7 @@ function validatePrebuilds () {
           const content = fs.readFileSync(path.join('prebuilds', platform, file))
           const sum = fs.readFileSync(path.join('prebuilds', platform, `${file}.sha1`), 'ascii')
 
-          if (sum !== checksum(content)) {
+          if (sum !== checksum(content, { algorithm: 'sha256' })) {
             throw new Error(`Invalid checksum for "prebuilds/${platform}/${file}".`)
           }
         })
@@ -62,7 +62,7 @@ function validatePrebuilds () {
 
 function createChecksum () {
   const file = path.join(os.tmpdir(), 'prebuilds.tgz')
-  const sum = checksum(fs.readFileSync(file))
+  const sum = checksum(fs.readFileSync(file), { algorithm: 'sha256' })
 
   fs.writeFileSync(`${file}.sha1`, sum)
 }

package/scripts/prepublish.js

@@ -145,7 +145,7 @@ function validatePrebuilds () {
   const content = fs.readFileSync(file)
   const sum = fs.readFileSync(path.join(`${file}.sha1`), 'ascii')
 
-  if (sum !== checksum(content)) {
+  if (sum !== checksum(content, { algorithm: 'sha256' })) {
     throw new Error('Invalid checksum for "prebuilds.tgz".')
   }
 }

package/scripts/version.js

@@ -8,30 +8,39 @@ const title = require('./helpers/title')
 
 const pkg = require('../package.json')
 const increment = getIncrement()
-const version = semver.inc(pkg.version, increment)
-const branch = `v${semver.major(version)}.${semver.minor(version)}`
-const tag = `v${version}`
-const isNewBranch = semver.major(pkg.version) !== semver.major(version) ||
-  semver.minor(pkg.version) !== semver.minor(version)
-
-title(`Bumping version to v${version} in a new branch`)
-
-pkg.version = version
-
-if (isNewBranch) {
-  exec(`git pull`)
-  exec(`git checkout -b ${branch}`)
-} else {
-  exec(`git checkout ${branch}`)
-  exec('git pull')
+const version = semver.inc(pkg.version, increment, 'pre')
+
+title(`Bumping version to v${version}.`)
+
+const currentBranch = exec.pipe(`git branch --show-current`)
+
+if (currentBranch === 'master') {
+  const major = semver.major(pkg.version)
+  const nextMajor = semver.major(pkg.version) + 1
+
+  exec(`git checkout -b v${major}.x`)
+  exec(`git push -u origin HEAD`)
+
+  bump(`${nextMajor}.0.0-pre`)
+
+  exec(`git checkout v${major}.x`)
 }
 
-write('package.json', JSON.stringify(pkg, null, 2) + '\n')
-write('packages/dd-trace/lib/version.js', `module.exports = '${version}'\n`)
-add('package.json')
-add('packages/dd-trace/lib/version.js')
-exec(`git commit -m "${tag}"`)
-exec(`git push -u origin HEAD`)
+bump(version)
+
+exec(`git checkout ${currentBranch}`)
+
+function bump (newVersion) {
+  pkg.version = newVersion
+
+  exec(`git checkout -b v${newVersion}-bump`)
+  write('package.json', JSON.stringify(pkg, null, 2) + '\n')
+  write('packages/dd-trace/lib/version.js', `module.exports = '${newVersion}'\n`)
+  add('package.json')
+  add('packages/dd-trace/lib/version.js')
+  exec(`git commit -m "v${newVersion}"`)
+  exec(`git push -u origin HEAD`)
+}
 
 function getIncrement () {
   const increments = ['major', 'premajor', 'minor', 'preminor', 'patch', 'prepatch', 'prerelease']

package/NOTICE

@@ -1,4 +0,0 @@
-Datadog dd-trace-js
-Copyright 2016-Present Datadog, Inc.
-
-This product includes software developed at Datadog, Inc. (https://www.datadoghq.com/).

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

@@ -1,18 +0,0 @@
-const path = require('path')
-const nativeMetrics = require('node-gyp-build')(path.join(__dirname, '..', '..', '..'))
-const workerThreads = require('worker_threads')
-
-const INTERVAL = 1 * 1000
-
-if (workerThreads.isMainThread) {
-  nativeMetrics.start()
-  const worker = new workerThreads.Worker(__filename)
-  setInterval(() => {
-    console.log(require('v8').getHeapSpaceStatistics()[0])
-  }, INTERVAL)
-} else {
-  setInterval(() => {
-    const stats = nativeMetrics.stats()
-    console.log(stats.heap.spaces)
-  }, INTERVAL)
-}