right_agent 2.2.1-x86-mingw32 → 2.4.3-x86-mingw32

data/lib/right_agent/log.rb

@@ -200,10 +200,14 @@ module RightScale
           description += " (#{exception}"
           backtrace = :no_trace
         end
-        case backtrace
-        when :no_trace then description += ")"
-        when :caller   then description += " in " + exception.backtrace[0] + ")"
-        when :trace    then description += " in\n  " + exception.backtrace.join("\n  ") + ")"
+        if exception.respond_to?(:backtrace) && exception.backtrace
+          case backtrace
+          when :no_trace then description += ")"
+          when :caller   then description += " in " + exception.backtrace[0] + ")"
+          when :trace    then description += " in\n  " + exception.backtrace.join("\n  ") + ")"
+          end
+        else
+          description += ")"
         end
       end
       description
@@ -410,8 +414,6 @@ module RightScale
       @logger = logger
     end
 
-    protected
-
     # Initialize logger
     #
     # === Parameters

data/lib/right_agent/packets.rb

@@ -56,6 +56,10 @@ module RightScale
     # Instance variables that are not serialized because they are only used locally
     NOT_SERIALIZED = ["received_at"]
 
+    # Regexp for inserting packet size into msgpack encoded packet
+    # For ruby 1.9 size attribute moves from front to back of packet
+    PACKET_SIZE_REGEXP = RUBY_VERSION < "1.9.0" ? Regexp.new("size\xC0", nil, "n") : Regexp.new("size\xC0$", nil, "n")
+
     # (Float) Time in seconds in Unix-epoch when message was received
     attr_accessor :received_at
 
@@ -106,10 +110,8 @@ module RightScale
         'size'          => nil
       }.to_msgpack(*a)
       @size = msg.size
-      # For ruby 1.9 size attribute moves from front to back of packet
-      re = RUBY_VERSION < "1.9.0" ? /size\xC0/ : /size\xC0$/
       # For msgpack 0.5.1 the to_msgpack result is a MessagePack::Packer so need to convert to string
-      msg = msg.to_s.sub!(re) { |m| "size" + @size.to_msgpack }
+      msg = msg.to_s.sub!(PACKET_SIZE_REGEXP) { |m| "size" + @size.to_msgpack }
       msg
     end
 

data/lib/right_agent/pending_requests.rb

@@ -97,12 +97,15 @@ module RightScale
 
     # Get age of youngest pending request
     #
+    # === Parameters
+    # pending_requests(Hash):: Pending requests to be examined
+    #
     # === Return
     # age(Integer):: Age of youngest request
-    def youngest_age
+    def self.youngest_age(pending_requests)
       now = Time.now
       age = nil
-      self.each_value do |r|
+      pending_requests.each_value do |r|
         seconds = (now - r.receive_time).to_i
         age = seconds if age.nil? || seconds < age
       end
@@ -111,12 +114,15 @@ module RightScale
 
     # Get age of oldest pending request
     #
+    # === Parameters
+    # pending_requests(Hash):: Pending requests to be examined
+    #
     # === Return
     # age(Integer):: Age of oldest request
-    def oldest_age
+    def self.oldest_age(pending_requests)
       now = Time.now
       age = nil
-      self.each_value do |r|
+      pending_requests.each_value do |r|
         seconds = (now - r.receive_time).to_i
         age = seconds if age.nil? || seconds > age
       end

data/lib/right_agent/pid_file.rb

@@ -31,7 +31,7 @@ module RightScale
   #     the command protocol
   class PidFile
 
-    class AlreadyRunning < Exception; end
+    class AlreadyRunning < RuntimeError; end
 
     attr_reader :identity, :pid_file, :cookie_file
 
@@ -72,8 +72,8 @@ module RightScale
         FileUtils.mkdir_p(@pid_dir)
         open(@pid_file,'w') { |f| f.write(Process.pid) }
         File.chmod(0644, @pid_file)
-      rescue Exception => e
-        Log.error "Failed to create PID file: #{e.message}"
+      rescue StandardError => e
+        ErrorTracker.log(self, "Failed to create PID file", e, nil, :caller)
         raise
       end
       true

data/lib/right_agent/platform.rb

@@ -248,6 +248,20 @@ unless defined?(RightScale::Platform)
         output_text
       end
 
