right_support 2.7.0 → 2.8.0

data/Gemfile

@@ -23,7 +23,7 @@ group :development do
   gem "ruby-debug", ">= 0.10", :platforms => :ruby_18
   gem "ruby-debug19", ">= 0.11.6", :platforms => :ruby_19
   gem "rdoc", ">= 2.4.2"
-  gem "flexmock", "~> 0.8"
+  gem "flexmock", "~> 1.0"
   gem "syntax", "~> 1.0.0" #rspec will syntax-highlight code snippets if this gem is available
   gem "nokogiri", "~> 1.5"
 end

data/Gemfile.lock

@@ -1,16 +1,16 @@
 GIT
   remote: git@github.com:rightscale/right_develop.git
-  revision: baabb68c392e1afdbff7d6cc21d87f9b1cdb2db6
+  revision: dedba69a68e8b56cc88db7d6dc518d42747b0586
   branch: master
   specs:
-    right_develop (1.1.0)
+    right_develop (1.2.2)
       actionpack (>= 2.3.0, < 4.0)
       builder (~> 3.0)
       cucumber (~> 1.0)
       rake (>= 0.8.7, < 0.10)
       right_support (~> 2.0)
       rspec (>= 1.3, < 3.0)
-      trollop (~> 1.0)
+      trollop (>= 1.0, < 3.0)
 
 GEM
   remote: http://rubygems.org/
@@ -21,16 +21,17 @@ GEM
     activesupport (2.3.18)
     addressable (2.2.8)
     archive-tar-minitar (0.5.2)
-    builder (3.2.0)
+    builder (3.2.2)
     columnize (0.3.6)
-    cucumber (1.2.5)
+    cucumber (1.3.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.7)
-      multi_json (~> 1.3)
-    diff-lcs (1.2.2)
-    flexmock (0.9.0)
-    gherkin (2.11.8)
+      gherkin (~> 2.12.0)
+      multi_json (~> 1.7.5)
+      multi_test (~> 0.0.1)
+    diff-lcs (1.2.4)
+    flexmock (1.3.2)
+    gherkin (2.12.0)
       multi_json (~> 1.3)
     git (1.2.5)
     jeweler (1.8.4)
@@ -46,7 +47,8 @@ GEM
     macaddr (1.6.1)
       systemu (~> 2.5.0)
     mime-types (1.22)
-    multi_json (1.7.2)
+    multi_json (1.7.7)
+    multi_test (0.0.1)
     net-ssh (2.6.6)
     nokogiri (1.5.9)
     rack (1.1.6)
@@ -56,15 +58,15 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    right_support (2.6.17)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    right_support (2.7.0)
+    rspec (2.14.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.0)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -83,7 +85,7 @@ GEM
     simple_uuid (0.3.0)
     syntax (1.0.0)
     systemu (2.5.2)
-    trollop (1.16.2)
+    trollop (2.0)
     uuid (2.3.7)
       macaddr (~> 1.0)
     uuidtools (2.1.3)
@@ -94,7 +96,7 @@ PLATFORMS
 
 DEPENDENCIES
   addressable (~> 2.2.7)
-  flexmock (~> 0.8)
+  flexmock (~> 1.0)
   jeweler (~> 1.8.3)
   net-ssh (~> 2.0)
   nokogiri (~> 1.5)

data/Rakefile

@@ -45,7 +45,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 require 'jeweler'
-Jeweler::Tasks.new do |gem|
+tasks = Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification; see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "right_support"
   gem.homepage = "https://github.com/rightscale/right_support"
@@ -55,6 +55,11 @@ Jeweler::Tasks.new do |gem|
   gem.email = "support@rightscale.com"
   gem.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Alexey Karpik', 'Scott Messier']
 end
+
+# Never auto-commit during operations that change the repository. Allows developers to decide on their own commit comment
+# and/or aggregate version bumps into other fixes.
+tasks.jeweler.commit = false
+
 Jeweler::RubygemsDotOrgTasks.new
 
 CLEAN.include('pkg')

data/VERSION

@@ -1 +1 @@
-2.7.0
+2.8.0

data/lib/right_support/net/request_balancer.rb

@@ -233,7 +233,7 @@ module RightSupport::Net
       loop do
         if n > 0
           do_retry = @options[:retry] || DEFAULT_RETRY_PROC
-          do_retry = do_retry.call(@ips || @endpoints, n) if do_retry.respond_to?(:call)
+          do_retry = do_retry.call((@ips.nil? || @ips.empty?) ? @endpoints : @ips, n) if do_retry.respond_to?(:call)
           break if (do_retry.is_a?(Integer) && n >= do_retry) || [nil, false].include?(do_retry)
         end
 
