Merge pull request #11 from SebastianIoanPop/fix-statsd-illegal-chara…

…cter

Fixed illegal character problem

index.js

@@ -1,13 +1,14 @@
 'use strict';
-let defaultInterval = 10;
-let oneSecInMs = 1000;
-let keyCountAppendName = 'keyCounter';
+const defaultInterval = 10;
+const oneSecInMs = 1000;
+const keyCountAppendName = 'keyCounter';
+
 const path = require('path');
 const util = require('util');
 const infoParser = require('./lib/info-parser');
 const redisClientFactory = require('./lib/redis-client-factory');
 const libUtils = require('./lib/utils');
-let keyCounter = require('./lib/redis-key-counter');
+const keyCounter = require('./lib/redis-key-counter');
 var configDir = path.resolve(process.argv[2] || './');
 
 const StatsD = require('statsd-client');
@@ -44,13 +45,14 @@ redisClients.forEach((c) => {
     keyCounter.count(c, (err, stat) => {
       var prefix = libUtils.getPrefix(c, keyCountAppendName);
       var suffix = libUtils.getSuffix(c, keyCountAppendName);
+      let cleanKey = libUtils.cleanKey(stat.key);
 
       if (err) {
         util.log(`[${c.host}] ${err}`);
         return;
       }
 
-      statsdClient.gauge(`${prefix}${stat.key}${suffix}`, stat.count);
+      statsdClient.gauge(`${prefix}${cleanKey}${suffix}`, stat.count);
     });
 
   }, (statsConfig.interval || defaultInterval) * oneSecInMs);

lib/utils.js

@@ -1,4 +1,6 @@
 'use strict';
+const statsdIllegalCharacter = ':';
+const defaultWordSeparatorCharacter = '-';
 
 module.exports.getSuffix = (c, nodeName) => {
   var suffix = '';
@@ -25,3 +27,7 @@ module.exports.getPrefix = (c, nodeName) => {
 
   return pre;
 };
+
+module.exports.cleanKey = (keyName) => {
+  return keyName.replace(statsdIllegalCharacter, defaultWordSeparatorCharacter);
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-statsd-reporter",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Pull info from redis and publish to statsd",
   "main": "index.js",
   "scripts": {

tests/utils.js

@@ -49,4 +49,11 @@ describe('utils', () => {
       result.should.equal(',host=foo,node=bar');
     });
   });
+
+  describe('cleanKey', () => {
+    it('should replace occurances of ":" with "-" in the given key', () => {
+      var result = utils.cleanKey('test:key');
+      result.should.equal('test-key');
+    });
+  });
 });