right_support 2.8.22 → 2.8.23

data/VERSION

@@ -1 +1 @@
-2.8.22
+2.8.23

data/lib/right_support/stats/activity.rb

@@ -128,7 +128,10 @@ module RightSupport::Stats
     #
     # @return [Float, NilClass] Recent average rate, or nil if total is 0
     def avg_rate
-      1.0 / average(@interval, Time.now - @last_start_time) if @measure_rate && @total > 0
+      if @measure_rate && @total > 0
+        interval = average(@interval, Time.now - @last_start_time)
+        interval == 0.0 ? 0.0 : 1.0 / interval
+      end
     end
 
     # Get average duration of activity
@@ -136,7 +139,7 @@ module RightSupport::Stats
     # @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
+      @avg_duration
     end
 
     # Get stats about last activity

data/lib/right_support/stats/exceptions.rb

@@ -66,7 +66,13 @@ module RightSupport::Stats
     # @return [TrueClass] Always return true
     def track(category, exception, message = nil)
       begin
-        @callback.call(exception, message, @server) if @server && @callback && message
+        if @callback && @server
+          if @callback.respond_to?(:arity) && @callback.arity.abs == 4
+            @callback.call(exception, message, @server, category)
+          else
+            @callback.call(exception, message, @server)
+          end
+        end
         @stats ||= {}
         exceptions = (@stats[category] ||= {"total" => 0, "recent" => []})
         exceptions["total"] += 1

data/lib/right_support/stats/helpers.rb

@@ -285,6 +285,7 @@ module RightSupport
     #   "exceptions" [Hash, NilClass] Exceptions raised per category, or nil if none
     #     "total"(Integer):: Total exceptions for this category
     #     "recent"(Array):: Most recent as a hash of "count", "type", "message", "when", and "where"
+    #     (exceptions is omitted from display if there is no hash entry for it)
     #   "heartbeat" [Integer, NilClass] Number of seconds between AMQP heartbeats, or nil if heartbeat disabled
     #   "returns" [Hash, NilClass] Message return activity stats with keys "total", "percent", "last", and "rate"
     #     with percentage breakdown per request type, or nil if none
@@ -321,13 +322,18 @@ module RightSupport
         str += "#{b["alias"]}: #{b["identity"]} #{b["status"]}, disconnects: #{disconnects}, failures: #{failures}\n"
         str += value_indent
       end
-      str += sprintf("%-#{sub_name_width}s#{SEPARATOR}", "exceptions")
-      str += if brokers["exceptions"].nil? || brokers["exceptions"].empty?
-        "none\n"
-      else
-        exceptions_str(brokers["exceptions"], sub_value_indent, options) + "\n"
+
+      # Exceptions are accumulated globally for agents at right_agent 2.3 or above
+      if brokers.has_key?("exceptions")
+        str += sprintf("%-#{sub_name_width}s#{SEPARATOR}", "exceptions")
+        str += if brokers["exceptions"].nil? || brokers["exceptions"].empty?
+          "none\n"
+        else
+          exceptions_str(brokers["exceptions"], sub_value_indent, options) + "\n"
+        end
+        str += value_indent
       end
-      str += value_indent
+
       str += sprintf("%-#{sub_name_width}s#{SEPARATOR}", "heartbeat")
       str += if [nil, 0].include?(brokers["heartbeat"])
         "none\n"
@@ -381,7 +387,7 @@ module RightSupport
         if v.is_a?(Numeric)
           str = k =~ /age$/ ? elapsed(v) : enough_precision(v)
           str += "/sec" if k =~ /rate$/
-          str += " sec" if k =~ /time$/
+          str += " sec" if k =~ /time$|delay$/
           str += "%" if k =~ /percent$/
           str
         elsif v.is_a?(Hash)

data/right_support.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{right_support}
-  s.version = "2.8.22"
+  s.name = "right_support"
+  s.version = "2.8.23"
 
   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-07}
-  s.description = %q{A toolkit of useful, reusable foundation code created by RightScale.}
-  s.email = %q{support@rightscale.com}
+  s.date = "2014-05-27"
+  s.description = "A toolkit of useful, reusable foundation code created by RightScale."
+  s.email = "support@rightscale.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -136,32 +136,31 @@ Gem::Specification.new do |s|
     "spec/validation/openssl_spec.rb",
     "spec/validation/ssh_spec.rb"
   ]
-  s.homepage = %q{https://github.com/rightscale/right_support}
+  s.homepage = "https://github.com/rightscale/right_support"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Reusable foundation code.}
+  s.rubygems_version = "1.8.26"
+  s.summary = "Reusable foundation code."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_development_dependency(%q<flexmock>, ["~> 1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.13.0"])
-      s.add_development_dependency(%q<cucumber>, ["~> 1.0", "< 1.3.3"])
+      s.add_development_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
     else
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_dependency(%q<flexmock>, ["~> 1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.13.0"])
-      s.add_dependency(%q<cucumber>, ["~> 1.0", "< 1.3.3"])
+      s.add_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
     end
   else
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
     s.add_dependency(%q<flexmock>, ["~> 1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.13.0"])
