vx-common-amqp 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2251542292e73fae9c86662ae4b6888e0752d238
-  data.tar.gz: 01e1467005dea28437f1a44eedbb0202d8cc9cea
+  metadata.gz: 78c7ba1237547a68870877cf97e753e060e409a8
+  data.tar.gz: b176e9a6819bca67fc9244da4fec6186ef6ca94e
 SHA512:
-  metadata.gz: a142abeb99aa4f54a4d2135817fe211b28468545dc304b06528de30502951ff897573d21391dbb4b21c245fb729c8bb56028eef5a703ae3692b9cb51e2d18db2
-  data.tar.gz: b877c2bf0be744fef8f7e11c34e11f19dde8cbe20fcf799dc0e0f70cbaa0e077b8e860b6c7690e4a4cdfb1675b57c794d4ebd00ab6404ac122fb25ecde608eee
+  metadata.gz: 5b71ffdcc44ec306ba4fdde80ae3f76df4cc708429a89651a7c7508f7dfb9439ea6280c426cc612a88dee7a04bd07e78ee0b69e1ec55c62b87c46deef5095816
+  data.tar.gz: f3f3d0af052ef31fc59c39c12ee69453a5676c961c82814074fa8bd966d6c19dd50017a3e9c07c31ae586529d0a82ec277afa25648fee5f1b1b090662c6977c6

data/lib/vx/common/amqp/config.rb

@@ -6,9 +6,9 @@ module Vx
     module AMQP
       class Config
 
-        attr_accessor :url, :default_exchange_options, :default_queue_options,
+        attr_accessor :default_exchange_options, :default_queue_options,
           :default_publish_options, :default_exchange_type, :logger, :pool_timeout,
-          :heartbeat, :spawn_attempts, :content_type, :instrumenter, :debug
+          :heartbeat, :spawn_attempts, :content_type, :instrumenter, :debug, :on_error
 
         def initialize
           reset!
@@ -27,7 +27,6 @@ module Vx
         end
 
         def reset!
-          @url                   = nil
           @logger                = ::Logger.new(STDOUT)
           @default_exchange_type = :topic
           @pool_timeout          = 0.1
@@ -37,12 +36,13 @@ module Vx
           @recieving_builder     = nil
           @subscribing_builder   = nil
 
-          @spawn_attempts        = 5
+          @spawn_attempts        = 1
 
           @content_type          = 'application/json'
 
           @callbacks             = {}
           @instrumenter          = nil
+          @on_error              = ->(e, env){ nil }
 
           @default_exchange_options = {
             durable:     true,

data/lib/vx/common/amqp/consumer.rb

@@ -17,8 +17,7 @@ module Vx
         attr_accessor :delivery_info
         attr_accessor :properties
         attr_accessor :channel
-        attr_accessor :uuid
-        attr_accessor :payload
+        attr_accessor :request_id
 
         @@classes = []
 

data/lib/vx/common/amqp/consumer/ack.rb

@@ -7,9 +7,8 @@ module Vx
           instrumentation = {
             consumer_id:   self.class.consumer_id,
             consumer:      self.class.consumer_name,
+            message_id:    properties[:message_id],
             multiple:      multiple,
-            payload:       payload,
-            uuid:          uuid,
           }
           self.class.session.channel.ack delivery_info.delivery_tag, multiple
           instrument("ack.consumer.amqp", instrumentation)
@@ -19,10 +18,9 @@ module Vx
           instrumentation = {
             consumer_id:   self.class.consumer_id,
             consumer:      self.class.consumer_name,
-            payload:       payload,
+            message_id:    properties[:message_id],
             multiple:      multiple,
             requeue:       requeue,
-            uuid:          uuid,
           }
           self.class.session.channel.ack delivery_info.delivery_tag, multiple, requeue
           instrument("nack.consumer.amqp", instrumentation)

data/lib/vx/common/amqp/consumer/publish.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Vx
   module Common
     module AMQP
@@ -10,6 +12,7 @@ module Vx
           options[:routing_key]  = routing_key if routing_key && !options.key?(:routing_key)
           options[:headers]      = headers     if headers && !options.key?(:headers)
           options[:content_type] ||= content_type || config.content_type
+          options[:message_id]   ||= SecureRandom.uuid
 
           x = declare_exchange
 
@@ -17,10 +20,10 @@ module Vx
             payload:     message,
             exchange:    x.name,
             consumer:    consumer_name,
-            consumer_id: consumer_id
+            consumer_id: consumer_id,
+            message_id:  options[:message_id]
           }
 
-          instrument("start_publishing.consumer.amqp", instrumentation)
           instrument("process_publishing.consumer.amqp", instrumentation) do
             m = serialize_message message, options[:content_type]
             x.publish m, options

data/lib/vx/common/amqp/consumer/subscribe.rb

@@ -13,17 +13,19 @@ module Vx
 
         def start
           rs = nil
-          session.open
+          instrumentation = {
+            consumer_id: consumer_id,
+            consumer:    consumer_name
+          }
+          session.open instrumentation
           session.with_channel do
             x = declare_exchange
             q = declare_queue
 