+      # Determines which cloud we're on by the cheap but simple expedient of
+      # reading the RightScale cloud file.
+      #
+      # @deprecated leverage the right_link cloud libraries for any cloud-
+      #   specific behavior because the behavior of all possible clouds is
+      #   beyond the scope of hard-coded case statements.
+      #
+      # @return [String] cloud type or nil
+      def resolve_cloud_type
+        cloud_file_path = ::File.join(self.filesystem.right_scale_static_state_dir, 'cloud')
+        @cloud_type = ::File.read(cloud_file_path) rescue nil
+        @cloud_type
+      end
+
       # Base class for platform helpers.
       class PlatformHelperBase
 
@@ -745,20 +759,6 @@ unless defined?(RightScale::Platform)
         return res
       end
 
-      # Determines which cloud we're on by the cheap but simple expedient of
-      # reading the RightScale cloud file.
-      #
-      # @deprecated leverage the right_link cloud libraries for any cloud-
-      #   specific behavior because the behavior of all possible clouds is
-      #   beyond the scope of hard-coded case statements.
-      #
-      # @return [String] cloud type or nil
-      def resolve_cloud_type
-        cloud_file_path = ::File.join(self.filesystem.right_scale_static_state_dir, 'cloud')
-        @cloud_type = ::File.read(cloud_file_path) rescue nil
-        @cloud_type
-      end
-
     end # Platform
 
   end # RightScale

data/lib/right_agent/protocol_version_mixin.rb

@@ -34,9 +34,9 @@ module RightScale
     # Packet::DEFAULT_VERSION, which is true of all with version >= 12)
     def can_put_version_in_packet?(version); version && version != 0 end
 
-    # Test whether given version of agent uses /mapper/query_tags rather than the
-    # deprecated TagQuery packet
-    def can_use_mapper_query_tags?(version); version && version >= 8 end
+    # Test whether given version of agent uses /router/query_tags or /mapper/query_tags
+    #  rather than the deprecated TagQuery packet
+    def can_use_router_query_tags?(version); version && version >= 8 end
 
     # Test whether given version of agent can handle a request that is being retried
     # as indicated by a retries count in the Request packet
@@ -64,6 +64,9 @@ module RightScale
     # Test whether given version of agent can handle HTTP communication mode
     def can_handle_http?(version); version && version >= 23 end
 
+    # Test whether given version of agent can always handle a hash payload
+    def can_always_handle_hash_payload?(version); version && version >= 24 end
+
   end # ProtocolVersionMixin
 
 end # RightScale

data/lib/right_agent/scripts/agent_deployer.rb

@@ -45,6 +45,8 @@
 #      --grace-timeout SEC      Set number of seconds before graceful termination times out
 #      --[no-]dup-check         Set whether to check for and reject duplicate requests, .e.g., due to retries
 #      --fiber-pool-size, -f N  Set size of fiber pool
+#      --airbrake-endpoint URL  Set URL for Airbrake endpoint for reporting exceptions to Errbit
+#      --airbrake-api-key KEY   Set Airbrake API key for use in reporting exceptions to Errbit
 #      --options, -o KEY=VAL    Set options that act as final override for any persisted configuration settings
 #      --monit                  Generate monit configuration file
 #      --test                   Build test deployment using default test settings
@@ -205,6 +207,14 @@ module RightScale
           options[:heartbeat] = sec.to_i
         end
 
+        opts.on('--airbrake-endpoint URL') do |url|
+          options[:airbrake_endpoint] = url
+        end
+
+        opts.on('--airbrake-api-key KEY') do |key|
+          options[:airbrake_api_key] = key
+        end
+
         opts.on('-o', '--options OPT') do |e|
           fail("Invalid option definition #{e}' (use '=' to separate name and value)") unless e.include?('=')
           key, val = e.split(/=/)
@@ -277,7 +287,7 @@ module RightScale
       actors_dirs = AgentConfig.actors_dirs
       actors.each do |a|
         found = false
-        actors_dirs.each { |d| break if found = File.exist?(File.normalize_path(File.join(d, "#{a}.rb"))) }
+        actors_dirs.each { |d| break if (found = File.exist?(File.normalize_path(File.join(d, "#{a}.rb")))) }
         fail("Cannot find source for actor #{a.inspect} in #{actors_dirs.inspect}") unless found
       end
       true
