fnordmetric 1.2.4 → 1.2.6

data/lib/fnordmetric/enterprise/compatibility_handler.rb

@@ -8,7 +8,7 @@ module FnordMetric::Enterprise
       next
     end
 
-    if m = cmd.match(/^SAMPLE (.*)(delta|mean)-([0-9]+) ([0-9]+)$/)
+    if m = cmd.match(/^SAMPLE (.*)(delta|mean|sum)-([0-9]+) ([0-9]+)$/)
       gauge_type = m[2].to_sym
       gauge_tick = m[3].to_i
       gauge_key = :"#{m[1]}#{gauge_type}-#{gauge_tick}"
@@ -29,7 +29,7 @@ module FnordMetric::Enterprise
 
     case gauge_type
 
-      when :delta
+      when :delta, :sum
         incr gauge, op_value
 
       when :mean

data/lib/fnordmetric/gauge_calculations.rb

@@ -21,17 +21,18 @@ module FnordMetric::GaugeCalculations
     ticks << tick_at(range.last) if ticks.size == 0
     values_at(ticks)
   end
-  
+
   def value_at(time, opts={}, &block)
     _t = tick_at(time)
 
     _v = if respond_to?(:_value_at)
       _value_at(key, _t)
     else
+      _c = sync_redis.hget(key(:"mean-counts"), _t)
       sync_redis.hget(key, _t)
     end
 
-    calculate_value(_v, _t, opts, block)
+    calculate_value(_v, _t, opts, block, _c)
   end
 
   def values_at(times, opts={}, &block)
@@ -40,20 +41,22 @@ module FnordMetric::GaugeCalculations
       if respond_to?(:_values_at)
         _values_at(times, opts={}, &block)
       else
+        ret_counts = sync_redis.hmget(key(:"mean-counts"), *times)
         sync_redis.hmget(key, *times)
       end.each_with_index do |_v, _n|
         _t = times[_n]
-        ret[_t] = calculate_value(_v, _t, opts, block)
+        _c = ret_counts ? ret_counts[_n] : nil
+        ret[_t] = calculate_value(_v, _t, opts, block, _c)
       end
     end
   end
 
-  def calculate_value(_v, _t, opts, block)
-    block = @@avg_per_count_proc if average?
-    #block = @@count_per_session_proc if unique?
+  def calculate_value(_v, _t, opts, block, _c = nil)
     block = @@avg_per_session_proc if unique? && average?
 
-    calc = if block
+    calc = if average? && _c
+      (_v.to_f / (_c||1).to_i)
+    elsif block
       instance_exec(_v, _t, &block)
     else
       _v

data/lib/fnordmetric/gauge_modifiers.rb

@@ -40,7 +40,7 @@ module FnordMetric::GaugeModifiers
   end
 
   def incr_avg(gauge, value)
-    @redis.incr(gauge.tick_key(time, :"value-count")).callback do
+    @redis.hincrby(gauge.key(:"mean-counts"), gauge.tick_at(time), 1).callback do
       incr_tick(gauge, value)
     end
   end

data/lib/fnordmetric/version.rb

@@ -1,3 +1,3 @@
 module FnordMetric
-  VERSION = "1.2.4"
+  VERSION = "1.2.6"
 end

data/lib/fnordmetric/web/reactor.rb

@@ -2,7 +2,13 @@ class FnordMetric::Reactor
 
   def initialize
     @redis = FnordMetric.mk_redis
-    @namespaces = FnordMetric.namespaces
+    @namespaces = FnordMetric.namespaces.dup
+  end
+
+  def ready!
+    @namespaces.each do |key, ns|
+      ns.ready!(@redis)
+    end
   end
 
   def execute(*args)

data/lib/fnordmetric/web/websocket.rb

@@ -13,7 +13,7 @@ class FnordMetric::WebSocket < Rack::WebSocket::Application
   end
 
   def on_open(env)
-    # socket openened :)
+    @reactor.ready!
   end
 
   def on_message(env, message)

data/spec/gauge_modifiers_spec.rb

@@ -311,19 +311,19 @@ describe FnordMetric::GaugeModifiers 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)
+      @redis.hset(gauge_key + "-mean-counts", "695280200", "5")
       create_gauge_context({
-        :key => "mygauge_917", 
+        :key => "mygauge_917",
         :average => true,
         :tick => 10
       }, proc{ 
-        incr(:mygauge_917, 30)  
-      }).tap do |context|      
+        incr(:mygauge_917, 30)
+      }).tap do |context|
         event = { :_time => @now, :_session_key => "mysesskey" }
         context.call(event, @redis_wrap, @namespace)
       end
       @redis.hget(gauge_key, "695280200").should == "84"
-      @redis.get(gauge_key+"-695280200-value-count").should == "6"
+      @redis.hget(gauge_key + "-mean-counts", "695280200").should == "6"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fnordmetric
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &19052860 !ruby/object:Gem::Requirement
+  requirement: &21703020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *19052860
+  version_requirements: *21703020
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &19051780 !ruby/object:Gem::Requirement
+  requirement: &21702480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *19051780
+  version_requirements: *21702480
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &19145540 !ruby/object:Gem::Requirement
+  requirement: &21702100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19145540
+  version_requirements: *21702100
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &19144880 !ruby/object:Gem::Requirement
+  requirement: &21701540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *19144880
+  version_requirements: *21701540
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &19144380 !ruby/object:Gem::Requirement
+  requirement: &21718000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *19144380
+  version_requirements: *21718000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &19143980 !ruby/object:Gem::Requirement
+  requirement: &21717440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19143980
+  version_requirements: *21717440
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &19143460 !ruby/object:Gem::Requirement
+  requirement: &21716580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19143460
+  version_requirements: *21716580
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &19143020 !ruby/object:Gem::Requirement
+  requirement: &21716120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19143020
+  version_requirements: *21716120
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &19142600 !ruby/object:Gem::Requirement
+  requirement: &21715600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19142600
+  version_requirements: *21715600
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &19142180 !ruby/object:Gem::Requirement
+  requirement: &21714860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19142180
+  version_requirements: *21714860
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &19141720 !ruby/object:Gem::Requirement
+  requirement: &21714300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19141720
+  version_requirements: *21714300
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &19141140 !ruby/object:Gem::Requirement
+  requirement: &21713440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *19141140
+  version_requirements: *21713440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &19140660 !ruby/object:Gem::Requirement
+  requirement: &21712940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19140660
+  version_requirements: *21712940
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &19140000 !ruby/object:Gem::Requirement
+  requirement: &21712360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19140000
+  version_requirements: *21712360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19138360 !ruby/object:Gem::Requirement
+  requirement: &21711640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *19138360
+  version_requirements: *21711640
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &19137900 !ruby/object:Gem::Requirement
+  requirement: &21710960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19137900
+  version_requirements: *21710960
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
 email:
 - paul@paulasmuth.com