dd-trace 3.6.0 → 3.7.1

package/LICENSE-3rdparty.csv

@@ -20,6 +20,7 @@ require,methods,MIT,Copyright 2013-2014 TJ Holowaychuk
 require,module-details-from-path,MIT,Copyright 2016 Thomas Watson Steen
 require,opentracing,MIT,Copyright 2016 Resonance Labs Inc
 require,path-to-regexp,MIT,Copyright 2014 Blake Embrey
+require,protobufjs,BSD-3-Clause,Copyright 2016 Daniel Wirtz
 require,retry,MIT,Copyright 2011 Tim Koschützki Felix Geisendörfer
 require,semver,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,@types/node,MIT,Copyright Authors

package/index.d.ts

@@ -176,7 +176,7 @@ export declare interface SamplingRule {
   /**
    * Sampling rate for this rule.
    */
-  sampleRate: Number
+  sampleRate: number
 
   /**
    * Service on which to apply this rule. The rule will apply to all services if not provided.
@@ -196,12 +196,12 @@ export declare interface SpanSamplingRule {
   /**
    * Sampling rate for this rule. Will default to 1.0 (always) if not provided.
    */
-  sampleRate?: Number
+  sampleRate?: number
 
   /**
    * Maximum number of spans matching a span sampling rule to be allowed per second.
    */
-  maxPerSecond?: Number
+  maxPerSecond?: number
 
   /**
    * Service name or pattern on which to apply this rule. The rule will apply to all services if not provided.
@@ -297,7 +297,7 @@ export declare interface TracerOptions {
    * and controls the ingestion rate limit between the agent and the backend.
    * Defaults to deferring the decision to the agent.
    */
-  rateLimit?: Number,
+  rateLimit?: number,
 
   /**
    * Sampling rules to apply to priority samplin. Each rule is a JSON,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "3.6.0",
+  "version": "3.7.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -59,8 +59,8 @@
   },
   "dependencies": {
     "@datadog/native-appsec": "^1.2.1",
-    "@datadog/native-metrics": "^1.4.3",
-    "@datadog/pprof": "^1.0.2",
+    "@datadog/native-metrics": "^1.5.0",
+    "@datadog/pprof": "^1.1.1",
     "@datadog/sketches-js": "^2.1.0",
     "crypto-randomuuid": "^1.0.0",
     "diagnostics_channel": "^1.1.0",
@@ -79,6 +79,7 @@
     "module-details-from-path": "^1.0.3",
     "opentracing": ">=0.12.1",
     "path-to-regexp": "^0.1.2",
+    "protobufjs": "^7.1.2",
     "retry": "^0.10.1",
     "semver": "^5.5.0"
   },

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -79,7 +79,7 @@ function limitDepth (input) {
       let child = input[key]
 
       if (isBSON(child)) {
-        child = child.toJSON()
+        child = typeof child.toJSON === 'function' ? child.toJSON() : '?'
       }
 
       if (depth >= 10 || shouldHide(child)) {

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const URL = require('url').URL
+const { URL, format } = require('url')
 const log = require('../../log')
 const Writer = require('./writer')
 
@@ -8,7 +8,11 @@ class AgentExporter {
   constructor (config, prioritySampler) {
     this._config = config
     const { url, hostname, port, lookup, protocolVersion, stats = {} } = config
-    this._url = url || new URL(`http://${hostname || 'localhost'}:${port}`)
+    this._url = url || new URL(format({
+      protocol: 'http:',
+      hostname: hostname || 'localhost',
+      port
+    }))
 
     const headers = {}
     if (stats.enabled) {

package/packages/dd-trace/src/exporters/span-stats/index.js

@@ -1,11 +1,15 @@
-const { URL } = require('url')
+const { URL, format } = require('url')
 
 const { Writer } = require('./writer')
 
 class SpanStatsExporter {
   constructor (config) {
     const { hostname = '127.0.0.1', port = 8126, tags, url } = config
-    this._url = url || new URL(`http://${hostname || 'localhost'}:${port}`)
+    this._url = url || new URL(format({
+      protocol: 'http:',
+      hostname: hostname || 'localhost',
+      port
+    }))
     this._writer = new Writer({ url: this._url, tags })
   }
 

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

@@ -2,6 +2,7 @@
 
 // TODO: capture every second and flush every 10 seconds
 
+const { URL, format } = require('url')
 const v8 = require('v8')
 const os = require('os')
 const Client = require('./dogstatsd')
@@ -57,7 +58,11 @@ module.exports = {
     if (config.url) {
       clientConfig.metricsProxyUrl = config.url
     } else if (config.port) {
-      clientConfig.metricsProxyUrl = new URL(`http://${config.hostname || 'localhost'}:${config.port}`)
+      clientConfig.metricsProxyUrl = new URL(format({
+        protocol: 'http:',
+        hostname: config.hostname || 'localhost',
+        port: config.port
+      }))
     }
 
     client = new Client(clientConfig)

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

@@ -1,7 +1,8 @@
 'use strict'
 
 // TODO (new internal tracer): use DC events for lifecycle metrics and test them
-const now = require('perf_hooks').performance.now
+const { performance } = require('perf_hooks')
+const now = performance.now.bind(performance)
 const dateNow = Date.now
 const semver = require('semver')
 const SpanContext = require('./span_context')

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

@@ -2,7 +2,7 @@
 
 const coalesce = require('koalas')
 const os = require('os')
-const { URL } = require('url')
+const { URL, format } = require('url')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
@@ -59,10 +59,13 @@ class Config {
     this.sourceMap = sourceMap
     this.endpointCollection = endpointCollection
 
-    const hostname = coalesce(options.hostname, DD_AGENT_HOST, 'localhost')
-    const port = coalesce(options.port, DD_TRACE_AGENT_PORT, 8126)
-    this.url = new URL(coalesce(options.url, DD_TRACE_AGENT_URL,
-      `http://${hostname || 'localhost'}:${port || 8126}`))
+    const hostname = coalesce(options.hostname, DD_AGENT_HOST) || 'localhost'
+    const port = coalesce(options.port, DD_TRACE_AGENT_PORT) || 8126
+    this.url = new URL(coalesce(options.url, DD_TRACE_AGENT_URL, format({
+      protocol: 'http:',
+      hostname,
+      port
+    })))
 
     this.exporters = ensureExporters(options.exporters || [
       new AgentExporter(this)

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

@@ -65,8 +65,8 @@ class SpanAggStats {
       TopLevelHits: this.topLevelHits,
       Errors: this.errors,
       Duration: this.duration,
-      OkSummary: this.okDistribution.toProto(),
-      ErrorSummary: this.errorDistribution.toProto()
+      OkSummary: this.okDistribution.toProto(), // TODO: custom proto encoding
+      ErrorSummary: this.errorDistribution.toProto() // TODO: custom proto encoding
     }
   }
 }

package/packages/dd-trace/src/telemetry/dependencies.js

@@ -7,7 +7,7 @@ const { sendData } = require('./send-data')
 const dc = require('diagnostics_channel')
 const { fileURLToPath } = require('url')
 
-const savedDependencies = []
+const savedDependencies = new Set()
 const detectedDependencyNames = new Set()
 const FILE_URI_START = `file://`
 const moduleLoadStartChannel = dc.channel('dd-trace:moduleLoadStart')
@@ -18,10 +18,14 @@ function waitAndSend (config, application, host) {
   if (!immediate) {
     immediate = setImmediate(() => {
       immediate = null
-      if (savedDependencies.length > 0) {
-        const dependencies = savedDependencies.splice(0, 1000)
+      if (savedDependencies.size > 0) {
+        const dependencies = Array.from(savedDependencies.values()).splice(0, 1000).map(pair => {
+          savedDependencies.delete(pair)
+          const [name, version] = pair.split(' ')
+          return { name, version }
+        })
         sendData(config, application, host, 'app-dependencies-loaded', { dependencies })
-        if (savedDependencies.length > 0) {
+        if (savedDependencies.size > 0) {
           waitAndSend(config, application, host)
         }
       }
@@ -49,7 +53,7 @@ function onModuleLoad (data) {
         if (basedir) {
           try {
             const { version } = requirePackageJson(basedir, module)
-            savedDependencies.push({ name, version })
+            savedDependencies.add(`${name} ${version}`)
             waitAndSend(config, application, host)
           } catch (e) {
             // can not read the package.json, do nothing
@@ -75,7 +79,7 @@ function stop () {
   application = null
   host = null
   detectedDependencyNames.clear()
-  savedDependencies.splice(0, savedDependencies.length)
+  savedDependencies.clear()
   if (moduleLoadStartChannel.hasSubscribers) {
     moduleLoadStartChannel.unsubscribe(onModuleLoad)
   }

package/packages/dd-trace/src/telemetry/send-data.js

@@ -3,9 +3,11 @@ let seqId = 0
 function sendData (config, application, host, reqType, payload = {}) {
   const {
     hostname,
-    port
+    port,
+    url
   } = config
   const options = {
+    url,
     hostname,
     port,
     method: 'POST',