-    s.add_dependency(%q<cucumber>, ["~> 1.0", "< 1.3.3"])
+    s.add_dependency(%q<cucumber>, ["< 1.3.3", "~> 1.0"])
   end
 end
 

data/spec/stats/activity_spec.rb

@@ -187,6 +187,14 @@ describe RightSupport::Stats::Activity do
       @stats.avg_rate.should == 0.125
     end
 
+    it "sets rate to 0 if interval is 0" do
+      flexmock(Time).should_receive(:now).and_return(1000000, 1000000)
+      @stats.avg_rate.should be_nil
+      @stats.update
+      @stats.instance_variable_get(:@interval).should == 0.0
+      @stats.avg_rate.should == 0.0
+    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)

data/spec/stats/exceptions_spec.rb

@@ -128,6 +128,23 @@ describe RightSupport::Stats::Exceptions do
       called.should == 1
     end
 
+    it "includes category parameter in callback if callback supports it" do
+      called = 0
+      callback = lambda do |exception, message, server, category|
+        called += 1
+        exception.should == @exception
+        message.should == "message"
+        server.should == "server"
+        category.should == "testing"
+      end
+      @stats = RightSupport::Stats::Exceptions.new("server", callback)
+      @stats.track("testing", @exception, "message")
+      @stats.stats.should == {"testing" => {"total" => 1,
+                                            "recent" => [{"count" => 1, "type" => "Exception", "message" => "Test error",
+                                                          "when" => @now, "where" => nil}]}}
+      called.should == 1
+    end
+
     it "catches any exceptions raised internally and log them" do
       begin
         logger = flexmock("logger")

data/spec/stats/helpers_spec.rb

@@ -338,6 +338,25 @@ describe RightSupport::Stats do
                        "             returns           : no queue consumers: 67%, no queue: 33%, total: 3, \n" +
                        "                                 last: no queue consumers (10 sec ago), rate: 1.0/sec\n"
     end
+
+    it "omits exceptions from brokers if exceptions key omitted" do
+      @brokers.delete("exceptions")
+      @brokers["heartbeat"] = 60
+      activity = RightSupport::Stats::Activity.new
+      activity.update("no queue")
+      activity.finish(@now - 10)
+      activity.update("no queue consumers")
+      activity.update("no queue consumers")
+      flexmock(Time).should_receive(:now).and_return(1000010)
+      @brokers["returns"] = activity.all
+      result = @helpers.brokers_str(@brokers, :name_width => 10)
+      result.should == "brokers    : b0: rs-broker-localhost-5672 connected, disconnects: none, failures: none\n" +
+                       "             b1: rs-broker-localhost-5673 disconnected, disconnects: 2 (16 min 40 sec ago), failures: none\n" +
+                       "             b2: rs-broker-localhost-5674 failed, disconnects: none, failures: 3 (16 min 40 sec ago w/ 2 retries)\n" +
+                       "             heartbeat         : 60 sec\n" +
+                       "             returns           : no queue consumers: 67%, no queue: 33%, total: 3, \n" +
+                       "                                 last: no queue consumers (10 sec ago), rate: 1.0/sec\n"
+    end
   end
 
   context "activity_str" do
@@ -482,6 +501,7 @@ describe RightSupport::Stats do
                "empty_hash" => {},
                "float_value" => 3.15,
                "some % percent" => 3.54,
+               "some delay" => 0.125,
                "some time" => 0.675,
                "some rate" => 4.72,
                "some age" => 125,
@@ -505,6 +525,7 @@ describe RightSupport::Stats do
                        "                float_value       : 3.2\n" +
                        "                some %            : 3.5%\n" +
                        "                some age          : 2 min 5 sec\n" +
+                       "                some delay        : 0.13 sec\n" +
                        "                some hash         : ants: 100000000, bears: 1, cats: 3, dogs: 2, dragons: none, \n" +
                        "                                    hippopotami: 99, leopards: 25\n" +
                        "                some rate         : 4.7/sec\n" +

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: right_support
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
-  segments: 
-  - 2
-  - 8
-  - 22
-  version: 2.8.22
+version: !ruby/object:Gem::Version
+  version: 2.8.23
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tony Spataro
 - Sergey Sergyenko
 - Ryan Williamson
@@ -19,89 +14,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-04-07 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2014-05-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  name: jeweler
-  requirement: *id001
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: *id002
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 2
-        - 13
-        - 0
-        version: 2.13.0
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: *id003
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.13.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.3.3
-  name: cucumber
-  requirement: *id004
-  prerelease: false
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A toolkit of useful, reusable foundation code created by RightScale.
 email: support@rightscale.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .rspec
 - CHANGELOG.rdoc
 - Gemfile
@@ -220,39 +212,32 @@ files:
 - spec/stats/helpers_spec.rb
 - spec/validation/openssl_spec.rb
 - spec/validation/ssh_spec.rb
-has_rdoc: true
 homepage: https://github.com/rightscale/right_support
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4455262276770369018
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.26
 signing_key: 
 specification_version: 3
 summary: Reusable foundation code.
 test_files: []
-