fnordmetric 0.5.1 → 0.5.2

data/spec/app_spec.rb

@@ -21,6 +21,10 @@ describe "app" do
     @app ||= FnordMetric::App.new({
       :foospace => proc{        
         widget 'Blubb', nil
+
+        gauge :testgauge, :tick => 1.hour.to_i, :progressive => true
+        gauge :test3gauge, :tick => 1.hour.to_i, :three_dimensional => true
+
       }
     }, @opts)
   end
@@ -407,14 +411,70 @@ describe "app" do
     	#FnordMetric::Event.last.blubb.should == 42.23
     end
 
+  end
 
+  describe "gauges api" do
 
+    before(:all) do
+      @redis.keys("fnordmetric-foospace*").each { |k| @redis.del(k) }  
+      gauge_key = "fnordmetric-foospace-gauge-testgauge-#{1.hour.to_i}"
+      @redis.hset(gauge_key, 1323687600, "18")  
+      @redis.hset(gauge_key, 1323691200, "23")
+    end
 
-  end
+    it "should return the right answer for: /metric/:name?at=timestamp" do      
+      get "/foospace/gauge/testgauge?at=1323691205"
+      JSON.parse(last_response.body).first.last.to_i.should == 23
+    end
+
+    it "should return the right answer for: /metric/:name?at=timestamp" do      
+      get "/foospace/gauge/testgauge?at=1323691200"
+      JSON.parse(last_response.body).first.last.to_i.should == 23
+    end
+
+    it "should return the right answer for: /metric/:name?at=timestamp-timstamp" do  
+      get "/foospace/gauge/testgauge?at=1323691200-1323691205"
+      JSON.parse(last_response.body).first.last.to_i.should == 18
+    end
+
+    it "should return the right answer for: /metric/:name?at=timestamp-timstamp" do  
+      get "/foospace/gauge/testgauge?at=1323691201-1323695205"
+      JSON.parse(last_response.body).keys.length
+    end
+
+    it "should return the right answer for: /metric/:name?at=timestamp-timstamp" do  
+      get "/foospace/gauge/testgauge?at=1323691199-1323701201"
+      JSON.parse(last_response.body).keys.length.should == 4
+      JSON.parse(last_response.body)["1323687600"].to_i.should == 18
+      JSON.parse(last_response.body)["1323691200"].to_i.should == 23
+    end
+
+    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&sum=true" do  
+      get "/foospace/gauge/testgauge?at=1323691199-1323701201&sum=true"
+      JSON.parse(last_response.body).keys.length.should == 1
+      JSON.parse(last_response.body)["sum"].to_i.should == 18+23
+    end
 
-  describe "metrics api" do
-    # copy from _spec/app_spec.rb ?
   end
 
+  describe "three-dim gauges api" do
+
+    before(:all) do
+      @redis.keys("fnordmetric-foospace*").each { |k| @redis.del(k) }  
+      gauge_key = "fnordmetric-foospace-gauge-test3gauge-#{1.hour.to_i}-1323691200"
+      @redis.zadd(gauge_key, 18, "fnordyblubb")  
+      @redis.zadd(gauge_key, 23, "uberfoo")  
+      @redis.set(gauge_key+"-count", 41)
+    end
+
+    it "should return the right answer for: /metric/:name?at=timestamp" do      
+      get "/foospace/gauge/test3gauge?at=1323691205"
+      JSON.parse(last_response.body)["count"].to_i.should == 41
+      JSON.parse(last_response.body)["values"].length.should == 2
+      JSON.parse(last_response.body)["values"][0].should == ["uberfoo", "23"]
+      JSON.parse(last_response.body)["values"][1].should == ["fnordyblubb", "18"]
+    end
+
+  end
 
 end

data/spec/gauge_modifiers_spec.rb

@@ -153,6 +153,28 @@ describe FnordMetric::GaugeModifiers do
 
   end
 
+  describe "increment an average-gauge" do
+
+    it "should increment_unique a non-progressive gauge" do  
+      gauge_key = "fnordmetrics-myns-gauge-mygauge_917-10"    
+      @redis.hset(gauge_key, "695280200", "54")
+      @redis.set(gauge_key+"-695280200-value-count", 5)
+      create_gauge_context({
+        :key => "mygauge_917", 
+        :average => true,
+        :tick => 10
+      }, proc{ 
+        incr(:mygauge_917, 30)  
+      }).tap do |context|      
+        event = { :_time => @now, :_session_key => "mysesskey" }
+        context.call(event, @redis_wrap)
+      end
+      @redis.hget(gauge_key, "695280200").should == "84"
+      @redis.get(gauge_key+"-695280200-value-count").should == "6"
+    end
+
+  end
+
   describe "increment uniquely by session_key" do
 
     it "should increment_unique a non-progressive gauge" do  
