feature: improve network configuration

Author: wallet77

src/metrics/network.ts

@@ -10,7 +10,7 @@ export default class NetworkMetric implements MetricsInterface {
   private metricFeature: MetricsFeature
 
   private defaultConf = {
-    ports: true,
+    ports: false,
     traffic: true
   }
 
@@ -22,7 +22,7 @@ export default class NetworkMetric implements MetricsInterface {
     config = MetricConfig.getConfig(config, this.defaultConf)
 
     if (config.traffic) {
-      this.catchTraffic()
+      this.catchTraffic(config.traffic)
     }
 
     if (config.ports) {
@@ -64,7 +64,7 @@ export default class NetworkMetric implements MetricsInterface {
     }
   }
 
-  catchTraffic () {
+  catchTraffic (config) {
     let download = 0
     let upload = 0
     let up = '0 B/sec'
@@ -110,42 +110,54 @@ export default class NetworkMetric implements MetricsInterface {
 
     interval.unref()
 
-    this.metricFeature.metric({
-      name     : 'Network Download',
-      agg_type : 'sum',
-      value    : function () { return down }
-    })
+    if (config === true || config.download === true) {
+      this.metricFeature.metric({
+        name: 'Network Download',
+        agg_type: 'sum',
+        value: function () {
+          return down
+        }
+      })
+    }
 
-    this.metricFeature.metric({
-      name     : 'Network Upload',
-      agg_type : 'sum',
-      value    : function () { return up }
-    })
+    if (config === true || config.upload === true) {
+      this.metricFeature.metric({
+        name: 'Network Upload',
+        agg_type: 'sum',
+        value: function () {
+          return up
+        }
+      })
+    }
 
-    const originalWrite = netModule.Socket.prototype.write
+    if (config === true || config.upload === true) {
+      const originalWrite = netModule.Socket.prototype.write
 
-    netModule.Socket.prototype.write = function (data) {
-      if (data.length) {
-        upload += data.length
+      netModule.Socket.prototype.write = function (data) {
+        if (data.length) {
+          upload += data.length
+        }
+        return originalWrite.apply(this, arguments)
       }
-      return originalWrite.apply(this, arguments)
     }
 
-    const originalRead = netModule.Socket.prototype.read
+    if (config === true || config.download === true) {
+      const originalRead = netModule.Socket.prototype.read
 
-    netModule.Socket.prototype.read = function () {
+      netModule.Socket.prototype.read = function () {
 
-      if (!this.monitored) {
-        this.monitored = true
+        if (!this.monitored) {
+          this.monitored = true
 
-        this.on('data', function (data) {
-          if (data.length) {
-            download += data.length
-          }
-        })
-      }
+          this.on('data', function (data) {
+            if (data.length) {
+              download += data.length
+            }
+          })
+        }
 
-      return originalRead.apply(this, arguments)
+        return originalRead.apply(this, arguments)
+      }
     }
   }
 }

test/fixtures/features/networkChild.ts

@@ -1,7 +1,7 @@
 import Metric from '../../../src/features/metrics'
 
 const metric = new Metric()
-metric.init({network: true}, true)
+metric.init({network: {ports: true}}, true)
 
 const httpModule = require('http')
 

test/fixtures/features/networkWithoutDownloadChild.ts

@@ -0,0 +1,24 @@
+import Metric from '../../../src/features/metrics'
+
+const metric = new Metric()
+metric.init({network: {traffic: {upload: true}}}, true)
+
+const httpModule = require('http')
+
+let timer
+
+const server = httpModule.createServer((req, res) => {
+  res.writeHead(200)
+  res.end('hey')
+}).listen(3002, () => {
+  timer = setInterval(function () {
+    httpModule.get('http://localhost:' + server.address().port)
+    httpModule.get('http://localhost:' + server.address().port + '/toto')
+  }, 100)
+})
+
+process.on('SIGINT', function () {
+  clearInterval(timer)
+  server.close()
+  metric.destroy()
+})

test/metrics/network.spec.ts

@@ -35,4 +35,26 @@ describe('Network', function () {
       }
     })
   })
+
+  it('should only send upload data', (done) => {
+    const child = fork(SpecUtils.buildTestPath('fixtures/features/networkWithoutDownloadChild.js'))
+
+    child.on('message', pck => {
+
+      if (pck.type === 'axm:monitor' && pck.data['Network Upload'].value !== '0 B/sec') {
+
+        expect(pck.data.hasOwnProperty('Network Download')).to.equal(false)
+
+        expect(pck.data.hasOwnProperty('Network Upload')).to.equal(true)
+        expect(pck.data['Network Upload'].agg_type).to.equal('sum')
+        expect(pck.data['Network Upload'].historic).to.equal(true)
+        expect(pck.data['Network Upload'].type).to.equal('Network Upload')
+
+        expect(pck.data.hasOwnProperty('Open ports')).to.equal(false)
+
+        child.kill('SIGINT')
+        done()
+      }
+    })
+  })
 })