vx-common-amqp 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f440f62a17a2b97081c546964d60bd0b555db04
-  data.tar.gz: 67e2480a6d58df8f1a11b5cdce8b8a27c4145c7c
+  metadata.gz: 85cc179ec72270468903a0aa0de0ea77aa2b11fa
+  data.tar.gz: 3bb45885f9845f638981c9aa91b23e0b4c176fe4
 SHA512:
-  metadata.gz: 796af64304db9e66df0cc9205ce6392050b263867075506c09ab6d11d2c02f5278b8bdf7a0a1ac2658e33226596f48c2d61016fc2f6da6782240e15999a77f44
-  data.tar.gz: ba09542be35c3991ec44bf3baff50751a4a0fc669f477ec426efff536070557f8e125c6146c0ed9b988e0d7b71f561aa6d69407c8478cbe6d6f90a585fb6308a
+  metadata.gz: 9154ed670fa2c0ff153d4ad05dc94fa0cb862ef32b285ad234c1d3b389005f90330072ca35ef13becedcbece50c8762fd4dac9ffe93996f7a3193280a8a52b72
+  data.tar.gz: f92e3d96b49d225f2fe20cddcd8d6b94c571a357cbf03bc3f76329237d84ee868fe3be3ee7c04d750e5d51a895cab4588d344f4d3a9d6c1a2663054194c4271d

data/lib/vx/common/amqp.rb

@@ -14,8 +14,7 @@ module Vx
         autoload :Threaded, File.expand_path("../amqp/supervisor/threaded", __FILE__)
       end
 
-      autoload :Logger,         File.expand_path("../amqp/mixins/logger",          __FILE__)
-      autoload :Callbacks,      File.expand_path("../amqp/mixins/callbacks",       __FILE__)
+      autoload :Instrument, File.expand_path("../amqp/mixins/instrument",   __FILE__)
 
       extend self
 
@@ -46,14 +45,6 @@ module Vx
         session.close
       end
 
-      def logger
-        config.logger
-      end
-
-      def logger=(val)
-        config.logger = val
-      end
-
       def shutdown
         Common::AMQP::Session.shutdown
         Vx::Common::AMQP::Supervisor::Threaded.shutdown
@@ -63,6 +54,18 @@ module Vx
         Common::AMQP::Session.shutdown?
       end
 
+      def instrument(name, payload, &block)
+        if config.debug?
+          STDOUT.puts "name: #{name} payload: #{payload.inspect}"
+        end
+
+        if config && config.instrumenter
+          config.instrumenter.instrument(name, payload, &block)
+        else
+          yield if block_given?
+        end
+      end
+
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Vx
 
         attr_accessor :url, :default_exchange_options, :default_queue_options,
           :default_publish_options, :default_exchange_type, :logger, :pool_timeout,
-          :heartbeat, :spawn_attempts, :content_type, :callbacks
+          :heartbeat, :spawn_attempts, :content_type, :instrumenter, :debug
 
         def initialize
           reset!
@@ -18,22 +18,14 @@ module Vx
           Common::AMQP::Formatter
         end
 
-        %w{ before after }.each do |p|
-          %w{ subscribe publish recieve }.each do |m|
-            define_method "#{p}_#{m}" do |&callback|
-              callbacks["#{p}_#{m}".to_sym] = callback
-            end
-          end
-        end
-
-        def on_error(&block)
-          callbacks[:on_error] = block
-        end
-
         def default_exchange_name
           "amq.#{default_exchange_type}"
         end
 
+        def debug?
+          @debug || ENV['VX_COMMON_AMQP_DEBUG']
+        end
+
         def reset!
           @url                   = nil
           @logger                = ::Logger.new(STDOUT)
@@ -50,6 +42,7 @@ module Vx
           @content_type          = 'application/json'
 
           @callbacks             = {}