@@ -370,7 +370,7 @@ module RightSupport::Net
       @resolved_hostnames = RightSupport::Net::DNS.resolve_with_hostnames(@endpoints)
       resolved_endpoints = []
       @resolved_hostnames.each_value{ |v| resolved_endpoints.concat(v) }
-      logger.info("RequestBalancer: resolved #{@endpoints.inspect} to #{resolved_endpoints.inspect}")
+      logger.info("RequestBalancer: resolved #{@endpoints.inspect} to #{resolved_endpoints.inspect}") if resolved_endpoints != @ips
       @ips = resolved_endpoints
       @policy.set_endpoints(@ips)
       @resolved_at = Time.now.to_i

data/lib/right_support/stats/activity.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2012 RightScale Inc
+# Copyright (c) 2009-2013 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -44,8 +44,7 @@ module RightSupport::Stats
 
     # Initialize activity data
     #
-    # === Parameters
-    # measure_rate(Boolean):: Whether to measure activity rate
+    # @param measure_rate [Boolean] Whether to measure activity rate
     def initialize(measure_rate = true)
       @measure_rate = measure_rate
       reset
@@ -53,8 +52,7 @@ module RightSupport::Stats
 
     # Reset statistics
     #
-    # === Return
-    # true:: Always return true
+    # @return [TrueClass] Always return true
     def reset
       @interval = 0.0
       @last_start_time = Time.now
@@ -67,17 +65,15 @@ module RightSupport::Stats
     end
 
     # Mark the start of an activity and update counts and average rate
-    # with weighting toward recent activity
+    # with weighting toward past activity
     # Ignore the update if its type contains "stats"
     #
-    # === Parameters
-    # type(String|Symbol):: Type of activity, with anything that is not a symbol, true, or false
+    # @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
-    # id(String):: Unique identifier associated with this activity
+    # @param id [String] Unique identifier associated with this activity
     #
-    # === Return
-    # now(Time):: Update time
+    # @return [Time] Update time
     def update(type = nil, id = nil)
       now = Time.now
       if type.nil? || !(type =~ /stats/)
@@ -99,12 +95,10 @@ module RightSupport::Stats
 
     # Mark the finish of an activity and update the average duration
     #
-    # === Parameters
-    # start_time(Time):: Time when activity started, defaults to last time update was called
-    # id(String):: Unique identifier associated with this activity
+    # @param start_time [Time] Time when activity started, defaults to last time update was called
+    # @param id [String] Unique identifier associated with this activity
     #
-    # === Return
-    # duration(Float):: Activity duration in seconds
+    # @return [Float] Activity duration in seconds
     def finish(start_time = nil, id = nil)
       now = Time.now
       start_time ||= @last_start_time
@@ -116,8 +110,7 @@ module RightSupport::Stats
 
     # Convert average interval to average rate
     #
-    # === Return
-    # (Float|nil):: Recent average rate, or nil if total is 0
+    # @return [Float, NilClass] Recent average rate, or nil if total is 0
     def avg_rate
       if @total > 0
         if @interval == 0.0 then 0.0 else 1.0 / @interval end
@@ -127,19 +120,18 @@ module RightSupport::Stats
 
     # Get average duration of activity
     #
-    # === Return
-    # (Float|nil) Average duration in seconds of activity weighted toward recent activity, or nil if total is 0
+    # @return [Float, NilClass] Average duration in seconds of activity weighted
+    #   toward past activity, or nil if total is 0
     def avg_duration
       @avg_duration if @total > 0
     end
 
     # Get stats about last activity
     #
-    # === Return
-    # (Hash|nil):: Information about last activity, or nil if the total is 0
-    #   "elapsed"(Integer):: Seconds since last activity started
-    #   "type"(String):: Type of activity if specified, otherwise omitted
-    #   "active"(Boolean):: Whether activity still active
+    # @return [Hash, NilClass] Information about last activity, or nil if the total is 0
+    #   "elapsed" [Integer] Seconds since last activity started
+    #   "type" [String] Type of activity if specified, otherwise omitted
+    #   "active" [Boolean] Whether activity still active
     def last
       if @total > 0
         result = {"elapsed" => (Time.now - @last_start_time).to_i}
@@ -151,10 +143,9 @@ module RightSupport::Stats
 
     # Convert count per type into percentage by type
     #
