From e6a5c00ebf3a7463d1dc1cebe68dab8570d43d55 Mon Sep 17 00:00:00 2001
From: Mike Mattozzi <mmattozzi@lafleur.local>
Date: Mon, 27 Jun 2011 16:30:38 -0400
Subject: [PATCH] Adding standalone RPS requests per second stat collector

---
 examples/simpletest.ex.js    | 1 +
 lib/monitoring/collectors.js | 9 +++++++++
 nodeload.js                  | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/examples/simpletest.ex.js b/examples/simpletest.ex.js
index da9bc15..16b8f4f 100755
--- a/examples/simpletest.ex.js
+++ b/examples/simpletest.ex.js
@@ -23,6 +23,7 @@ nl.run({
         'result-codes', 
         { name: 'latency', percentiles: [0.9, 0.99] },
         'concurrency',
+        'rps',
         'uniques',
         { name: 'http-errors', successCodes: [200,404], log: 'http-errors.log' }
     ],
diff --git a/lib/monitoring/collectors.js b/lib/monitoring/collectors.js
index 718367d..9c3bd60 100644
--- a/lib/monitoring/collectors.js
+++ b/lib/monitoring/collectors.js
@@ -17,6 +17,7 @@ var stats = require('../stats');
 var Histogram = stats.Histogram;
 var Peak = stats.Peak;
 var ResultsCounter = stats.ResultsCounter;
+var Rate = stats.Rate;
 var Uniques = stats.Uniques;
 var Accumulator = stats.Accumulator;
 var LogFile = stats.LogFile;
@@ -41,6 +42,14 @@ StatsCollectors['result-codes'] = function ResultCodesCollector() {
     self.end = function(context, http) { self.stats.put(http.res.statusCode); };
 };
 
+/** Track requests per second, storing stats in a stats.js#Rate object. The client must call 
+.end({res: http.ClientResponse}). */
+StatsCollectors['rps'] = function RpsCollector() {
+    var self = this;
+    self.stats = new Rate();
+    self.end = function(context, http) { self.stats.put(); };
+};
+
 /** Track a status code that is returned in an HTTP header, storing stats in a stats.js#ResultsCounter
 object. The client must call .end({res: http.ClientResponse}). */
 StatsCollectors['header-code'] = function HeaderCodeCollector(params) {
diff --git a/nodeload.js b/nodeload.js
index 7c0f1d4..e692065 100755
--- a/nodeload.js
+++ b/nodeload.js
@@ -65,8 +65,8 @@ this.loops=this.loops.concat(loops);this.emit('add',loops);}
 if(concurrency!==this.concurrency||rps!==this.rps){var rpsPerLoop=(rps/concurrency);this.loops.forEach(function(l){l.rps=rpsPerLoop;});this.emit('rps',rps);}
 this.concurrency=concurrency;this.rps=rps;if(timeout<Infinity){this.updateTimeoutId=setTimeout(this.updater_,timeout);}};MultiLoop.prototype.checkFinished_=function(){if(!this.running){return true;}
 if(this.loops.some(function(l){return l.running;})){return false;}
-this.running=false;this.emit('end');return true;};var BUILD_AS_SINGLE_FILE;if(!BUILD_AS_SINGLE_FILE){var util=require('../util');var stats=require('../stats');var Histogram=stats.Histogram;var Peak=stats.Peak;var ResultsCounter=stats.ResultsCounter;var Uniques=stats.Uniques;var Accumulator=stats.Accumulator;var LogFile=stats.LogFile;var StatsCollectors=exports;}else{var StatsCollectors={};}
-StatsCollectors['runtime']=StatsCollectors['latency']=function RuntimeCollector(params){var self=this;self.stats=new Histogram(params);self.start=function(context){context.start=new Date();};self.end=function(context){self.stats.put(new Date()-context.start);};};StatsCollectors['result-codes']=function ResultCodesCollector(){var self=this;self.stats=new ResultsCounter();self.end=function(context,http){self.stats.put(http.res.statusCode);};};StatsCollectors['header-code']=function HeaderCodeCollector(params){if(!params.header){throw new Error('"header" is a required parameter for header-code');}
+this.running=false;this.emit('end');return true;};var BUILD_AS_SINGLE_FILE;if(!BUILD_AS_SINGLE_FILE){var util=require('../util');var stats=require('../stats');var Histogram=stats.Histogram;var Peak=stats.Peak;var ResultsCounter=stats.ResultsCounter;var Rate=stats.Rate;var Uniques=stats.Uniques;var Accumulator=stats.Accumulator;var LogFile=stats.LogFile;var StatsCollectors=exports;}else{var StatsCollectors={};}
+StatsCollectors['runtime']=StatsCollectors['latency']=function RuntimeCollector(params){var self=this;self.stats=new Histogram(params);self.start=function(context){context.start=new Date();};self.end=function(context){self.stats.put(new Date()-context.start);};};StatsCollectors['result-codes']=function ResultCodesCollector(){var self=this;self.stats=new ResultsCounter();self.end=function(context,http){self.stats.put(http.res.statusCode);};};StatsCollectors['rps']=function RpsCollector(){var self=this;self.stats=new Rate();self.end=function(context,http){self.stats.put();};};StatsCollectors['header-code']=function HeaderCodeCollector(params){if(!params.header){throw new Error('"header" is a required parameter for header-code');}
 var self=this,header=params.header.toLowerCase(),regex=params.regex;self.stats=new ResultsCounter();self.end=function(context,http){var val=http.res.headers[header];if(regex&&val!==undefined){val=val.match(regex);val=val&&val[1]||undefined;}
 if(val!==undefined){self.stats.put(val);}};};StatsCollectors['concurrency']=function ConcurrencyCollector(){var self=this,c=0;self.stats=new Peak();self.start=function(){c++;};self.end=function(){self.stats.put(c--);};};StatsCollectors['request-bytes']=function RequestBytesCollector(){var self=this;self.stats=new Accumulator();self.end=function(context,http){if(http&&http.req){if(http.req._header){self.stats.put(http.req._header.length);}
 if(http.req.body){self.stats.put(http.req.body.length);}}};};StatsCollectors['response-bytes']=function ResponseBytesCollector(){var self=this;self.stats=new Accumulator();self.end=function(context,http){if(http&&http.res){http.res.on('data',function(chunk){self.stats.put(chunk.length);});}};};StatsCollectors['uniques']=function UniquesCollector(){var self=this;self.stats=new Uniques();self.end=function(context,http){if(http&&http.req){self.stats.put(http.req.path);}};};StatsCollectors['uniques'].disableIntervalCollection=true;StatsCollectors['http-errors']=function HttpErrorsCollector(params){var self=this;self.stats=new Accumulator();self.successCodes=params.successCodes||[200];self.logfile=(typeof params.log==='string')?new LogFile(params.log):params.log;self.logResBody=(params.hasOwnProperty('logResBody'))?params.logResBody:true;self.end=function(context,http){if(self.successCodes.indexOf(http.res.statusCode)<0){self.stats.put(1);if(self.logfile){util.readStream(http.res,function(body){var logObj={ts:new Date(),req:{headers:http.req._header,body:http.req.body,},res:{statusCode:http.res.statusCode,headers:http.res.headers}};if(self.logResBody){logObj.res.body=body;}