dd-trace 3.21.0 → 3.22.1

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

@@ -6,10 +6,6 @@ const os = require('os')
 const dependencies = require('./dependencies')
 const { sendData } = require('./send-data')
 
-const HEARTBEAT_INTERVAL = process.env.DD_TELEMETRY_HEARTBEAT_INTERVAL
-  ? Number(process.env.DD_TELEMETRY_HEARTBEAT_INTERVAL) * 1000
-  : 60000
-
 const telemetryStartChannel = dc.channel('datadog:telemetry:start')
 const telemetryStopChannel = dc.channel('datadog:telemetry:stop')
 
@@ -19,6 +15,7 @@ let pluginManager
 let application
 let host
 let interval
+let heartbeatInterval
 const sentIntegrations = new Set()
 
 function getIntegrations () {
@@ -108,7 +105,7 @@ function createHostObject () {
 }
 
 function getTelemetryData () {
-  return { config, application, host, heartbeatInterval: HEARTBEAT_INTERVAL }
+  return { config, application, host, heartbeatInterval }
 }
 
 function start (aConfig, thePluginManager) {
@@ -119,11 +116,13 @@ function start (aConfig, thePluginManager) {
   pluginManager = thePluginManager
   application = createAppObject()
   host = createHostObject()
+  heartbeatInterval = config.telemetry.heartbeatInterval
+
   dependencies.start(config, application, host)
   sendData(config, application, host, 'app-started', appStarted())
   interval = setInterval(() => {
     sendData(config, application, host, 'app-heartbeat')
-  }, HEARTBEAT_INTERVAL)
+  }, heartbeatInterval)
   interval.unref()
   process.on('beforeExit', onBeforeExit)
 

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/plugins/incoming.js

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