-    # === Return
-    # (Hash|nil):: Converted counts, or nil if total is 0
-    #   "total"(Integer):: Total activity count
-    #   "percent"(Hash):: Percentage for each type of activity if tracking type, otherwise omitted
+    # @return [Hash, NilClass] Converted counts, or nil if total is 0
+    #   "total" [Integer] Total activity count
+    #   "percent" [Hash] Percentage for each type of activity if tracking type, otherwise omitted
     def percentage
       if @total > 0
         percent = {}
@@ -165,15 +156,14 @@ module RightSupport::Stats
 
     # Get stat summary including all aspects of activity that were measured except duration
     #
-    # === Return
-    # (Hash|nil):: Information about activity, or nil if the total is 0
-    #   "total"(Integer):: Total activity count
-    #   "percent"(Hash):: Percentage for each type of activity if tracking type, otherwise omitted
-    #   "last"(Hash):: Information about last activity
-    #     "elapsed"(Integer):: Seconds since last activity started
-    #     "type"(String):: Type of activity if tracking type, otherwise omitted
-    #     "active"(Boolean):: Whether activity still active if tracking whether active, otherwise omitted
-    #   "rate"(Float):: Recent average rate if measuring rate, otherwise omitted
+    # @return [Hash, NilClass] Information about activity, or nil if the total is 0
+    #   "total" [Integer] Total activity count
+    #   "percent" [Hash] Percentage for each type of activity if tracking type, otherwise omitted
+    #   "last" [Hash] Information about last activity
+    #     "elapsed" [Integer] Seconds since last activity started
+    #     "type" [String] Type of activity if tracking type, otherwise omitted
+    #     "active" [Boolean] Whether activity still active if tracking whether active, otherwise omitted
+    #   "rate" [Float] Recent average rate if measuring rate, otherwise omitted
     def all
       if @total > 0
         result = if @count_per_type.empty?
@@ -189,18 +179,87 @@ module RightSupport::Stats
 
     protected
 
-    # Calculate smoothed average with weighting toward recent activity
+    # Calculate smoothed average with weighting toward past activity
     #
-    # === Parameters
-    # current(Float|Integer):: Current average value
-    # value(Float|Integer):: New value
+    # @param current [Float, Integer] Current average value
+    # @param value [Float, Integer] New value
     #
-    # === Return
-    # (Float):: New average
+    # @return [Float] New average
     def average(current, value)
       ((current * (RECENT_SIZE - 1)) + value) / RECENT_SIZE.to_f
     end
 
+    public
+
+    # Aggregate the stats from multiple 'all' calls
+    #
+    # @param stats [Array] Hashes that are to be aggregated
+    #
+    # @return [Hash, NilClass] Summed information about activity, or nil if the total is 0
+    #   "total" [Integer] Total activity count
+    #   "percent" [Hash] Percentage for each type of activity if tracking type, otherwise omitted
+    #   "last" [Hash] Information about last activity
+    #     "elapsed" [Integer] Seconds since last activity started
+    #     "type" [String] Type of activity if tracking type, otherwise omitted
+    #     "active" [Boolean] Whether activity still active if tracking whether active, otherwise omitted
+    #   "rate" [Float] Recent average rate if measuring rate, otherwise omitted
+    def self.all(stats)
+      if (total = stats.inject(0) { |t, s| t += s["total"] if s && s["total"]; t }) > 0
+        all = percentage(stats, total)
+        all["last"] = last(stats.map { |s| s["last"] if s })
+        rate = avg_rate(stats.map { |s| {"rate" => s["rate"], "total" => s["total"]} if s }, total)
+        all["rate"] = rate if rate
+        all
+      end
+    end
+
+    # Aggregate multiple percentage stats
+    #
+    # @param stats [Array] List of stats containing "percent" hash and "total" value
+    # @param total [Integer] Overall total
+    #
+    # @return [Hash] Converted counts
+    #   "total" [Integer] Total activity count
+    #   "percent" [Hash] Percentage for each type of activity if tracking type, omitted if no data
+    def self.percentage(stats, total)
+      count_per_type = {}
+      stats.each do |s|
+        if s
+          t = s["total"]
+          s["percent"].each do |k, v|
+            count_per_type[k] = (count_per_type[k] || 0) + ((v / 100.0) * t).round
+          end if s["percent"]
+        end
+      end
+      if count_per_type.empty?
+        {"total" => total}
+      else
+        percent = {}
+        count_per_type.each { |k, v| percent[k] = (v / total.to_f) * 100.0 }
+        {"percent" => percent, "total" => total}
+      end
+    end
+
+    # Compute average rate from multiple average rates
+    #
+    # @param stats [Array] List of stats containing hash of "rate" and "total"
+    # @param total [Integer] Overall total
+    #
+    # @return [Fixnum, NilClass] Average rate or nil if no average rate data
+    def self.avg_rate(stats, total)
+      sum = stats.inject(nil) { |sum, stat| sum = (sum || 0.0) + (stat["rate"] * stat["total"]) if stat["rate"]; sum }
+      sum / total if sum
+    end
+
+    # Determine last activity from multiple last activity stats
+    #
+    # @param stats [Array] Multiple last activity stats
+    #
+    # @return [Hash, NilClass] Last activity, or nil if no last activity data
+    def self.last(stats)
+      stats.inject(nil) { |l, s| l = s if s && (l.nil? || (l["elapsed"] > s["elapsed"] && (s["type"] || s["active"]))); l }
+    end
+
   end # Activity
 
 end # RightScale::Stats

