vx-lib-consumer 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e19e0cdf508eeb00ef09591c6846ad6e59fd903e
-  data.tar.gz: f4face1e09a11cf6239727c256d8b1100f14893c
+  metadata.gz: 6608092d8377c6b8f5a270f962489a5b334db63e
+  data.tar.gz: cb6ded459721df23d54fd4291c2ab9d46c0fd3d8
 SHA512:
-  metadata.gz: 7d4830e292303a83ef069c233c7fd31c6f72b92ee15a5aee62ee7ae28449e47d2cf8dc4eb7a7e880491d93e30d8b6c153b3b54e24ac4016e062d8741d0d518bb
-  data.tar.gz: 41212e084f4d4f57a2fafccb1c1cf1583bded3581cf3e86940839ad0e73f1dbe3cd2c2636d8e8d95f80014e4b9949e63bb6d865914a5ea4d1b3d9639b9e7bc8b
+  metadata.gz: 6b25277ae9e0d282e9792acbd81b8d5f5a4a68bf0d0eb257b87394edeaf99d5a9b3d9414c5e605a0e50026a8fff6cc557ed8ebe410adfd47f06845dbb2f87acf
+  data.tar.gz: b5bb94f0eeb0800d44f5cdfdfb746f0027f41eccbf9c27544468f308f2899e658f6d4cff1db949f6d8a79b122b286ac0ac2ab703d0cb6ee1ae7f7d861e89781f

data/lib/vx/lib/consumer.rb

@@ -2,7 +2,6 @@
   version
   error
   configuration
-  instrument
   session
   params
   serializer
@@ -25,12 +24,10 @@ module Vx
 
       def self.included(base)
         base.extend ClassMethods
-        base.extend Instrument
         base.extend Publish
         base.extend Subscribe
         base.extend Rpc
         base.send :include, Ack
-        base.send :include, Instrument
       end
 
       module ClassMethods

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

@@ -4,36 +4,19 @@ module Vx
       module Ack
 
         def ack(multiple = false)
-          instrumentation = {
-            consumer:      self.class.params.consumer_name,
-            properties:    properties,
-            multiple:      multiple,
-            channel:       _channel.id
-          }
           if _channel.open?
             _channel.ack delivery_info.delivery_tag, multiple
-            instrument("ack", instrumentation)
             true
           else
-            instrument("ack_failed", instrumentation)
             false
           end
         end
 
         def nack(multiple = false, requeue = false)
-          instrumentation = {
-            consumer:      self.class.params.consumer_name,
-            properties:    properties,
-            multiple:      multiple,
-            requeue:       requeue,
-            channel:       channel.id
-          }
           if _channel.open?
             _channel.ack delivery_info.delivery_tag, multiple, requeue
-            instrument("nack", instrumentation)
             true
           else
-            instrument("nack_failed", instrumentation)
             false
           end
         end

data/lib/vx/lib/consumer/configuration.rb

@@ -10,7 +10,7 @@ module Vx
 
         attr_accessor :default_exchange_options, :default_queue_options,
           :default_publish_options, :default_exchange_type, :pool_timeout,
-          :heartbeat, :spawn_attempts, :content_type, :instrumenter, :debug,
+          :heartbeat, :spawn_attempts, :content_type, :debug,
           :on_error, :builders, :prefetch
 
         def initialize
@@ -40,7 +40,6 @@ module Vx
           @content_type          = 'application/json'
           @prefetch              = 1
 