@@ -257,8 +279,141 @@ describe FnordMetric::GaugeModifiers do
 
   end
 
-  it "should increment a field on a three-dimensional gauge by 1"
-  it "should increment a field on a three-dimensional gauge by 5"
+describe "increment three-dimensional gagues" do
+
+    it "should increment a three-dim gauge by 1" do
+      gauge_key = "fnordmetrics-myns-gauge-mygauge_434-10-695280200"
+      @redis.zadd(gauge_key, 12, "whoopwhoop")  
+      create_gauge_context({
+        :key => "mygauge_434", 
+        :three_dimensional => true,
+        :tick => 10,
+      }, proc{ 
+        incr_field(:mygauge_434, "whoopwhoop", 1)  
+      }).tap do |context|      
+        event = { :_time => @now }
+        context.call(event, @redis_wrap)
+      end
+      @redis.zscore(gauge_key, "whoopwhoop").should == "13"
+      @redis.get(gauge_key+"-count").should == "1"
+    end
+
+    it "should increment a three-dim gauge by 5 on an empty field" do
+      gauge_key = "fnordmetrics-myns-gauge-mygauge_634-10-695280200"
+      @redis.set(gauge_key+"-count", 6)
+      create_gauge_context({
+        :key => "mygauge_634", 
+        :three_dimensional => true,
+        :tick => 10,
+      }, proc{ 
+        incr_field(:mygauge_634, "whoopwhoop", 5)  
+      }).tap do |context|      
+        event = { :_time => @now }
+        context.call(event, @redis_wrap)
+      end
+      @redis.zscore(gauge_key, "whoopwhoop").should == "5"
+      @redis.get(gauge_key+"-count").should == "7"
+    end
+
+    it "should increment a three-dim gauge by event supplied field" do
+      gauge_key = "fnordmetrics-myns-gauge-mygauge_634-10-695280200"
+      @redis.zadd(gauge_key, 11, "fnordybar")  
+      create_gauge_context({
+        :key => "mygauge_634", 
+        :three_dimensional => true,
+        :tick => 10,
+      }, proc{ 
+        incr_field(:mygauge_634, data[:myfield], 5)  
+      }).tap do |context|      
+        event = { :_time => @now, :myfield => "fnordybar" }
+        context.call(event, @redis_wrap)
+      end
+      @redis.zscore(gauge_key, "fnordybar").should == "16"
+    end
+
+    it "should increment_unique a three-dim gauge" do  
+      gauge_key = "fnordmetrics-myns-gauge-mygauge_1263-10-695280200"    
+      @redis.zadd(gauge_key, 54, "mykey")
+      @redis.set(gauge_key+"-sessions-count", 5)
+      create_gauge_context({
+        :key => "mygauge_1263", 
+        :tick => 10,
+        :unique => true,
+        :three_dimensional => true
+      }, proc{ 
+        incr_field(:mygauge_1263, "mykey", 30)  
+      }).tap do |context|      
+        event = { :_time => @now, :_session_key => "mysesskey" }
+        context.call(event, @redis_wrap)
+      end
+      @redis.zscore(gauge_key, "mykey").should == "84"
+      @redis.get(gauge_key+"-sessions-count").should == "6"
+      @redis.smembers(gauge_key+"-sessions").should == ["mysesskey"]
+    end
+
+    it "should not increment_unique a non-progressive gauge if session is known" do  
+      gauge_key = "fnordmetrics-myns-gauge-mygauge_1266-695280200"    
+      @redis.zadd(gauge_key, 54, "otherkey")
+      @redis.set(gauge_key+"-sessions-count", 5)
+      @redis.sadd(gauge_key+"-sessions", "mysesskey")
+      create_gauge_context({
+        :key => "mygauge_1266", 
+        :tick => 10,
+        :unique => true,
+        :three_dimensional => true
+      }, proc{ 
+        incr_field(:mygauge_1266, "otherkey", 30)  
+      }).tap do |context|      
+        event = { :_time => @now, :_session_key => "mysesskey" }
+        context.call(event, @redis_wrap)
+      end
+      @redis.zscore(gauge_key, "otherkey").should == "54"
+      @redis.get(gauge_key+"-sessions-count").should == "5"
+      @redis.smembers(gauge_key+"-sessions").should == ["mysesskey"]
+    end
+
+  end
+
+  describe "set value on two/three-dim gauge" do
+
+    it "should set a value on a two-dim gauge" do  
+      gauge_key = "fnordmetrics-myns-gauge-mygauge_5463-10"    
+      @redis.hset(gauge_key, "695280200", "54")
+      @redis.set(gauge_key+"-695280200-sessions-count", 5)
+      @redis.hget(gauge_key, "695280200").should == "54"
+      create_gauge_context({
+        :key => "mygauge_5463",
+        :tick => 10
+      }, proc{ 
+        set_value(:mygauge_5463, 17)  
+      }).tap do |context|      
+        event = { :_time => @now, :_session_key => "mysesskey" }
+        context.call(event, @redis_wrap)
+      end
+      @redis.hget(gauge_key, "695280200").should == "17"
+    end
+
+
+    it "should set a value on a two-dim gauge" do  
+      gauge_key = "fnordmetrics-myns-gauge-mygauge_1463-10-695280200"
+      @redis.zadd(gauge_key, 65, "asdasdkey")
+      @redis.zscore(gauge_key, "asdasdkey").should == "65"
+      create_gauge_context({
+        :key => "mygauge_1463",
+        :three_dimensional => true,
+        :tick => 10
+      }, proc{ 
+        set_field(:mygauge_1463, "asdasdkey", 23)  
+      }).tap do |context|      
+        event = { :_time => @now, :_session_key => "mysesskey" }
+        context.call(event, @redis_wrap)
+      end
+      @redis.zscore(gauge_key, "asdasdkey").should == "23"
+    end
+
+  end
+
+
   it "should raise an error if incr_field is called on a 2d gauge"
 
 private

