dd-trace 4.0.0 → 4.1.1

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

@@ -1,4 +1,20 @@
 const request = require('../exporters/common/request')
+
+function getHeaders (config, application, reqType) {
+  const headers = {
+    'content-type': 'application/json',
+    'dd-telemetry-api-version': 'v1',
+    'dd-telemetry-request-type': reqType,
+    'dd-client-library-language': application.language_name,
+    'dd-client-library-version': application.tracer_version
+  }
+  const debug = config.telemetry && config.telemetry.debug
+  if (debug) {
+    headers['dd-telemetry-debug-enabled'] = 'true'
+  }
+  return headers
+}
+
 let seqId = 0
 
 function getPayload (payload) {
@@ -25,11 +41,7 @@ function sendData (config, application, host, reqType, payload = {}) {
     port,
     method: 'POST',
     path: '/telemetry/proxy/api/v2/apmtelemetry',
-    headers: {
-      'content-type': 'application/json',
-      'dd-telemetry-api-version': 'v1',
-      'dd-telemetry-request-type': reqType
-    }
+    headers: getHeaders(config, application, reqType)
   }
   const data = JSON.stringify({
     api_version: 'v1',

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

@@ -7,7 +7,7 @@ const { storage } = require('../../datadog-core')
 const { isError } = require('./util')
 const { setStartupLogConfig } = require('./startup-log')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
-const { MAJOR } = require('../../../version')
+const { DD_MAJOR } = require('../../../version')
 
 const SPAN_TYPE = tags.SPAN_TYPE
 const RESOURCE_NAME = tags.RESOURCE_NAME
@@ -27,7 +27,7 @@ class DatadogTracer extends Tracer {
       childOf: this.scope().active()
     }, options)
 
-    if (!options.childOf && options.orphanable === false && MAJOR < 4) {
+    if (!options.childOf && options.orphanable === false && DD_MAJOR < 4) {
       return fn(null, () => {})
     }
 
@@ -82,7 +82,7 @@ class DatadogTracer extends Tracer {
         optionsObj = optionsObj.apply(this, arguments)
       }
 
-      if (optionsObj && optionsObj.orphanable === false && !tracer.scope().active() && MAJOR < 4) {
+      if (optionsObj && optionsObj.orphanable === false && !tracer.scope().active() && DD_MAJOR < 4) {
         return fn.apply(this, arguments)
       }
 

package/version.js

@@ -1,9 +1,13 @@
 'use strict'
 
-const matches = require('./package.json').version.match(/^(\d+)\.(\d+)\.(\d+)/)
+const ddMatches = require('./package.json').version.match(/^(\d+)\.(\d+)\.(\d+)/)
+const nodeMatches = process.versions.node.match(/^(\d+)\.(\d+)\.(\d+)/)
 
 module.exports = {
-  MAJOR: parseInt(matches[1]),
-  MINOR: parseInt(matches[2]),
-  PATCH: parseInt(matches[3])
+  DD_MAJOR: parseInt(ddMatches[1]),
+  DD_MINOR: parseInt(ddMatches[2]),
+  DD_PATCH: parseInt(ddMatches[3]),
+  NODE_MAJOR: parseInt(nodeMatches[1]),
+  NODE_MINOR: parseInt(nodeMatches[2]),
+  NODE_PATCH: parseInt(nodeMatches[3])
 }

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

@@ -1,7 +0,0 @@
-'use strict'
-
-const TracingPlugin = require('./tracing')
-
-class IncomingPlugin extends TracingPlugin {}
-
-module.exports = IncomingPlugin