-          @instrumenter          = nil
           @on_error              = ->(e, env){ nil }
 
           @builders = {

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

@@ -17,20 +17,18 @@ module Vx
 
           name = params.exchange_name
 
-          instrumentation = {
+          env = {
             payload:     payload,
             exchange:    name,
             consumer:    params.consumer_name,
             properties:  options,
           }
 
-          with_middlewares :pub, instrumentation do
+          with_middlewares :pub, env do
             session.with_pub_channel do |ch|
-              instrument(:process_publishing, instrumentation.merge(channel: ch.id)) do
-                encoded = encode_payload(payload, options[:content_type])
-                x = session.declare_exchange ch, name, params.exchange_options
-                x.publish encoded, options
-              end
+              encoded = encode_payload(payload, options[:content_type])
+              x = session.declare_exchange ch, name, params.exchange_options
+              x.publish encoded, options
             end
           end
         end

data/lib/vx/lib/consumer/rpc.rb

@@ -97,7 +97,7 @@ module Vx
               payload = ::JSON.parse(payload)
             end
 
-            instrumentation = {
+            env = {
               consumer:   consumer.params.consumer_name,
               queue:      @q.name,
               rpc:        REP,
@@ -106,18 +106,15 @@ module Vx
               properties: properties
             }
 
-            consumer.with_middlewares :sub, instrumentation do
-              consumer.instrument(:start_processing, instrumentation)
-              consumer.instrument(:process, instrumentation) do
-                call_id = properties[:correlation_id]
-                c = @mutex.synchronize{ @await.delete(call_id) }
-                if c
-                  @mutex.synchronize do
-                    @await[call_id] = [properties, payload]
-                  end
-                  @wakeup.synchronize do
-                    c.signal
-                  end
+            consumer.with_middlewares :sub, env do
+              call_id = properties[:correlation_id]
+              c = @mutex.synchronize{ @await.delete(call_id) }
+              if c
+                @mutex.synchronize do
+                  @await[call_id] = [properties, payload]
+                end
+                @wakeup.synchronize do
+                  c.signal
                 end
               end
             end
@@ -141,7 +138,7 @@ module Vx
               consumer.session.with_pub_channel do |ch|
                 exch = ch.exchange RPC_EXCHANGE_NAME
 
-                instrumentation = {
+                env = {
                   payload:     message,
                   rpc:         REQ,
                   exchange:    exch.name,
@@ -152,16 +149,14 @@ module Vx
 
                 @mutex.synchronize { @await[call_id] = cond }
 
-                consumer.with_middlewares :pub, instrumentation do
-                  consumer.instrument(:process_publishing, instrumentation) do
-                    exch.publish(
-                      message.to_json,
-                      routing_key:    routing_key,
-                      correlation_id: call_id,
-                      reply_to:       q.name,
-                      content_type:   JSON_CONTENT_TYPE
-                    )
-                  end
+                consumer.with_middlewares :pub, env do
+                  exch.publish(
+                    message.to_json,
+                    routing_key:    routing_key,
+                    correlation_id: call_id,
+                    reply_to:       q.name,
+                    content_type:   JSON_CONTENT_TYPE
+                  )
                 end
 
                 @wakeup.synchronize{
@@ -192,13 +187,6 @@ module Vx
           end
 
           def cancel
-            instrumentation = {
-              consumer: consumer.params.consumer_name,
-              rpc:      'consume'
-            }
-
-            consumer.instrument('cancel_consumer', instrumentation)
-
             if subscriber?
               @subscriber.cancel
               @subscriber = nil

data/lib/vx/lib/consumer/session.rb

@@ -6,8 +6,6 @@ module Vx
     module Consumer
       class Session
 
-        include Instrument
-
         @@session_lock  = Mutex.new
 
         @@shutdown_lock = Mutex.new
@@ -41,17 +39,13 @@ module Vx
         def close
           if open?
             @@session_lock.synchronize do
-              instrument("closing_connection", info: conn_info)
-
-              instrument("close_connection", info: conn_info) do
-                begin
-                  conn.close
-                  while conn.status != :closed
-                    sleep 0.01
-                  end
-                rescue Bunny::ChannelError, Bunny::ClientTimeout => e
-                  Consumer.exception_handler(e, {})
+              begin
+                conn.close
+                while conn.status != :closed
+                  sleep 0.01
                 end
+              rescue Bunny::ChannelError, Bunny::ClientTimeout => e
+                Consumer.exception_handler(e, {})
               end
               @conn = nil
             end
@@ -71,15 +65,9 @@ module Vx
                 automatically_recover: false
               )
 
-              instrumentation = { info: conn_info }.merge(options)
-
-              instrument("start_connecting", instrumentation)
-
-              instrument("connect", instrumentation) do
-                conn.start
-                while conn.connecting?
-                  sleep 0.01
-                end
+              conn.start
+              while conn.connecting?
+                sleep 0.01
               end
             end
           end

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

@@ -25,19 +25,16 @@ module Vx
         def handle_delivery(channel, delivery_info, properties, payload)
           payload = decode_payload properties, payload
 
-          instrumentation = {
+          env = {
             consumer:   params.consumer_name,
             payload:    payload,
             properties: properties,
             channel:    channel.id
           }
 
-          with_middlewares :sub, instrumentation do
-            instrument("start_processing", instrumentation)
-            instrument("process", instrumentation) do
-              allocate_pub_channel do
-                run_instance delivery_info, properties, payload, channel
-              end
+          with_middlewares :sub, env do
+            allocate_pub_channel do
+              run_instance delivery_info, properties, payload, channel
             end
           end
         end
@@ -59,10 +56,6 @@ module Vx
           def bind(options = {})
             qname = options[:queue] || params.queue_name
 
-            instrumentation = {
-              consumer: params.consumer_name
-            }
-
             session.open
 
             ch = session.conn.create_channel
@@ -78,22 +71,8 @@ module Vx
 
             q = session.declare_queue ch, qname, params.queue_options
 
-            instrumentation.merge!(
-              exchange:      x_name,
-              queue:         q.name,
-              queue_options: params.queue_options,
-            )
-
             if x_name != ''
-              instrumentation.merge!(
-                exchange_options: params.exchange_options,
-                bind: params.bind_options
-              )
-              instrument("bind_queue", instrumentation) do
-                q.bind(x, params.bind_options)
-              end
-            else
-              instrument("using_default_exchange", instrumentation)
+              q.bind(x, params.bind_options)
             end
 
             [ch, q]

data/lib/vx/lib/consumer/subscriber.rb

@@ -6,8 +6,6 @@ module Vx
     module Consumer
       class Subscriber < Bunny::Consumer
 
-        include Instrument
-
         attr_accessor :vx_consumer_name, :queue_name
 
         def initialize(*args)
@@ -16,17 +14,14 @@ module Vx
         end
 
         def graceful_shutdown
-          instrument('try_graceful_shutdown_consumer', consumer: vx_consumer_name)
           in_progress do
             cancel
-            instrument('graceful_shutdown_consumer', consumer: vx_consumer_name)
           end
         end
 
         def try_graceful_shutdown
           if @lock.try_lock
             begin
-              instrument('graceful_shutdown_consumer', consumer: vx_consumer_name)
               cancel
             ensure
               @lock.unlock
@@ -55,7 +50,6 @@ module Vx
         end
 
         def cancel
-          instrument('cancel_consumer', consumer: vx_consumer_name, channel: channel.id)
           unless closed?
             super
             channel.close unless closed?

data/lib/vx/lib/consumer/version.rb

@@ -1,7 +1,7 @@
 module Vx
   module Lib
     module Consumer
-      VERSION = "0.2.2"
+      VERSION = "0.3.0"
     end
   end
 end

data/vx-lib-consumer.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'bunny', '= 1.6.3'
+  spec.add_runtime_dependency 'bunny',               '= 1.6.3'
   spec.add_runtime_dependency 'vx-lib-rack-builder', '>= 0.0.2'
 
   spec.add_development_dependency "bundler", "~> 1.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-lib-consumer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -98,7 +98,6 @@ files:
 - lib/vx/lib/consumer/ack.rb
 - lib/vx/lib/consumer/configuration.rb
 - lib/vx/lib/consumer/error.rb
-- lib/vx/lib/consumer/instrument.rb
 - lib/vx/lib/consumer/params.rb
 - lib/vx/lib/consumer/publish.rb
 - lib/vx/lib/consumer/rpc.rb

data/lib/vx/lib/consumer/instrument.rb

@@ -1,27 +0,0 @@
-module Vx
-  module Lib
-    module Consumer
-      module Instrument
-
-        def instrument(name, payload, &block)
-          name = "#{name}.consumer.vx".freeze
-
-          if Consumer.configuration.debug?
-            $stdout.puts " --> #{name}: #{payload}"
-          end
-
-          if Consumer.configuration.instrumenter
-            Consumer.configuration.instrumenter.instrument(name, payload, &block)
-          else
-            begin
-              yield if block_given?
-            rescue Exception => e
-              Consumer.handle_exception(e, {})
-            end
-          end
-        end
-
-      end
-    end
-  end
-end