rstatsd 0.2 → 0.3

data/README.md

@@ -1,13 +1,15 @@
 # rstatsd
 
-rstatsd is a ruby based daemon for capturing data from statsd clients.
+rstatsd is a ruby based daemon for capturing data from statsd clients and 
+displaying graphs. It stores graph data in fixed-length data structures
+in redis.
 
-rstatsd is inspired by the work at etsy to measure everything, measure
-anything. They use a combination of node.js and graphite to capture and
-graph this data.
+rstatsd is inspired by the work at etsy to measure anything, measure
+everything. They use a combination of node.js and graphite to capture
+and graph this data.
 
-The goal of this project was to replicate this light-weight approach and
-reduce the number of dependencies to do this to two: redis and ruby.
+The goal of this project was to replicate this approach in a very light-weight
+way by reducing the number of dependencies to do this to two: redis and ruby.
 
 ## Installation
 
@@ -25,25 +27,21 @@ Start the collection daemon and server
 
     $ rstatsd
 
-Add some data (you'll need a statsd compatible client like statsd-ruby)
+Open the web server in a browser and follow the directions:
 
-    $ irb
-    irb> require 'statsd'
-    => true
-    irb> s = Statsd.new('localhost')
-    => #<Statsd:0x007fee419866d8 @host="localhost", @port=8125>
-    irb(main):004:0> s.increment('grebulons')
-    => 10
-    irb> s.increment('grebulons')
-    => 10
-    irb> s.increment('grebulons')
-    => 10
-    irb> s.increment('grebulons')
-    => 10
+    $ open  http://localhost:8126/
 
+## URL Schema
 
-Then view the result in a web browser
+You can request multiple data points to be graphed simultaneously by specifying multiple targets:
 
-    irb> `open  http://localhost:8126/?target=grebulons`
+http://localhost:8126/stats?target=foo&target=bar
 
-Bask in the something of something-something.
+## Supported data types
+
+* counters (statsd.increment, statsd.decrement)
+
+## Todo
+
+* statsd data types other than counters
+* time window graphing

data/lib/rstatsd/chart.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'json'
 
 module Rstatsd

data/lib/rstatsd/collector.rb

@@ -1,4 +1,3 @@
-require 'em-hiredis'
 require_relative './helpers'
 
 module Rstatsd
@@ -7,7 +6,6 @@ module Rstatsd
 
     def initialize
       super
-      @redis = EM::Hiredis.connect
     end
 
     def post_init
@@ -21,19 +19,17 @@ module Rstatsd
       case fields[1]
       when 'c'
         if fields[0] == '1'
-          @redis.incr(key).callback do |value|
-            @redis.rpush(counter_key_name(key), "#{value}:#{Time.now.to_i}")
-          end
+          value = redis.incr(key) 
+          redis.rpush(counter_key_name(key), "#{value}:#{Time.now.to_i}")
         elsif fields[0] == '-1'
-          @redis.decr(key).callback do |value|
-            @redis.rpush(counter_key_name(key), "#{value}:#{Time.now.to_i}")
-          end
+          value = redis.decr(key)
+          redis.rpush(counter_key_name(key), "#{value}:#{Time.now.to_i}")
         end
-        @redis.ltrim(counter_key_name(key), 10000)
+        redis.ltrim(counter_key_name(key), -10000, -1)
       when 'ms'
         #update timer
-        @redis.rpush(timer_key_name(key), "#{fields[0]}:#{Time.now.to_i}")
-        @redis.ltrim(timer_key_name(key), 10000)
+        redis.rpush(timer_key_name(key), "#{fields[0]}:#{Time.now.to_i}")
+        redis.ltrim(timer_key_name(key), -10000, -1)
       else
         # invalid update
       end

data/lib/rstatsd/server.rb

@@ -1,4 +1,4 @@
-require 'em-hiredis'
+require 'eventmachine'
 require 'eventmachine_httpserver'
 require 'evma_httpserver/response'
 require 'erb'
@@ -26,8 +26,8 @@ module Rstatsd
       when '/stats'
         Rstatsd::Chart.new(@http_query_string).draw_chart do |chart|
           @chart = chart
-          google_chart = ERB.new(File.open('templates/google_chart.erb').read).result(binding)
-
+          google_chart = ERB.new(File.open('templates/google_chart.erb').read).
+            result(binding)
           response.content_type 'text/html'
           response.content = google_chart
           response.send_response

data/lib/rstatsd/version.rb

@@ -1,3 +1,3 @@
 module Rstatsd
-  VERSION = 0.2
+  VERSION = 0.3
 end

data/spec/rstatsd/collector_spec.rb

@@ -1,22 +1,18 @@
 require 'spec_helper'
 
 describe Rstatsd::Collector do
-  let(:hiredis) {
+  let(:redis) {
     stub.as_null_object
   }
 
-  let(:redis_result) {
-    redis_result = stub
-  }
-
   before do
-    EM::Hiredis.stub(:connect).and_return(hiredis)
+    Redis.stub(:new).and_return(redis)
   end
 
   context "receiving an increment packet 'crumdingler:1|c'" do
     it "should increment the counter stored at the keyname" do
       with_em_connection do
-        hiredis.should_receive(:incr).with('crumdingler').and_return(stub.as_null_object)
+        redis.should_receive(:incr).with('crumdingler').and_return(stub.as_null_object)
         Rstatsd::Collector.new(stub).receive_data('crumdingler:1|c')
       end
     end
@@ -24,9 +20,10 @@ describe Rstatsd::Collector do
     it "should rpush the counter value into redis" do
       with_em_connection do
         Timecop.freeze(Time.now) do
-          hiredis.should_receive(:incr).with('crumdingler').and_return(redis_result)
-          redis_result.should_receive(:callback).and_yield('1')
-          hiredis.should_receive(:rpush).with('counter:crumdingler', "1:#{Time.now.to_i}").and_return(stub.as_null_object)
+          redis.should_receive(:incr).with('crumdingler').and_return('1')
+          redis.should_receive(:rpush).
+            with('counter:crumdingler', "1:#{Time.now.to_i}").
+              and_return(stub.as_null_object)
           Rstatsd::Collector.new(stub).receive_data('crumdingler:1|c')
         end
       end
@@ -34,17 +31,15 @@ describe Rstatsd::Collector do
 
     it "should trim the overall size of the counter list to 10000 entries" do
       with_em_connection do
-        hiredis.should_receive(:ltrim).with('counter:crumdingler', 10000)
+        redis.should_receive(:ltrim).with('counter:crumdingler', -10000, -1)
         Rstatsd::Collector.new(stub).receive_data('crumdingler:1|c')
       end
     end
 
     it "should rpush the incremented value onto a list in the format counter:keyname" do
       with_em_connection do
-        redis_result.should_receive(:callback).and_yield('1')
-        hiredis.stub(:incr).and_return(redis_result)
-
-        hiredis.should_receive(:rpush).with('counter:crumdingler', anything)
+        redis.stub(:incr)
+        redis.should_receive(:rpush).with('counter:crumdingler', anything)
         Rstatsd::Collector.new(stub).receive_data('crumdingler:1|c')
       end
     end
@@ -56,17 +51,17 @@ describe Rstatsd::Collector do
   context "decrementing a value" do
     it "should decrement the counter stored at the keyname" do
       with_em_connection do
-        hiredis.should_receive(:incr).with('crumdingler').and_return(stub.as_null_object)
-        Rstatsd::Collector.new(stub).receive_data('crumdingler:1|c')
+        redis.should_receive(:decr).with('crumdingler')
+        Rstatsd::Collector.new(stub).receive_data('crumdingler:-1|c')
       end
     end
 
     it "should rpush the returned counter value into redis" do
       with_em_connection do
         Timecop.freeze(Time.now) do
-          hiredis.should_receive(:decr).with('crumdingler').and_return(redis_result)
-          redis_result.should_receive(:callback).and_yield('-1')
-          hiredis.should_receive(:rpush).with('counter:crumdingler', "-1:#{Time.now.to_i}").and_return(stub.as_null_object)
+          redis.stub(:decr).and_return('-1')
+          redis.should_receive(:rpush).
+            with('counter:crumdingler', "-1:#{Time.now.to_i}")
           Rstatsd::Collector.new(stub).receive_data('crumdingler:-1|c')
         end
       end
@@ -74,7 +69,7 @@ describe Rstatsd::Collector do
 
     it "should trim the overall size of the counter list to 10000 entries" do
       with_em_connection do
-        hiredis.should_receive(:ltrim).with('counter:crumdingler', 10000)
+        redis.should_receive(:ltrim).with('counter:crumdingler', -10000, -1)
         Rstatsd::Collector.new(stub).receive_data('crumdingler:-1|c')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rstatsd
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70137063792700 !ruby/object:Gem::Requirement
+  requirement: &70359047813080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137063792700
+  version_requirements: *70359047813080
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70137063792260 !ruby/object:Gem::Requirement
+  requirement: &70359047812660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137063792260
+  version_requirements: *70359047812660
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70137063791840 !ruby/object:Gem::Requirement
+  requirement: &70359047812240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137063791840
+  version_requirements: *70359047812240
 - !ruby/object:Gem::Dependency
   name: eventmachine_httpserver
-  requirement: &70137063791400 !ruby/object:Gem::Requirement
+  requirement: &70359047811820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137063791400
+  version_requirements: *70359047811820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70137063790980 !ruby/object:Gem::Requirement
+  requirement: &70359047811400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137063790980
+  version_requirements: *70359047811400
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70137063790560 !ruby/object:Gem::Requirement
+  requirement: &70359047810980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137063790560
+  version_requirements: *70359047810980
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
-  requirement: &70137063790140 !ruby/object:Gem::Requirement
+  requirement: &70359047810560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70137063790140
+  version_requirements: *70359047810560
 description: a stats daemon that stores data in redis
 email:
 - whoahbot@gmail.com
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: rstatsd is a simpler ruby implementaiton of statsd, storing the data in redis