From ae4673d5ebb18705598d686aa96f83a5ddf1b075 Mon Sep 17 00:00:00 2001
From: Danny Coates <dannycoates@gmail.com>
Date: Wed, 5 Jun 2013 14:46:50 -0700
Subject: [PATCH] added path cbuf to request.lua (required heka dev)

---
 heka/request.lua | 64 ++++++++++++++++++++++++++++++++++++------------
 lib/stats.js     |  1 -
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/heka/request.lua b/heka/request.lua
index c94e6d3b..0d415831 100644
--- a/heka/request.lua
+++ b/heka/request.lua
@@ -1,33 +1,65 @@
-data = circular_buffer.new(1440, 5, 60)
-local OK = data:set_header(1, "200", "count")
-local REDIRECT = data:set_header(2, "300", "count")
-local BADREQUEST = data:set_header(3, "400", "count")
-local SERVERERR = data:set_header(4, "500", "count")
-local TOTAL = data:set_header(5, "TOTAL", "count")
+statusCodes = circular_buffer.new(1440, 5, 60)
+local OK = statusCodes:set_header(1, "200", "count")
+local REDIRECT = statusCodes:set_header(2, "300", "count")
+local BADREQUEST = statusCodes:set_header(3, "400", "count")
+local SERVERERR = statusCodes:set_header(4, "500", "count")
+local TOTAL = statusCodes:set_header(5, "TOTAL", "count")
+
+local REQUESTS = 1
+local TIME = 2
+
+local paths = {}
 
 function process_message()
   local ts = read_message("Timestamp")
   local statusCode = read_message("Fields[statusCode]")
+  local path = read_message("Fields[path]")
+  local responseTime = read_message("Fields[responseTime]")
+  local processPath = true
   if statusCode == nil then return 0 end
 
-  data:add(ts, TOTAL, 1)
+  -- status codes
+  statusCodes:add(ts, TOTAL, 1)
 
   if statusCode < 200 then
     return 0
-  elseif statusCode < 300 then
-    data:add(ts, OK, 1)
-  elseif statusCode < 400 then
-    data:add(ts, REDIRECT, 1)
-  elseif statusCode < 500 then
-    data:add(ts, BADREQUEST, 1)
-  elseif statusCode < 600 then
-    data:add(ts, SERVERERR, 1)
+  elseif statusCode <= 299 then
+    statusCodes:add(ts, OK, 1)
+  elseif statusCode <= 399 then
+    processPath = false
+    statusCodes:add(ts, REDIRECT, 1)
+  elseif statusCode <= 499 then
+    processPath = false
+    statusCodes:add(ts, BADREQUEST, 1)
+  elseif statusCode <= 599 then
+    statusCodes:add(ts, SERVERERR, 1)
+  else
+    processPath = false
   end
 
+  if processPath == false then return 0 end
+
+  -- response time
+  local buf = paths[path]
+  if buf == nil then
+    buf = circular_buffer.new(1440, 2, 60)
+    buf:set_header(1, "requests", "count")
+    buf:set_header(2, "time", "ms", "max")
+    paths[path] = buf
+  end
+
+  buf:add(ts, REQUESTS, 1)
+  buf:set(ts, TIME, math.max(buf:get(ts, TIME), responseTime))
+
   return 0
 end
 
 function timer_event(ns)
-  output(data)
+  output(statusCodes)
   inject_message("cbuf", "HTTP status codes")
+
+  for path, buf in pairs(paths) do
+    output(buf)
+    inject_message("cbuf", string.format("%s requests", path))
+  end
 end
diff --git a/lib/stats.js b/lib/stats.js
index f2c8da82..430c364c 100644
--- a/lib/stats.js
+++ b/lib/stats.js
@@ -60,7 +60,6 @@ module.exports = {
         timestamp: new Date(event.timestamp),
         severity: 6,
         fields: {
-          method: event.method,
           statusCode: event.statusCode,
           path: event.path,
           responseTime: event.responseTime