-            instrumentation = {
+            instrumentation.merge!(
               exchange:    x.name,
               queue:       q.name,
-              consumer_id: consumer_id,
-              consumer:    consumer_name
-            }
+            )
             instrument("start.consumer.amqp", instrumentation)
 
             q.bind(x, bind_options)
@@ -62,12 +64,14 @@ module Vx
                   consumer_id:   consumer_id,
                   consumer:      consumer_name,
                   payload:       payload,
-                  uuid:          uuid
+                  message_id:    properties[:message_id]
                 }
 
-                instrument("start_processing.consumer.amqp", instrumentation)
-                instrument("process.consumer.amqp", instrumentation) do
-                  result  = run_instance delivery_info, properties, payload, uuid
+                Instrument.with request_id: uuid do
+                  instrument("start_processing.consumer.amqp", instrumentation)
+                  instrument("process.consumer.amqp", instrumentation) do
+                    result  = run_instance delivery_info, properties, payload, uuid
+                  end
                 end
 
                 break if result == :shutdown
@@ -81,8 +85,7 @@ module Vx
             new.tap do |inst|
               inst.properties    = properties
               inst.delivery_info = delivery_info
-              inst.uuid          = uuid
-              inst.payload       = payload
+              inst.request_id    = uuid
             end.perform payload
           end
 

data/lib/vx/common/amqp/mixins/instrument.rb

@@ -3,8 +3,20 @@ module Vx
     module AMQP
       module Instrument
 
+        def self.with(new_params)
+          old_params = Thread.current["vx_common_amqp_instrument_with"]
+          begin
+            Thread.current["vx_common_amqp_instrument_with"] = new_params
+            yield if block_given?
+          ensure
+            Thread.current["vx_common_amqp_instrument_with"] = old_params
+          end
+        end
+
         def instrument(name, payload, &block)
-          Common::AMQP.instrument name, payload, &block
+          append = Thread.current["vx_common_amqp_instrument_with"]
+          append ||= {}
+          Common::AMQP.instrument name, payload.merge(append), &block
         end
 
       end

data/lib/vx/common/amqp/session.rb

@@ -44,16 +44,22 @@ module Vx
           end
         end
 
-        def open
+        def open(options = {})
           return self if open?
 
           @@session_lock.synchronize do
             self.class.resume
 
-            @conn ||= Bunny.new config.url, heartbeat: :server
+            @conn ||= Bunny.new(
+              nil,  # from ENV['RABBITMQ_URL']
+              heartbeat: :server,
+              automatically_recover: false
+            )
 
             instrumentation = {
-              info: conn_info
+              info:        conn_info,
+              consumer:    options[:consumer],
+              consumer_id: options[:consumer_id]
             }
 
             instrument("start_connecting.consumer.amqp", instrumentation)

data/lib/vx/common/amqp/supervisor/threaded.rb

@@ -135,7 +135,7 @@ module Vx
               new_task.attempt = attempt
               new_task.start_at = Time.now
               new_task.freeze
-              instrument("spawn.consumer.ampq", task: new_task)
+              instrument("spawn_thread.consumer.ampq", task: new_task.inspect)
               new_task
             end
           end
@@ -147,14 +147,10 @@ module Vx
               task.thread.value
               nil
             rescue Exception => e
-              STDERR.puts "#{e.inspect} in #{task.inspect}"
-              STDERR.puts e.backtrace.map{|b| "    #{b}" }.join("\n")
-
-              instrument("exception.consumer.amqp", payload: {
-                exception: e,
-                task: task.inspect
-              })
+              $stderr.puts "#{e.inspect} in #{task.inspect}"
+              $stderr.puts e.backtrace.map{|b| "    #{b}" }.join("\n")
 
+              Common::AMQP.config.on_error.call(e, task: task)
               e
             end
           end

data/lib/vx/common/amqp/version.rb

@@ -1,7 +1,7 @@
 module Vx
   module Common
     module AMQP
-      VERSION = "0.3.2"
+      VERSION = "0.3.4"
     end
   end
 end

data/spec/integration/threaded_supervisor_spec.rb

@@ -45,6 +45,7 @@ describe "Run in multithread environment", slow: true, jruby: true do
   before do
     $mtest_mutex = Mutex.new
     $mtest_collected = []
+    Vx::Common::AMQP.config.spawn_attempts = 5
   end
 
   after do

data/spec/spec_helper.rb

@@ -2,13 +2,17 @@ require File.expand_path '../../lib/vx/common/amqp', __FILE__
 
 require 'rspec/autorun'
 
-ENV['VX_COMMON_AMQP_DEBUG'] = "1"
+#ENV['VX_COMMON_AMQP_DEBUG'] = "1"
 
 Dir[File.expand_path("../..", __FILE__) + "/spec/support/**.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   config.mock_with :rr
 
+  config.before(:each) do
+    Vx::Common::AMQP.config.reset!
+  end
+
   config.after(:suite) do
     Vx::Common::AMQP.close
   end

data/vx-common-amqp.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_runtime_dependency "bunny",     "~> 1.1.0"
+  spec.add_runtime_dependency "bunny",     "~> 1.1.1"
   spec.add_runtime_dependency "vx-common-rack-builder", "~> 0.0.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: vx-common-rack-builder
   requirement: !ruby/object:Gem::Requirement