dd-trace 2.26.1 → 2.27.0

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

@@ -1,7 +1,6 @@
 'use strict'
 
 const tracerVersion = require('../../../../package.json').version
-const containerId = require('../exporters/common/docker').id()
 const os = require('os')
 const dependencies = require('./dependencies')
 const { sendData } = require('./send-data')
@@ -76,9 +75,31 @@ function createAppObject () {
 }
 
 function createHostObject () {
+  const osName = os.type()
+
+  if (osName === 'Linux' || osName === 'Darwin') {
+    return {
+      hostname: os.hostname(),
+      os: osName,
+      architecture: os.arch(),
+      kernel_version: os.version(),
+      kernel_release: os.release(),
+      kernel_name: osName
+    }
+  }
+
+  if (osName === 'Windows_NT') {
+    return {
+      hostname: os.hostname(),
+      os: osName,
+      architecture: os.arch(),
+      os_version: os.version()
+    }
+  }
+
   return {
     hostname: os.hostname(), // TODO is this enough?
-    container_id: containerId
+    os: osName
   }
 }
 

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

@@ -6,6 +6,9 @@ function sendData (config, application, host, reqType, payload = {}) {
     port,
     url
   } = config
+
+  const { logger, tags, serviceMapping, ...trimmedPayload } = payload
+
   const options = {
     url,
     hostname,
@@ -24,7 +27,7 @@ function sendData (config, application, host, reqType, payload = {}) {
     tracer_time: Math.floor(Date.now() / 1000),
     runtime_id: config.tags['runtime-id'],
     seq_id: ++seqId,
-    payload,
+    payload: trimmedPayload,
     application,
     host
   })