data/lib/right_support/stats/exceptions.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2012 RightScale Inc
+# Copyright (c) 2009-2013 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -29,20 +29,19 @@ module RightSupport::Stats
     # Maximum number of recent exceptions to track per category
     MAX_RECENT_EXCEPTIONS = 10
 
-    # (Hash) Exceptions raised per category with keys
-    #   "total"(Integer):: Total exceptions for this category
-    #   "recent"(Array):: Most recent as a hash of "count", "type", "message", "when", and "where"
+    # [Hash] Exceptions raised per category with keys
+    #   "total" [Integer] Total exceptions for this category
+    #   "recent" [Array] Most recent as a hash of "count", "type", "message", "when", and "where"
     attr_reader :stats
     alias :all :stats
 
     # Initialize exception data
     #
-    # === Parameters
-    # server(Object):: Server where exceptions are originating, must be defined for callbacks
-    # callback(Proc):: Block with following parameters to be activated when an exception occurs
-    #   exception(Exception):: Exception
-    #   message(Packet):: Message being processed
-    #   server(Server):: Server where exception occurred
+    # @param server [Object] Server where exceptions are originating, must be defined for callbacks
+    # @param callback [Proc] Block with following parameters to be activated when an exception occurs
+    #   exception [Exception] Exception
+    #   message [Packet] Message being processed
+    #   server [Server] Server where exception occurred
     def initialize(server = nil, callback = nil)
       @server = server
       @callback = callback
@@ -51,8 +50,7 @@ module RightSupport::Stats
 
     # Reset statistics
     #
-    # === Return
-    # true:: Always return true
+    # @return [TrueClass] Always return true
     def reset
       @stats = nil
       true
@@ -62,12 +60,10 @@ module RightSupport::Stats
     # Catch any exceptions since this function may be called from within an EM block
     # and an exception here would then derail EM
     #
-    # === Parameters
-    # category(String):: Exception category
-    # exception(Exception):: Exception
+    # @param category [String] Exception category
+    # @param exception [Exception] Exception
     #
-    # === Return
-    # true:: Always return true
+    # @return [TrueClass] Always return true
     def track(category, exception, message = nil)
       begin
         @callback.call(exception, message, @server) if @server && @callback && message
@@ -91,6 +87,47 @@ module RightSupport::Stats
       true
     end
 
+    # Aggregate the stats from multiple 'all' calls
+    #
+    # @param stats [Array] Hashes that are to be aggregated
+    #
+    # @return [Hash, NilClass] Exceptions raised per category with keys
+    #   "total" [Integer] Total exceptions for this category
+    #   "recent" [Array] Most recent as a hash of "count", "type", "message", "when", and "where"
+    def self.all(stats)
+      all = nil
+      stats.each do |s|
+        if s
+          all ||= {}
+          s.each do |category, exceptions|
+            if (all_exceptions = all[category])
+              all_exceptions["total"] += exceptions["total"]
+              all_recent = all_exceptions["recent"]
+              exceptions["recent"].each do |e|
+                i = 0
+                last = nil
+                all_recent.each do |all_e|
+                  break if e["when"] < all_e["when"] && (last.nil? || e["when"] >= last["when"])
+                  last = all_e
+                  i += 1
+                end
+                if last && last["type"] == e["type"] && last["message"] == e["message"] && last["where"] == e["where"]
+                  last["count"] += e["count"]
+                  last["when"] = e["when"]
+                else
+                  all_recent.insert(i, e)
+                  all_recent.shift if all_recent.size > MAX_RECENT_EXCEPTIONS
+                end
+              end
+            else
+              all[category] = exceptions
+            end
+          end
+        end
+      end
+      all
+    end
+
   end # Exceptions
 
 end # RightSupport::Stats