@@ -318,6 +328,8 @@ module RightScale
       cfg[:http_proxy]         = options[:http_proxy] if options[:http_proxy]
       cfg[:http_no_proxy]      = options[:http_no_proxy] if options[:http_no_proxy]
       cfg[:fiber_pool_size]    = options[:fiber_pool_size] if options[:fiber_pool_size]
+      cfg[:airbrake_endpoint]  = options[:airbrake_endpoint] if options[:airbrake_endpoint]
+      cfg[:airbrake_api_key]   = options[:airbrake_api_key] if options[:airbrake_api_key]
       cfg
     end
 

data/lib/right_agent/sender.rb

@@ -68,10 +68,6 @@ module RightScale
     #
     # === Parameters
     # agent(Agent):: Agent using this sender; uses its identity, client, and following options:
-    #   :exception_callback(Proc):: Callback with following parameters that is activated on exception events:
-    #     exception(Exception):: Exception
-    #     message(Packet):: Message being processed
-    #     agent(Agent):: Reference to agent
     #   :offline_queueing(Boolean):: Whether to queue request if client currently disconnected,
     #     also requires agent invocation of initialize_offline_queue and start_offline_queue methods below,
     #     as well as enable_offline_mode and disable_offline_mode as client connection status changes
@@ -102,7 +98,7 @@ module RightScale
       @connectivity_checker = if @mode == :amqp
         # Only need connectivity checker for AMQP broker since RightHttpClient does its own checking
         # via periodic session renewal
-        ConnectivityChecker.new(self, @options[:ping_interval] || 0, @ping_stats, @exception_stats)
+        ConnectivityChecker.new(self, @options[:ping_interval] || 0, @ping_stats)
       end
       @@instance = self
     end
@@ -369,9 +365,9 @@ module RightScale
         token = response.token
         if (result = OperationResult.from_results(response))
           if result.non_delivery?
-            @non_delivery_stats.update(result.content.nil? ? "nil" : result.content.inspect)
+            @non_delivery_stats.update(result.content.nil? ? "nil" : result.content)
           elsif result.error?
-            @result_error_stats.update(result.content.nil? ? "nil" : result.content.inspect)
+            @result_error_stats.update(result.content.nil? ? "nil" : result.content)
           end
           @result_stats.update(result.status)
         else
@@ -418,7 +414,7 @@ module RightScale
         @offline_handler.terminate
         @connectivity_checker.terminate if @connectivity_checker
         pending = @pending_requests.kind(:send_request)
-        [pending.size, pending.youngest_age]
+        [pending.size, PendingRequests.youngest_age(pending)]
       else
         [0, nil]
       end
@@ -448,9 +444,6 @@ module RightScale
     #
     # === Return
     # stats(Hash):: Current statistics:
-    #   "exceptions"(Hash|nil):: 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"
     #   "non-deliveries"(Hash|nil):: Non-delivery activity stats with keys "total", "percent", "last",
     #     and 'rate' with percentage breakdown per reason, or nil if none
     #   "offlines"(Hash|nil):: Offline activity stats with keys "total", "last", and "duration",
@@ -463,7 +456,6 @@ module RightScale
     #     with percentage breakdown per request type, or nil if none
     #   "requests pending"(Hash|nil):: Number of requests waiting for response and age of oldest,
     #     or nil if none
-    #   "response time"(Float):: Average number of seconds to respond to a request recently
     #   "result errors"(Hash|nil):: Error result activity stats with keys "total", "percent", "last",
     #     and 'rate' with percentage breakdown per error, or nil if none
     #   "results"(Hash|nil):: Results activity stats with keys "total", "percent", "last", and "rate"
@@ -482,18 +474,16 @@ module RightScale
           pending["pushes"] = @pending_requests.kind(:send_push).size
           requests = @pending_requests.kind(:send_request)
           if (pending["requests"] = requests.size) > 0