+          @instrumenter          = nil
 
           @default_exchange_options = {
             durable:     true,

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

@@ -11,12 +11,13 @@ module Vx
         autoload :Sleep,         File.expand_path("../consumer/sleep",         __FILE__)
         autoload :Ack,           File.expand_path("../consumer/ack",           __FILE__)
 
+        include Common::AMQP::Instrument
         include Common::AMQP::Consumer::Ack
-        include Common::AMQP::Logger
 
         attr_accessor :delivery_info
         attr_accessor :properties
         attr_accessor :channel
+        attr_accessor :uuid
 
         @@classes = []
 
@@ -34,8 +35,7 @@ module Vx
           include Common::AMQP::Consumer::Configuration
           include Common::AMQP::Consumer::Publish
           include Common::AMQP::Consumer::Subscribe
-          include Common::AMQP::Logger
-          include Common::AMQP::Callbacks
+          include Common::AMQP::Instrument
 
           def shutdown?
             Common::AMQP.shutdown?

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

@@ -4,13 +4,26 @@ module Vx
       module Consumer::Ack
 
         def ack!(multiple = false)
+          instrumentation = {
+            consumer_id:   self.class.consumer_id,
+            consumer:      self.class.consumer_name,
+            multiple:      multiple,
+            uuid:          uuid,
+          }
           self.class.session.channel.ack delivery_info.delivery_tag, multiple
-          debug "commit ##{delivery_info.delivery_tag.to_i}"
+          instrument("ack.consumer.amqp", instrumentation)
         end
 
         def nack!(multiple = false, requeue = false)
+          instrumentation = {
+            consumer_id:   self.class.consumer_id,
+            consumer:      self.class.consumer_name,
+            multiple:      multiple,
+            requeue:       requeue,
+            uuid:          uuid,
+          }
           self.class.session.channel.ack delivery_info.delivery_tag, multiple, requeue
-          debug "reject ##{delivery_info.delivery_tag.to_i}"
+          instrument("nack.consumer.amqp", instrumentation)
         end
 
       end

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

@@ -13,12 +13,18 @@ module Vx
 
           x = declare_exchange
 
-          run_callbacks(:publish, message: message, exchange: x, name: consumer_id) do
+          instrumentation = {
+            message:  message.inspect,
+            exchange: x.name,
+            consumer: consumer_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
           end
 
-          debug "published #{message.inspect} to #{x.name}"
           self
         end
 

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Vx
   module Common
     module AMQP
@@ -16,15 +18,13 @@ module Vx
             x = declare_exchange
             q = declare_queue
 
-            run_callbacks(:subscribe, exchange: x, queue: q, name: consumer_id) do
-              debug "subscribing to #{q.name}:#{x.name} using #{bind_options.inspect}"
-              q.bind(x, bind_options)
-              debug "successfuly subscribed to #{q.name}:#{x.name}"
+            instrumentation = { exchange: x.name, queue: q.name, consumer: consumer_id }
+            instrument("start.consumer.amqp", instrumentation)
 
-              rs = yield(x, q) if block_given?
-            end
+            q.bind(x, bind_options)
+            rs = yield(x, q) if block_given?
 
-            debug "shutdown"
+            instrument("shutdown.consumer.amqp", instrumentation)
           end
           rs
         end
@@ -33,9 +33,16 @@ module Vx
           unpacked = nil
           delivery_info, properties, payload = q.pop(ack: ack)
 
+          instrumentation = {
+            properties:    properties,
+            consumer_id:   consumer_id,
+            consumer:      consumer_name
+          }
+
           if payload
-            debug "recieve ##{delivery_info.delivery_tag.to_i} #{payload.inspect}"
-            unpacked = deserialize_message properties, payload
+            instrument("unpacking.consumer.amqp", instrumentation) do
+              unpacked = deserialize_message properties, payload
+            end
           end
 
           [unpacked, delivery_info, properties]
@@ -51,10 +58,22 @@ module Vx
 
               if payload
                 result = nil
-
-                debug "recieve ##{delivery_info.delivery_tag.to_i} #{payload.inspect}"
-                result = run_instance delivery_info, properties, payload
-                debug "done ##{delivery_info.delivery_tag.to_i}"
+                uuid   = SecureRandom.uuid
+
+                instrumentation = {
+                  properties:    properties,
+                  consumer_id:   consumer_id,
+                  consumer:      consumer_name,
+                  uuid:          uuid
+                }
+
+                instrument("start_processing.consumer.amqp", instrumentation)
+                instrument("process.consumer.amqp", instrumentation) do
+                  instrument("unpacking.consumer.amqp", instrumentation) do
+                    payload = deserialize_message properties, payload
+                  end
+                  result  = run_instance delivery_info, properties, payload, uuid
+                end
 
                 break if result == :shutdown
               else
@@ -63,21 +82,20 @@ module Vx
             end
           end
 
-          def run_instance(delivery_info, properties, payload)
-            payload = deserialize_message properties, payload
-
-            run_callbacks :recieve, payload: payload, name: consumer_id do
-              new.tap do |inst|
-                inst.properties    = properties
-                inst.delivery_info = delivery_info
-              end.perform payload
-            end
+          def run_instance(delivery_info, properties, payload, uuid)
+            new.tap do |inst|
+              inst.properties    = properties
+              inst.delivery_info = delivery_info
+              inst.uuid          = uuid
+            end.perform payload
           end
 
           def deserialize_message(properties, payload)
-            Common::AMQP::Formatter.unpack properties[:content_type],
-                                           model,
-                                           payload
+            Common::AMQP::Formatter.unpack(
+              properties[:content_type],
+              model,
+              payload
+            )
           end
 
       end

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

@@ -0,0 +1,13 @@
+module Vx
+  module Common
+    module AMQP
+      module Instrument
+
+        def instrument(name, payload, &block)
+          Common::AMQP.instrument name, payload, &block
+        end
+
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Vx
     module AMQP
       class Session
 
-        include Common::AMQP::Logger
+        include Common::AMQP::Instrument
 
         CHANNEL_KEY = :vx_amqp_channel
 
@@ -31,18 +31,15 @@ module Vx
         def close
           if open?
             @@session_lock.synchronize do
-              info "closing connection"
               begin
                 conn.close
               rescue Bunny::ChannelError => e
                 warn e
               end
-              info "wait..."
               while conn.status != :closed
                 sleep 0.01
               end
               @conn = nil
-              info "connection closed"
             end
           end
         end
@@ -55,14 +52,19 @@ module Vx
 
             @conn ||= Bunny.new config.url, heartbeat: :server
 
-            unless conn.open?
-              info "connecting to #{conn_info}"
-              conn.start
-              info "wait connection to #{conn_info}"
-              while conn.connecting?
-                sleep 0.01
+            instrumentation = {
+              info: conn_info
+            }
+
+            instrument("start_connecting.consumer.amqp", instrumentation)
+
+            instrument("connect.consumer.amqp", instrumentation) do
+              unless conn.open?
+                conn.start
+                while conn.connecting?
+                  sleep 0.01
+                end
               end
-              info "connected successfuly (#{server_name})"
             end
           end
 
@@ -114,7 +116,7 @@ module Vx
 
         def conn_info
           if conn
-            "#{conn.user}:#{conn.host}:#{conn.port}/#{conn.vhost}"
+            "amqp://#{conn.user}@#{conn.host}:#{conn.port}/#{conn.vhost}"
           end
         end
 

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

@@ -5,8 +5,7 @@ module Vx
     module AMQP
       class Supervisor::Threaded
 
-        include Common::AMQP::Logger
-        include Common::AMQP::Callbacks
+        include Common::AMQP::Instrument
 
         POOL_INTERVAL = 0.5
 
@@ -136,7 +135,8 @@ module Vx
               new_task.attempt = attempt
               new_task.start_at = Time.now
               new_task.freeze
-              debug "spawn #{new_task.inspect}"
+              instrument("spawn.consumer.ampq", task: new_task)
+              new_task
             end
           end
 
@@ -148,8 +148,13 @@ module Vx
               nil
             rescue Exception => e
               STDERR.puts "#{e.inspect} in #{task.inspect}"
-              STDERR.puts e.backtrace.join("\n")
-              run_on_error_callback(e)
+              STDERR.puts e.backtrace.map{|b| "    #{b}" }.join("\n")
+
+              instrument("exception.consumer.amqp", payload: {
+                exception: e,
+                task: task.inspect
+              })
+
               e
             end
           end

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

@@ -1,7 +1,7 @@
 module Vx
   module Common
     module AMQP
-      VERSION = "0.2.8"
+      VERSION = "0.3.0"
     end
   end
 end

data/spec/lib/amqp/config_spec.rb

@@ -3,30 +3,4 @@ require 'spec_helper'
 describe Vx::Common::AMQP::Config do
   let(:config) { described_class.new }
 
-  context '(callbacks)' do
-    %w{ before after }.each do |p|
-      %w{ subscribe recieve publish }.each do |m|
-        name = "#{p}_#{m}"
-        it name do
-          config.public_send name do |value|
-            value
-          end
-
-          val = config.callbacks[name.to_sym].call("value")
-          expect(val).to eq 'value'
-        end
-      end
-    end
-
-    context "on_error" do
-      it "should be success" do
-        config.on_error do |e|
-          e
-        end
-        val = config.callbacks[:on_error].call "value"
-        expect(val).to eq 'value'
-      end
-    end
-  end
-
 end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require File.expand_path '../../lib/vx/common/amqp', __FILE__
 
 require 'rspec/autorun'
 
+ENV['VX_COMMON_AMQP_DEBUG'] = "1"
+
 Dir[File.expand_path("../..", __FILE__) + "/spec/support/**.rb"].each {|f| require f}
 
 RSpec.configure do |config|

data/spec/support/amqp.rb

@@ -1,5 +1,5 @@
 def delete_queue(q)
-  Vx::Common::AMQP.logger.info "[AMQP] delete queue #{q.inspect[0..30]}"
+  STDOUT.puts "[AMQP] delete queue #{q.inspect[0..30]}"
   if q
     q.purge
     q.delete if_unused: false, if_empty: false
@@ -8,7 +8,7 @@ def delete_queue(q)
 end
 
 def delete_exchange(x)
-  Vx::Common::AMQP.logger.info "[AMQP] delete exchnage #{x.inspect[0..30]}"
+  STDOUT.puts "[AMQP] delete exchnage #{x.inspect[0..30]}"
   x.delete if x
   true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -119,8 +119,7 @@ files:
 - lib/vx/common/amqp/consumer/publish.rb
 - lib/vx/common/amqp/consumer/subscribe.rb
 - lib/vx/common/amqp/formatter.rb
-- lib/vx/common/amqp/mixins/callbacks.rb
-- lib/vx/common/amqp/mixins/logger.rb
+- lib/vx/common/amqp/mixins/instrument.rb
 - lib/vx/common/amqp/session.rb
 - lib/vx/common/amqp/supervisor/threaded.rb
 - lib/vx/common/amqp/testing.rb
@@ -130,7 +129,6 @@ files:
 - spec/lib/amqp/config_spec.rb
 - spec/lib/amqp/consumer_spec.rb
 - spec/lib/amqp/formatter_spec.rb
-- spec/lib/amqp/mixins/callbacks_spec.rb
 - spec/lib/amqp/session_spec.rb
 - spec/lib/amqp/supervisor/threaded_spec.rb
 - spec/lib/amqp_spec.rb
@@ -168,10 +166,10 @@ test_files:
 - spec/lib/amqp/config_spec.rb
 - spec/lib/amqp/consumer_spec.rb
 - spec/lib/amqp/formatter_spec.rb
-- spec/lib/amqp/mixins/callbacks_spec.rb
 - spec/lib/amqp/session_spec.rb
 - spec/lib/amqp/supervisor/threaded_spec.rb
 - spec/lib/amqp_spec.rb
 - spec/spec_helper.rb
 - spec/support/amqp.rb
 - spec/support/ignore_me_error.rb
+has_rdoc: 

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

@@ -1,35 +0,0 @@
-module Vx
-  module Common
-    module AMQP
-      module Callbacks
-
-        def run_callbacks(name, *args)
-          before = "before_#{name}".to_sym
-          after  = "after_#{name}".to_sym
-          if f = Common::AMQP.config.callbacks[before]
-            f.call(*args)
-          end
-
-          rs = yield if block_given?
-
-          if f = Common::AMQP.config.callbacks[after]
-            f.call(*args)
-          end
-
-          rs
-        end
-
-        def run_on_error_callback(e)
-          if f = Common::AMQP.config.callbacks[:on_error]
-            begin
-              f.call e
-            rescue Exception => e
-              $stderr.puts "ERROR on error callback: #{e.inspect}"
-            end
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-module Vx
-  module Common
-    module AMQP
-      module Logger
-
-        %w{ debug info warn }.each do |m|
-          define_method m do |msg|
-            if log = Common::AMQP.logger
-              log.send(m, "[AMQP] #{msg}")
-            end
-          end
-        end
-
-      end
-    end
-  end
-end

data/spec/lib/amqp/mixins/callbacks_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe Vx::Common::AMQP::Callbacks do
-  let(:output) { [] }
-  let(:object) { Object.new.extend described_class }
-
-  before do
-    Vx::Common::AMQP.config.reset!
-    Vx::Common::AMQP.configure do |c|
-      c.before_publish { |v| output << "before:#{v}" }
-      c.after_publish  { |v| output << "after:#{v}" }
-    end
-  end
-
-  after  { Vx::Common::AMQP.config.reset! }
-
-  context 'run_callbacks' do
-    it "should be success" do
-      object.run_callbacks :publish, "call" do
-        output << "call"
-      end
-      expect(output).to eq %w{ before:call call after:call }
-    end
-  end
-end
-