add missing telemetry host data (#2682)

* add os, kernel, architecture fields

* test host obj

* Update packages/dd-trace/src/telemetry/index.js

Co-authored-by: simon-id <[email protected]>

* Update packages/dd-trace/src/telemetry/index.js

Co-authored-by: simon-id <[email protected]>

* Update packages/dd-trace/src/telemetry/index.js

Co-authored-by: simon-id <[email protected]>

* Update packages/dd-trace/src/telemetry/index.js

Co-authored-by: simon-id <[email protected]>

* fix lint issues

* Update packages/dd-trace/test/telemetry/index.spec.js

Co-authored-by: simon-id <[email protected]>

* Update packages/dd-trace/src/telemetry/index.js

Co-authored-by: simon-id <[email protected]>

---------

Co-authored-by: simon-id <[email protected]>

Author: 2 people

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
   }
 }
 

packages/dd-trace/test/telemetry/index.spec.js

@@ -5,6 +5,7 @@ const proxyquire = require('proxyquire')
 const http = require('http')
 const { once } = require('events')
 const { storage } = require('../../../datadog-core')
+const os = require('os')
 
 let traceAgent
 
@@ -46,11 +47,6 @@ describe('telemetry', () => {
         id () {
           return 'test docker id'
         }
-      },
-      os: {
-        hostname () {
-          return 'test hostname'
-        }
       }
     })
 
@@ -178,11 +174,6 @@ describe('telemetry with interval change', () => {
           return 'test docker id'
         }
       },
-      os: {
-        hostname () {
-          return 'test hostname'
-        }
-      },
       './send-data': {
         sendData: () => {}
       }
@@ -229,6 +220,28 @@ async function testSeq (seqId, reqType, validatePayload) {
     'dd-telemetry-api-version': 'v1',
     'dd-telemetry-request-type': reqType
   })
+  const osName = os.type()
+  let host = {
+    hostname: os.hostname(),
+    os: osName
+  }
+  if (osName === 'Linux' || osName === 'Darwin') {
+    host = {
+      hostname: os.hostname(),
+      os: osName,
+      architecture: os.arch(),
+      kernel_version: os.version(),
+      kernel_release: os.release(),
+      kernel_name: osName
+    }
+  } else if (osName === 'Windows_NT') {
+    host = {
+      hostname: os.hostname(),
+      os: osName,
+      os_version: os.version(),
+      architecture: os.arch()
+    }
+  }
   expect(req.body).to.deep.include({
     api_version: 'v1',
     request_type: reqType,
@@ -242,10 +255,7 @@ async function testSeq (seqId, reqType, validatePayload) {
       language_name: 'nodejs',
       language_version: process.versions.node
     },
-    host: {
-      hostname: 'test hostname',
-      container_id: 'test docker id'
-    }
+    host
   })
   expect([1, 0, -1].includes(Math.floor(Date.now() / 1000) - req.body.tracer_time)).to.be.true