dd-trace 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -56,13 +56,13 @@
     "node": ">=12"
   },
   "dependencies": {
-    "@datadog/native-metrics": "^1.0.0",
-    "@datadog/pprof": "^0.1.3",
+    "@datadog/native-metrics": "^1.0.1",
+    "@datadog/pprof": "^0.3.0",
     "@datadog/sketches-js": "^1.0.4",
     "@types/node": "^10.12.18",
     "crypto-randomuuid": "^1.0.0",
     "form-data": "^3.0.0",
-    "import-in-the-middle": "^1.1.1",
+    "import-in-the-middle": "^1.1.2",
     "koalas": "^1.0.2",
     "limiter": "^1.1.4",
     "lodash.kebabcase": "^4.1.1",

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

@@ -9,20 +9,17 @@ let tools
 function createWrapExecute (tracer, config, defaultFieldResolver) {
   return function wrapExecute (execute) {
     return function executeWithTrace () {
-      const args = normalizeArgs(arguments)
+      const args = normalizeArgs(arguments, tracer, config, defaultFieldResolver)
       const schema = args.schema
       const document = args.document
       const source = document && document._datadog_source
-      const fieldResolver = args.fieldResolver || defaultFieldResolver
-      const contextValue = args.contextValue = args.contextValue || {}
+      const contextValue = args.contextValue
       const operation = getOperation(document, args.operationName)
 
       if (contextValue._datadog_graphql) {
         return execute.apply(this, arguments)
       }
 
-      args.fieldResolver = wrapResolve(fieldResolver, tracer, config)
-
       if (schema) {
         wrapFields(schema._queryType, tracer, config)
         wrapFields(schema._mutationType, tracer, config)
@@ -32,7 +29,7 @@ function createWrapExecute (tracer, config, defaultFieldResolver) {
 
       contextValue._datadog_graphql = { source, span, fields: {} }
 
-      return call(execute, span, this, [args], (err, res) => {
+      return call(execute, span, this, arguments, (err, res) => {
         finishResolvers(contextValue, config)
 
         setError(span, err || (res && res.errors && res.errors[0]))
@@ -212,10 +209,19 @@ function getField (contextValue, path) {
   return contextValue._datadog_graphql.fields[path.join('.')]
 }
 
-function normalizeArgs (args) {
-  if (args.length === 1) {
-    return args[0]
-  }
+function normalizeArgs (args, tracer, config, defaultFieldResolver) {
+  if (args.length !== 1) return normalizePositional(args, tracer, config, defaultFieldResolver)
+
+  args[0].contextValue = args[0].contextValue || {}
+  args[0].fieldResolver = wrapResolve(args[0].fieldResolver || defaultFieldResolver, tracer, config)
+
+  return args[0]
+}
+
+function normalizePositional (args, tracer, config, defaultFieldResolver) {
+  args[3] = args[3] || {} // contextValue
+  args[6] = wrapResolve(args[6] || defaultFieldResolver, tracer, config) // fieldResolver
+  args.length = Math.max(args.length, 7)
 
   return {
     schema: args[0],

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

@@ -48,7 +48,7 @@ function createWrapMakeClientConstructor (tracer, config) {
 function wrapPackageDefinition (tracer, config, def) {
   for (const name in def) {
     if (def[name].format) continue
-    if (def[name].service) {
+    if (def[name].service && def[name].prototype) {
       wrapClientConstructor(tracer, config, def[name], def[name].service)
     } else {
       wrapPackageDefinition(tracer, config, def[name])

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

@@ -38,6 +38,12 @@ function getTestSpanMetadata (tracer, test, sourceRoot) {
 function createWrapRunTest (tracer, testEnvironmentMetadata, sourceRoot) {
   return function wrapRunTest (runTest) {
     return async function runTestWithTrace () {
+      // `runTest` is rerun when retries are configured through `this.retries` and the test fails.
+      // This clause prevents rewrapping `this.test.fn` when it has already been wrapped.
+      if (this.test._currentRetry !== undefined && this.test._currentRetry !== 0) {
+        return runTest.apply(this, arguments)
+      }
+
       let specFunction = this.test.fn
       if (specFunction.length) {
         specFunction = promisify(specFunction)

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

@@ -1 +1 @@
-module.exports = '1.5.0'
+module.exports = '1.5.1'

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

@@ -61,13 +61,15 @@ class AgentEncoder {
     this._encodeArrayPrefix(bytes, trace)
 
     for (const span of trace) {
+      bytes.reserve(1)
+
       if (span.type) {
-        bytes.push(0x8c)
+        bytes.buffer[bytes.length++] = 0x8c
 
         this._encodeString(bytes, 'type')
         this._encodeString(bytes, span.type)
       } else {
-        bytes.push(0x8b)
+        bytes.buffer[bytes.length++] = 0x8b
       }
 
       this._encodeString(bytes, 'trace_id')
@@ -107,52 +109,105 @@ class AgentEncoder {
 
   _encodeArrayPrefix (bytes, value) {
     const length = value.length
+    const buffer = bytes.buffer
+    const offset = bytes.length
+
+    bytes.reserve(5)
+    bytes.length += 5
 
-    bytes.push(0xdd, length >> 24, length >> 16, length >> 8, length)
+    buffer[offset] = 0xdd
+    buffer[offset + 1] = length >> 24
+    buffer[offset + 2] = length >> 16
+    buffer[offset + 3] = length >> 8
+    buffer[offset + 4] = length
   }
 
   _encodeByte (bytes, value) {
-    bytes.push(value)
+    const buffer = bytes.buffer
+
+    bytes.reserve(1)
+
+    buffer[bytes.length++] = value
   }
 
   _encodeId (bytes, id) {
+    const buffer = bytes.buffer
+    const offset = bytes.length
+
+    bytes.reserve(9)
+    bytes.length += 9
+
     id = id.toArray()
-    bytes.push(0xcf, id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7])
+
+    buffer[offset] = 0xcf
+    buffer[offset + 1] = id[0]
+    buffer[offset + 2] = id[1]
+    buffer[offset + 3] = id[2]
+    buffer[offset + 4] = id[3]
+    buffer[offset + 5] = id[4]
+    buffer[offset + 6] = id[5]
+    buffer[offset + 7] = id[6]
+    buffer[offset + 8] = id[7]
   }
 
   _encodeInteger (bytes, value) {
-    bytes.push(0xce, value >> 24, value >> 16, value >> 8, value)
+    const buffer = bytes.buffer
+    const offset = bytes.length
+
+    bytes.reserve(5)
+    bytes.length += 5
+
+    buffer[offset] = 0xce
+    buffer[offset + 1] = value >> 24
+    buffer[offset + 2] = value >> 16
+    buffer[offset + 3] = value >> 8
+    buffer[offset + 4] = value
   }
 
   _encodeLong (bytes, value) {
+    const buffer = bytes.buffer
+    const offset = bytes.length
     const hi = (value / Math.pow(2, 32)) >> 0
     const lo = value >>> 0
 
-    bytes.push(0xcf, hi >> 24, hi >> 16, hi >> 8, hi, lo >> 24, lo >> 16, lo >> 8, lo)
+    bytes.reserve(9)
+    bytes.length += 9
+
+    buffer[offset] = 0xcf
+    buffer[offset + 1] = hi >> 24
+    buffer[offset + 2] = hi >> 16
+    buffer[offset + 3] = hi >> 8
+    buffer[offset + 4] = hi
+    buffer[offset + 5] = lo >> 24
+    buffer[offset + 6] = lo >> 16
+    buffer[offset + 7] = lo >> 8
+    buffer[offset + 8] = lo
   }
 
   _encodeMap (bytes, value) {
-    const keys = []
-    const allKeys = Object.keys(value)
+    const keys = Object.keys(value)
+    const buffer = bytes.buffer
+    const offset = bytes.length
 
-    let key = ''
+    bytes.reserve(5)
+    bytes.length += 5
 
-    for (let i = 0, l = allKeys.length; i < l; i++) {
-      key = allKeys[i]
-      if (typeof value[key] !== 'function') {
-        keys.push(key)
-      }
-    }
+    let length = 0
 
-    const length = keys.length
+    for (const key of keys) {
+      if (typeof value[key] !== 'string' && typeof value[key] !== 'number') return
 
-    bytes.push(0xdf, length >> 24, length >> 16, length >> 8, length)
+      length++
 
-    for (let i = 0; i < length; i++) {
-      key = keys[i]
       this._encodeString(bytes, key)
       this._encodeValue(bytes, value[key])
     }
+
+    buffer[offset] = 0xdf
+    buffer[offset + 1] = length >> 24
+    buffer[offset + 2] = length >> 16
+    buffer[offset + 3] = length >> 8
+    buffer[offset + 4] = length
   }
 
   _encodeValue (bytes, value) {
@@ -179,15 +234,21 @@ class AgentEncoder {
   _encodeFloat (bytes, value) {
     float64Array[0] = value
 
-    bytes.push(0xcb)
+    const buffer = bytes.buffer
+    const offset = bytes.length
+
+    bytes.reserve(9)
+    bytes.length += 9
+
+    buffer[offset] = 0xcb
 
     if (bigEndian) {
       for (let i = 0; i <= 7; i++) {
-        bytes.push(uInt8Float64Array[i])
+        buffer[offset + i + 1] = uInt8Float64Array[i]
       }
     } else {
       for (let i = 7; i >= 0; i--) {
-        bytes.push(uInt8Float64Array[i])
+        buffer[bytes.length - i - 1] = uInt8Float64Array[i]
       }
     }
   }

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

@@ -14,26 +14,24 @@ class Chunk {
     this._minSize = minSize
   }
 
-  push (...bytes) {
-    this._reserve(bytes.length)
-
-    for (const byte of bytes) {
-      this.buffer[this.length++] = byte
-    }
-  }
-
   write (value) {
     const length = Buffer.byteLength(value)
     const offset = this.length
 
     if (length < 0x20) { // fixstr
-      this.push(length | 0xa0)
+      this.reserve(length + 1)
+      this.length += 1
+      this.buffer[offset] = length | 0xa0
     } else if (length < 0x100000000) { // str 32
-      this.push(0xdb, length >> 24, length >> 16, length >> 8, length)
+      this.reserve(length + 5)
+      this.length += 5
+      this.buffer[offset] = 0xdb
+      this.buffer[offset + 1] = length >> 24
+      this.buffer[offset + 2] = length >> 16
+      this.buffer[offset + 3] = length >> 8
+      this.buffer[offset + 4] = length
     }
 
-    this._reserve(length)
-
     this.length += this.buffer.utf8Write(value, this.length, length)
 
     return this.length - offset
@@ -44,13 +42,13 @@ class Chunk {
   }
 
   set (array) {
-    this._reserve(array.length)
+    this.reserve(array.length)
 
     this.buffer.set(array, this.length)
     this.length += array.length
   }
 
-  _reserve (size) {
+  reserve (size) {
     if (this.length + size > this.buffer.length) {
       this._resize(this._minSize * Math.ceil((this.length + size) / this._minSize))
     }

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

@@ -1,17 +1,17 @@
 'use strict'
 
-const { randomBytes } = require('crypto')
+const { randomFillSync } = require('crypto')
 
 const UINT_MAX = 4294967296
 
+const data = new Uint8Array(8 * 8192)
 const zeroId = new Uint8Array(8)
 
-// Cryptographically secure local seeds to mitigate Math.random() seed reuse.
-const seed = new Uint32Array(randomBytes(8).buffer)
-
 const map = Array.prototype.map
 const pad = byte => `${byte < 16 ? '0' : ''}${byte.toString(16)}`
 
+let batch = 0
+
 // Internal representation of a trace or span ID.
 class Identifier {
   constructor (value, radix) {
@@ -36,7 +36,7 @@ class Identifier {
     if (this._buffer.length === 8) {
       return this._buffer
     }
-    return this._buffer.subarray(-8)
+    return this._buffer.slice(-8)
   }
 
   toJSON () {
@@ -50,7 +50,7 @@ function createBuffer (value) {
   if (!value) return pseudoRandom()
 
   const size = Math.ceil(value.length / 2)
-  const buffer = new Uint8Array(size)
+  const buffer = new Array(size)
 
   for (let i = 0; i < size; i++) {
     buffer[i] = parseInt(value.substring(i * 2, i * 2 + 2), 16)
@@ -61,7 +61,7 @@ function createBuffer (value) {
 
 // Convert a numerical string to a buffer using the specified radix.
 function fromString (str, raddix) {
-  const buffer = new Uint8Array(8)
+  const buffer = new Array(8)
   const len = str.length
 
   let pos = 0
@@ -126,20 +126,24 @@ function toHexString (buffer) {
 
 // Simple pseudo-random 64-bit ID generator.
 function pseudoRandom () {
-  const buffer = new Uint8Array(8)
-
-  const hi = randomUInt32(seed[0]) & 0x7FFFFFFF // only positive int64
-  const lo = randomUInt32(seed[1])
+  if (batch === 0) {
+    randomFillSync(data)
+  }
 
-  writeUInt32BE(buffer, hi, 0)
-  writeUInt32BE(buffer, lo, 4)
+  batch = (batch + 1) % 8192
 
-  return buffer
-}
+  const offset = batch * 8
 
-// Generate a random unsigned 32-bit integer.
-function randomUInt32 (seed) {
-  return seed ^ Math.floor(Math.random() * (0xFFFFFFFF + 1))
+  return [
+    data[offset] & 0x7F, // only positive int64,
+    data[offset + 1],
+    data[offset + 2],
+    data[offset + 3],
+    data[offset + 4],
+    data[offset + 5],
+    data[offset + 6],
+    data[offset + 7]
+  ]
 }
 
 // Read a buffer to unsigned integer bytes.

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

@@ -7,10 +7,10 @@ const Loader = require('./loader')
 const { isTrue } = require('./util')
 const plugins = require('./plugins')
 
-const disabldPlugins = process.env.DD_TRACE_DISABLED_PLUGINS
+const disabledPlugins = process.env.DD_TRACE_DISABLED_PLUGINS
 
 const collectDisabledPlugins = () => {
-  return new Set(disabldPlugins && disabldPlugins.split(',').map(plugin => plugin.trim()))
+  return new Set(disabledPlugins && disabledPlugins.split(',').map(plugin => plugin.trim()))
 }
 
 function cleanEnv (name) {

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

@@ -119,7 +119,10 @@ function getTestParentSpan (tracer) {
  */
 function getTestSuitePath (testSuiteAbsolutePath, sourceRoot) {
   if (!testSuiteAbsolutePath) {
-    return testSuiteAbsolutePath
+    return sourceRoot
   }
-  return path.relative(sourceRoot, testSuiteAbsolutePath).replace(path.sep, '/')
+  const testSuitePath = testSuiteAbsolutePath === sourceRoot
+    ? testSuiteAbsolutePath : path.relative(sourceRoot, testSuiteAbsolutePath)
+
+  return testSuitePath.replace(path.sep, '/')
 }

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

@@ -181,7 +181,7 @@ const web = {
 
   // Extract the parent span from the headers and start a new span as its child
   startChildSpan (tracer, name, headers) {
-    const childOf = tracer.extract(FORMAT_HTTP_HEADERS, headers)
+    const childOf = tracer.scope().active() || tracer.extract(FORMAT_HTTP_HEADERS, headers)
     const span = tracer.startSpan(name, { childOf })
 
     return span

package/packages/dd-trace/src/profiling/exporters/agent.js

@@ -4,9 +4,13 @@ const retry = require('retry')
 const { request } = require('http')
 const FormData = require('form-data')
 
+// TODO: avoid using dd-trace internals. Make this a separate module?
+const docker = require('../../exporters/agent/docker')
 const version = require('../../../lib/version')
 
-function sendRequest (options, body, callback) {
+const containerId = docker.id()
+
+function sendRequest (options, form, callback) {
   const req = request(options, res => {
     if (res.statusCode >= 400) {
       const error = new Error(`HTTP Error ${res.statusCode}`)
@@ -17,7 +21,7 @@ function sendRequest (options, body, callback) {
     }
   })
   req.on('error', callback)
-  if (body) req.write(body)
+  if (form) form.pipe(req)
   req.end()
 }
 
@@ -97,13 +101,16 @@ class AgentExporter {
       })
     }
 
-    const body = form.getBuffer()
     const options = {
       method: 'POST',
       path: '/profiling/v1/input',
       headers: form.getHeaders()
     }
 
+    if (containerId) {
+      options.headers['Datadog-Container-ID'] = containerId
+    }
+
     if (this._url.protocol === 'unix:') {
       options.socketPath = this._url.pathname
     } else {
@@ -125,7 +132,7 @@ class AgentExporter {
 
       operation.attempt((attempt) => {
         const timeout = Math.pow(this._backoffTime, attempt)
-        sendRequest({ ...options, timeout }, body, (err, response) => {
+        sendRequest({ ...options, timeout }, form, (err, response) => {
           if (operation.retry(err)) {
             this._logger.error(`Error from the agent: ${err.message}`)
             return

package/packages/dd-trace/src/profiling/profilers/cpu.js

@@ -25,9 +25,7 @@ class NativeCpuProfiler {
 
   profile () {
     if (!this._stop) return
-    const profile = this._stop()
-    this._record()
-    return profile
+    return this._stop(true)
   }
 
   encode (profile) {

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

@@ -46,7 +46,7 @@ class Tracer extends BaseTracer {
             metrics.start(config)
           }
 
-          // dirty require for now so zero appsec code is executed unless explicitely enabled
+          // dirty require for now so zero appsec code is executed unless explicitly enabled
           if (config.appsec.enabled) {
             require('./appsec').enable(config)
           }

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/).