-            pending["oldest age"] = requests.oldest_age
+            pending["oldest age"] = PendingRequests.oldest_age(requests)
           end
         end
         stats = {
-          "exceptions"       => @exception_stats.stats,
           "non-deliveries"   => @non_delivery_stats.all,
           "offlines"         => offlines,
           "pings"            => @ping_stats.all,
           "request kinds"    => @request_kind_stats.all,
           "requests"         => @request_stats.all,
           "requests pending" => pending,
-          "response time"    => @request_stats.avg_duration,
           "result errors"    => @result_error_stats.all,
           "results"          => @result_stats.all,
           "retries"          => @retry_stats.all,
@@ -520,7 +510,6 @@ module RightScale
       @offline_stats = RightSupport::Stats::Activity.new(measure_rate = false)
       @request_kind_stats = RightSupport::Stats::Activity.new(measure_rate = false)
       @send_failure_stats = RightSupport::Stats::Activity.new
-      @exception_stats = RightSupport::Stats::Exceptions.new(@agent, @options[:exception_callback])
       true
     end
 
@@ -614,9 +603,8 @@ module RightScale
         EM_S.next_tick do
           begin
             http_send_once(kind, target, packet, received_at, &callback)
-          rescue Exception => e
-            Log.error("Failed sending or handling response for #{packet.trace} #{packet.type}", e, :trace)
-            @exception_stats.track("request", e)
+          rescue StandardError => e
+            ErrorTracker.log(self, "Failed sending or handling response for #{packet.trace} #{packet.type}", e)
           end
         end
       else
@@ -668,8 +656,7 @@ module RightScale
           result = error_result(e.inspect)
         else
           agent_type = AgentIdentity.parse(@identity).agent_type
-          Log.error("Failed to send #{packet.trace} #{packet.type}", e, :trace)
-          @exception_stats.track("request", e)
+          ErrorTracker.log(self, "Failed to send #{packet.trace} #{packet.type}", e)
           result = error_result("#{agent_type.capitalize} agent internal error")
         end
       end
@@ -739,21 +726,17 @@ module RightScale
     # TemporarilyOffline:: If cannot send request because RightNet client currently disconnected
     #   and offline queueing is disabled
     def amqp_send_once(packet, ids = nil)
-      name =
       exchange = {:type => :fanout, :name => @request_queue, :options => {:durable => true, :no_declare => @secure}}
       @agent.client.publish(exchange, packet, :persistent => packet.persistent, :mandatory => true,
                             :log_filter => [:tags, :target, :tries, :persistent], :brokers => ids)
     rescue RightAMQP::HABrokerClient::NoConnectedBrokers => e
-      msg = "Failed to publish request #{packet.trace} #{packet.type}"
-      Log.error(msg, e)
+      ErrorTracker.log(self, error = "Failed to publish request #{packet.trace} #{packet.type}", e, packet)
       @send_failure_stats.update("NoConnectedBrokers")
-      raise TemporarilyOffline.new(msg + " (#{e.class}: #{e.message})")
-    rescue Exception => e
-      msg = "Failed to publish request #{packet.trace} #{packet.type}"
-      Log.error(msg, e, :trace)
+      raise TemporarilyOffline.new(error + " (#{e.class}: #{e.message})")
+    rescue StandardError => e
+      ErrorTracker.log(self, error = "Failed to publish request #{packet.trace} #{packet.type}", e, packet)
       @send_failure_stats.update(e.class.name)
-      @exception_stats.track("publish", e, packet)
-      raise SendFailure.new(msg + " (#{e.class}: #{e.message})")
+      raise SendFailure.new(error + " (#{e.class}: #{e.message})")
     end
 
     # Send request via AMQP with one or more retries if do not receive a response in time
@@ -796,20 +779,18 @@ module RightScale
               else
                 Log.warning("RE-SEND TIMEOUT after #{elapsed.to_i} seconds for #{packet.trace} #{packet.type}")
                 result = OperationResult.non_delivery(OperationResult::RETRY_TIMEOUT)
-                @non_delivery_stats.update(result.content)
                 handle_response(Result.new(packet.token, @identity, result, @identity))
               end
               @connectivity_checker.check(check_broker_ids.first) if check_broker_ids.any? && count == 1
             end
           rescue TemporarilyOffline => e
-            Log.error("Failed retry for #{packet.trace} #{packet.type} because temporarily offline")
+            ErrorTracker.log(self, "Failed retry for #{packet.trace} #{packet.type} because temporarily offline")
           rescue SendFailure => e
-            Log.error("Failed retry for #{packet.trace} #{packet.type} because of send failure")
+            ErrorTracker.log(self, "Failed retry for #{packet.trace} #{packet.type} because of send failure")
           rescue Exception => e
             # Not sending a response here because something more basic is broken in the retry
             # mechanism and don't want an error response to preempt a delayed actual response
-            Log.error("Failed retry for #{packet.trace} #{packet.type} without responding", e, :trace)
-            @exception_stats.track("retry", e, packet)
+            ErrorTracker.log(self, "Failed retry for #{packet.trace} #{packet.type} without responding", e, packet)
           end
         end
       end

data/lib/right_agent/serialize/secure_serializer.rb

@@ -28,9 +28,9 @@ module RightScale
 
     include ProtocolVersionMixin
 
-    class MissingPrivateKey < Exception; end
-    class MissingCertificate < Exception; end
-    class InvalidSignature < Exception; end
+    class MissingPrivateKey < StandardError; end
+    class MissingCertificate < StandardError; end
+    class InvalidSignature < StandardError; end
 
     # Create the one and only SecureSerializer
     def self.init(serializer, identity, store, encrypt = true)
@@ -87,9 +87,6 @@ module RightScale
     #
     # === Return
     # (String):: MessagePack serialized and optionally encrypted object
-    #
-    # === Raise
-    # Exception:: If certificate identity, certificate store, certificate, or private key missing
     def dump(obj, encrypt = nil)
       must_encrypt = encrypt || @encrypt
       serialize_format = if obj.respond_to?(:send_version) && can_handle_msgpack_result?(obj.send_version)
@@ -105,7 +102,7 @@ module RightScale
           msg = EncryptedDocument.new(msg, certs).encrypted_data(encode_format)
         else
           target = obj.target_for_encryption if obj.respond_to?(:target_for_encryption)
-          Log.error("No certs available for object #{obj.class} being sent to #{target.inspect}\n") if target
+          ErrorTracker.log(self, "No certs available for object #{obj.class} being sent to #{target.inspect}") if target
         end
       end
       sig = Signature.new(msg, @cert, @key).data(encode_format)
@@ -124,8 +121,8 @@ module RightScale
     # (Object):: Unserialized object
     #
     # === Raise
-    # Exception:: If certificate store, certificate, or private key missing
-    # MissingCertificate:: If could not find certificate for message signer
+    # MissingCertificate:: If could not find certificate for message signer or receiver
+    # MissingPrivateKey:: If could not find private key for message receiver
     # InvalidSignature:: If message signature check failed for message
     def load(msg, id = nil)
       msg = @serializer.load(msg)

data/lib/right_agent/serialize/serializer.rb

@@ -140,15 +140,19 @@ module RightScale
     #
     # === Raises
     # SerializationError:: If none of the serializers can perform the requested action
+    # RightScale::Exceptions::ConnectivityFailure:: If cannot access external services
     def cascade_serializers(action, packet, serializers, id = nil)
       errors = []
       serializers.map do |serializer|
         obj = nil
         begin
-          obj = serializer == SecureSerializer ? serializer.send(action, packet, id) :  serializer.send(action, packet)
-        rescue SecureSerializer::MissingCertificate, SecureSerializer::InvalidSignature => e
+          obj = serializer == SecureSerializer ? serializer.send(action, packet, id) : serializer.send(action, packet)
+        rescue RightSupport::Net::NoResult, SocketError => e
+          raise Exceptions::ConnectivityFailure.new("Failed to #{action} with #{serializer.name} due to external " +
+                                                    "service access failures (#{e.class.name}: #{e.message})", e)
+        rescue SecureSerializer::MissingCertificate, SecureSerializer::MissingPrivateKey, SecureSerializer::InvalidSignature => e
           errors << Log.format("Failed to #{action} with #{serializer.name}", e)
-        rescue Exception => e
+        rescue StandardError => e
           errors << Log.format("Failed to #{action} with #{serializer.name}", e, :trace)
         end
         return obj if obj

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.2.1'
-  spec.date      = '2014-05-07'
+  spec.version   = '2.4.3'
+  spec.date      = '2014-10-02'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -39,9 +39,9 @@ Gem::Specification.new do |spec|
   spec.require_path = 'lib'
 
   spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
-  spec.add_dependency('right_amqp', '~> 0.7')
-  spec.add_dependency('rest-client', '1.7.0.1')
-  spec.add_dependency('faye-websocket', '0.7.0')
+  spec.add_dependency('right_amqp', '~> 0.8')
+  spec.add_dependency('rest-client', '~> 1.7.0.3')
+  spec.add_dependency('faye-websocket', '~> 0.7.0')
   spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])
   spec.add_dependency('net-ssh', '~> 2.0')