data/spec/gauge_spec.rb

@@ -12,11 +12,21 @@ describe FnordMetric::Gauge do
     @redis.keys("fnordmetric-myns*").each { |k| @redis.del(k) }  
   end
 
-  it "should remember it's own name" do
+  it "should remember its own name" do
     gauge = FnordMetric::Gauge.new({:key_prefix => "foo", :key => "fnordgauge"}) 
     gauge.name.should == "fnordgauge"
   end
 
+  it "should return its key as title if none specified" do
+    gauge = FnordMetric::Gauge.new({:key_prefix => "foo", :key => "fnordgauge"}) 
+    gauge.title.should == "fnordgauge"
+  end
+
+  it "should return its title as title if none specified" do
+    gauge = FnordMetric::Gauge.new({:key_prefix => "foo", :key => "fnordgauge", :title => "Fnord Gauge"}) 
+    gauge.title.should == "Fnord Gauge"
+  end
+
   it "should raise an error when initialize without key" do
   	lambda{ 
 	    FnordMetric::Gauge.new({:key_prefix => "foo"}) 
@@ -41,9 +51,15 @@ describe FnordMetric::Gauge do
 
   describe "ticks" do
 
-    it "should return the correct tick if configured"
-    it "should return the default tick if none configured"
+    it "should return the correct tick if configured" do
+      gauge = FnordMetric::Gauge.new({:tick => 23, :key_prefix => "fnordmetrics-myns", :key => "mygauge"})
+      gauge.tick.should == 23
+    end
 
+    it "should return the default tick if none configured" do
+      gauge = FnordMetric::Gauge.new({:key_prefix => "fnordmetrics-myns", :key => "mygauge"})
+      gauge.tick.should == 3600
+    end
 
     it "should return the correct tick_at" do
       gauge = FnordMetric::Gauge.new({:tick => 10, :key_prefix => "fnordmetrics-myns", :key => "mygauge"})
@@ -81,8 +97,30 @@ describe FnordMetric::Gauge do
     end
 
     it "should return the correct value_at per session" do
+      @redis.hset(@gauge_key, "695280200", "76")
       @redis.set(@gauge_key+"-695280200-sessions-count", "23")
-      @gauge.value_at(@now, :avg_per_session => 1).should == (54.0/23.0)
+      _gauge = FnordMetric::Gauge.new({
+        :tick => 10, 
+        :key_prefix => "fnordmetric-myns", 
+        :key => "mygauge_966",
+        :unique => true,
+        :redis => @redis
+      })
+      _gauge.value_at(@now).should == "76"
+    end
+
+    it "should return the correct value_at per session with avg" do
+      @redis.hset(@gauge_key, "695280200", "76")
+      @redis.set(@gauge_key+"-695280200-sessions-count", "23")
+      _gauge = FnordMetric::Gauge.new({
+        :tick => 10, 
+        :key_prefix => "fnordmetric-myns", 
+        :key => "mygauge_966",
+        :unique => true,
+        :average => true,
+        :redis => @redis
+      })
+      _gauge.value_at(@now).should == (76.0/23.0)
     end
 
     it "should receive gauge values for multiple ticks" do
@@ -95,7 +133,33 @@ describe FnordMetric::Gauge do
     it "should receive gauge values per session for multiple ticks" do  
       @redis.set(@gauge_key+"-695280200-sessions-count", "23")
       @redis.set(@gauge_key+"-695280210-sessions-count", "8")
-      @gauge.values_at([@now, @now+8], :avg_per_session => 1).should == {
+      @redis.hset(@gauge_key, "695280200", "76")
+      @redis.hset(@gauge_key, "695280210", "56")
+      _gauge = FnordMetric::Gauge.new({
+        :tick => 10, 
+        :key_prefix => "fnordmetric-myns", 
+        :key => "mygauge_966",
+        :unique => true,
+        :redis => @redis
+      })
+      _gauge.values_at([@now, @now+8]).should == {
+        695280200 => "76",
+        695280210 => "56"
+      }
+    end
+
+    it "should receive gauge values per session for multiple ticks with avg" do  
+      @redis.set(@gauge_key+"-695280200-sessions-count", "23")
+      @redis.set(@gauge_key+"-695280210-sessions-count", "8")
+      _gauge = FnordMetric::Gauge.new({
+        :tick => 10, 
+        :key_prefix => "fnordmetric-myns", 
+        :key => "mygauge_966",
+        :unique => true,
+        :average => true,
+        :redis => @redis
+      })
+      _gauge.values_at([@now, @now+8]).should == {
         695280200 => (54.0/23.0),
         695280210 => (123.0/8.0)
       }
@@ -111,18 +175,85 @@ describe FnordMetric::Gauge do
     end
 
     it "should receive gauge values for all ticks in a given range" do
-      @gauge.values_in(@now..@now+8).should == {
+      @gauge.values_in(@now+10..@now+18).should == {
         695280200 => "54",
         695280210 => "123"
       }
-      @gauge.values_in(@now..@now+6).should == {
-        695280200 => "54"
-      }
-      @gauge.values_in(@now+8..@now+10).should == {
-        695280210 => "123"
-      }
     end
 
   end
   
+  describe "three-dim value retrival" do
+
+    before(:each) do
+      @gauge = FnordMetric::Gauge.new({
+        :tick => 10, 
+        :key_prefix => "fnordmetric-myns", 
+        :three_dimensional => true,
+        :key => "mygauge_966",
+        :redis => @redis
+      })
+      @redis.keys("fnordmetric-myns*").each { |k| @redis.del(k) }  
+      @gauge_key = "fnordmetric-myns-gauge-mygauge_966-10-1323691200"
+      @redis.zadd(@gauge_key, 18, "fnordyblubb")  
+      @redis.zadd(@gauge_key, 23, "uberfoo")  
+      @redis.set(@gauge_key+"-count", 41)
+    end
+
+    it "should retrieve field_values at a given time" do
+      @gauge.field_values_at(1323691200).should be_a(Array)
+      @gauge.field_values_at(1323691200).length.should == 2
+      @gauge.field_values_at(1323691200)[0].should == ["uberfoo", "23"]
+      @gauge.field_values_at(1323691200)[1].should == ["fnordyblubb", "18"]
+    end
+
+    it "should retrieve the correct total count" do
+      @gauge.field_values_total(1323691200).should == 41
+    end
+
+    it "should retrieve max 50 fields per default" do
+      70.times{ |n| @redis.zadd(@gauge_key, 23, "field#{n}") }
+      @gauge.field_values_at(1323691200).should be_a(Array)
+      @gauge.field_values_at(1323691200).length.should == 50
+    end
+
+    it "should retrieve more than 50 fields if requested" do
+      70.times{ |n| @redis.zadd(@gauge_key, 23, "field#{n}") }
+      @gauge.field_values_at(1323691200, :max_fields => 60).should be_a(Array)
+      @gauge.field_values_at(1323691200, :max_fields => 60).length.should == 60
+    end
+
+    it "should retrieve all fields if requested" do
+      70.times{ |n| @redis.zadd(@gauge_key, 23, "field#{n}") }
+      @gauge.field_values_at(1323691200, :max_fields => 0).should be_a(Array)
+      @gauge.field_values_at(1323691200, :max_fields => 0).length.should == 72
+    end
+
+    it "should call the value calculation block and return the result" do
+      vals = @gauge.field_values_at(1323691200){ |v| v.to_i + 123 }
+      vals.should be_a(Array)
+      vals.length.should == 2
+      vals[0].should == ["uberfoo", 146]
+      vals[1].should == ["fnordyblubb", 141]
+    end
+
+    it "should return the correct field_values per session with avg" do
+      @redis.set(@gauge_key+"-sessions-count", "3")
+      @gauge = FnordMetric::Gauge.new({
+        :tick => 10, 
+        :key_prefix => "fnordmetric-myns", 
+        :three_dimensional => true,
+        :unique => true,
+        :average => true,
+        :key => "mygauge_966",
+        :redis => @redis
+      })
+      vals = @gauge.field_values_at(1323691200)
+      vals.should be_a(Array)
+      vals.length.should == 2
+      vals[0].should == ["uberfoo", 23/3.0]
+      vals[1].should == ["fnordyblubb", 18/3.0]
+    end
+
+  end
 end