right_support 2.8.21 → 2.8.22

data/VERSION

@@ -1 +1 @@
-2.8.21
+2.8.22

data/lib/right_support/stats/activity.rb

@@ -66,7 +66,6 @@ module RightSupport::Stats
 
     # Mark the start of an activity and update counts and average rate
     # with weighting toward past activity
-    # Ignore the update if its type contains "stats"
     #
     # @param type [String, Symbol] Type of activity, with anything that is not a symbol, true, or false
     #   automatically converted to a String and truncated to MAX_TYPE_SIZE characters; defaults to nil
@@ -75,20 +74,18 @@ module RightSupport::Stats
     # @return [Time] Update time
     def update(type = nil, id = nil)
       now = Time.now
-      if type.nil? || type !~ /stats/
-        @interval = average(@interval, now - @last_start_time) if @measure_rate
-        @last_start_time = now
-        @total += 1
-        unless type.nil?
-          unless [Symbol, TrueClass, FalseClass].include?(type.class)
-            type = type.inspect unless type.is_a?(String)
-            type = type[0, MAX_TYPE_SIZE - 3] + "..." if type.size > (MAX_TYPE_SIZE - 3)
-          end
-          @count_per_type[type] = (@count_per_type[type] || 0) + 1
+      @interval = average(@interval, now - @last_start_time) if @measure_rate
+      @last_start_time = now
+      @total += 1
+      unless type.nil?
+        unless [Symbol, TrueClass, FalseClass].include?(type.class)
+          type = type.inspect unless type.is_a?(String)
+          type = type[0, MAX_TYPE_SIZE - 3] + "..." if type.size > (MAX_TYPE_SIZE - 3)
         end
-        @last_type = type
-        @last_id = id
+        @count_per_type[type] = (@count_per_type[type] || 0) + 1
       end
+      @last_type = type
+      @last_id = id
       now
     end
 
@@ -127,17 +124,13 @@ module RightSupport::Stats
     end
 
     # Convert average interval to average rate
+    # Adjust interval before computing average to take into account when last activity occurred
     #
     # @return [Float, NilClass] Recent average rate, or nil if total is 0
     def avg_rate
-      if @total > 1
-        @interval == 0.0 ? 0.0 : 1.0 / @interval
-      elsif @total == 1
-        0.0
-      end
+      1.0 / average(@interval, Time.now - @last_start_time) if @measure_rate && @total > 0
     end
 
-
     # Get average duration of activity
     #
     # @return [Float, NilClass] Average duration in seconds of activity weighted

