SC-6766: edited tag/metric names

sematext · Jan 20, 2020 · 404bfc1 · 404bfc1
1 parent c951819
commit 404bfc1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 53 deletions.
diff --git a/lib/processAgent.js b/lib/processAgent.js
@@ -27,15 +27,15 @@ const addMetrics = function (agent, pidToCheck) {
     const masterProcess = processes.filter(proc => proc.pid === pidToCheck).pop()
     const masterProcessMetric = {
       timestamp: timestamp,
-      measurement: 'nodejs.process',
+      measurement: 'process',
       tags: {
         token: infraToken,
-        'nodejs.process.name': 'master',
-        'nodejs.process.type': 'master'
+        'process.name': 'node',
+        'process.type': 'master'
       },
       fields: {
-        'cpu.percent': masterProcess.cpu,
-        memory: masterProcess.memory,
+        'cpu.usage': masterProcess.cpu,
+        rss: masterProcess.memory,
         uptime: masterProcess.elapsed
       }
     }
@@ -45,15 +45,15 @@ const addMetrics = function (agent, pidToCheck) {
       childProcesses.forEach((proc, counter) => {
         const childProcessMetric = {
           timestamp: timestamp,
-          measurement: 'nodejs.process',
+          measurement: 'process',
           tags: {
             token: infraToken,
-            'nodejs.process.name': `child-${counter + 1}`,
-            'nodejs.process.type': 'child'
+            'process.name': 'node',
+            'process.type': 'child'
           },
           fields: {
-            'cpu.percent': proc.cpu,
-            memory: proc.memory,
+            'cpu.usage': proc.cpu,
+            rss: proc.memory,
             uptime: proc.elapsed
           }
         }
@@ -63,10 +63,11 @@ const addMetrics = function (agent, pidToCheck) {
 
     const processCountMetric = {
       timestamp: timestamp,
-      measurement: 'nodejs.process',
+      measurement: 'process',
       tags: {
         token: infraToken,
-        'nodejs.process.type': 'master'
+        'process.type': 'master',
+        'process.name': 'node'
       },
       fields: {
         count: 1
@@ -75,10 +76,11 @@ const addMetrics = function (agent, pidToCheck) {
     agent.addMetrics(processCountMetric)
     const processChildCountMetric = {
       timestamp: timestamp,
-      measurement: 'nodejs.process',
+      measurement: 'process',
       tags: {
         token: infraToken,
-        'nodejs.process.type': 'child'
+        'process.type': 'child',
+        'process.name': 'node'
       },
       fields: {
         count: Math.max(processes.length - 1, 0) || 0

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/test.js b/test/test.js
@@ -185,7 +185,7 @@ describe('SPM for Node.js tests', function () {
       if (metric.measurement && metric.measurement.indexOf('process') > -1 &&
         metric.fields.uptime &&
         metric.fields.memory &&
-        metric.fields['cpu.percent']) {
+        metric.fields['cpu.usage']) {
         if (metric.tags.token !== config.tokens.infra) {
           console.log(metric)
           done(new Error(`No infra token set ${metric.tags.token} != ${config.tokens.infra}`))