data/right_support.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{right_support}
-  s.version = "2.8.21"
+  s.version = "2.8.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
-  s.date = %q{2014-04-04}
+  s.date = %q{2014-04-07}
   s.description = %q{A toolkit of useful, reusable foundation code created by RightScale.}
   s.email = %q{support@rightscale.com}
   s.extra_rdoc_files = [

data/spec/stats/activity_spec.rb

@@ -74,16 +74,6 @@ describe RightSupport::Stats::Activity do
       @stats.instance_variable_get(:@count_per_type).should == {"test" => 1}
     end
 
-    it "doesn't update counts when type contains 'stats'" do
-      flexmock(Time).should_receive(:now).and_return(1000010)
-      @stats.update("my stats")
-      @stats.instance_variable_get(:@interval).should == 0.0
-      @stats.instance_variable_get(:@last_start_time).should == @now
-      @stats.instance_variable_get(:@avg_duration).should be_nil
-      @stats.instance_variable_get(:@total).should == 0
-      @stats.instance_variable_get(:@count_per_type).should == {}
-    end
-
     it "limits length of type string when submitting update" do
       flexmock(Time).should_receive(:now).and_return(1000010)
       @stats.update("test 12345678901234567890123456789012345678901234567890123456789")
@@ -184,17 +174,28 @@ describe RightSupport::Stats::Activity do
       flexmock(Time).should_receive(:now).and_return(1000020, 1000042)
       @stats.avg_rate.should be_nil
       @stats.update
-      @stats.update
-      @stats.instance_variable_get(:@interval).should == 4.0
+      @stats.instance_variable_get(:@interval).should == 2.0
       @stats.avg_rate.should == 0.25
     end
 
-    it "does not convert interval to rate if there is only one event" do
-      flexmock(Time).should_receive(:now).and_return(1000020)
+    it "adjusts rate based on interval since last event" do
+      flexmock(Time).should_receive(:now).and_return(1000020, 1000042, 1000086)
       @stats.avg_rate.should be_nil
       @stats.update
-      @stats.instance_variable_get(:@interval).should == 2.0
-      @stats.avg_rate.should == 0.0
+      @stats.update
+      @stats.instance_variable_get(:@interval).should == 4.0
+      @stats.avg_rate.should == 0.125
+    end
+
+    it "does not compute average unless measuring rate is enabled" do
+      @stats = RightSupport::Stats::Activity.new(false)
+      flexmock(Time).should_receive(:now).and_return(1000010)
+      @stats.update
+      @stats.avg_rate.should be_nil
+    end
+
+    it "does not compute average if there have been no events" do
+      @stats.avg_rate.should be_nil
     end
   end
 
@@ -243,9 +244,9 @@ describe RightSupport::Stats::Activity do
 
   context :all do
     it "returns all activity aspects that were measured except duration" do
-      flexmock(Time).should_receive(:now).and_return(1000010)
+      flexmock(Time).should_receive(:now).and_return(1000020, 1000042)
       @stats.update
-      @stats.all.should == {"last" => {"elapsed" => 0}, "total" => 1, "rate" => 0.0}
+      @stats.all.should == {"last" => {"elapsed" => 22}, "total" => 1, "rate" => 0.25}
     end
 
     it "excludes rate if it is not being measured" do

data/spec/stats/helpers_spec.rb

@@ -336,7 +336,7 @@ describe RightSupport::Stats do
                        "                                 (1) Mon Jan 12 #{@hr}:46:40 Exception: Test error\n" +
                        "             heartbeat         : 60 sec\n" +
                        "             returns           : no queue consumers: 67%, no queue: 33%, total: 3, \n" +
-                       "                                 last: no queue consumers (10 sec ago), rate: 0/sec\n"
+                       "                                 last: no queue consumers (10 sec ago), rate: 1.0/sec\n"
     end
   end
 
@@ -350,7 +350,7 @@ describe RightSupport::Stats do
       activity.update("more testing")
       flexmock(Time).should_receive(:now).and_return(1000010)
       @helpers.activity_str(activity.all).should == "more testing: 75%, testing: 25%, total: 4, last: more testing (10 sec ago), " +
-                                                    "rate: 0/sec"
+                                                    "rate: 1.0/sec"
     end
 
     it 'converts last activity stats to string' do
@@ -496,7 +496,7 @@ describe RightSupport::Stats do
       result = @helpers.sub_stats_str("my sub-stats", stats, :name_width => 13, :sub_stat_value_width => 60)
       result.should == "my sub-stats  : activity1 %       : none\n" +
                        "                activity1 last    : none\n" +
-                       "                activity2 %       : more testing: 75%, testing: 25%, total: 4\n" +
+                       "                activity2 %       : more testing: 60%, testing: 20%, stats: 20%, total: 5\n" +
                        "                activity2 last    : more testing: 46 min 40 sec ago\n" +
                        "                activity3 last    : testing forever: 46 min 40 sec ago and still active\n" +
                        "                empty_hash        : none\n" +

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 2
   - 8
-  - 21
-  version: 2.8.21
+  - 22
+  version: 2.8.22
 platform: ruby
 authors: 
 - Tony Spataro
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-04 00:00:00 -07:00
+date: 2014-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency