vx-common-amqp 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54e3c9dbe252243ef45f59ea7aa87cf5dbffeacf
-  data.tar.gz: f48f4bdd1a4a5379f784a726f31f8415d975fdaa
+  metadata.gz: 2251542292e73fae9c86662ae4b6888e0752d238
+  data.tar.gz: 01e1467005dea28437f1a44eedbb0202d8cc9cea
 SHA512:
-  metadata.gz: d8f9386fdb87efd6c5dbf7f8a1e8ede4c1a15aa26e6365e0ba34e6337cd55c08ed02501b8f5e1beb1e8ece49677b0f8fc0a285c773334d2a14a585c85cc1b65e
-  data.tar.gz: 94f7106d5acce4225299d71ab1967779a460791c467ae30969947b9654e9428bc2988e0f57b3f2dae4dcadc06d2d3a2c7f1a2bc074cd9330011b695f2a0916ef
+  metadata.gz: a142abeb99aa4f54a4d2135817fe211b28468545dc304b06528de30502951ff897573d21391dbb4b21c245fb729c8bb56028eef5a703ae3692b9cb51e2d18db2
+  data.tar.gz: b877c2bf0be744fef8f7e11c34e11f19dde8cbe20fcf799dc0e0f70cbaa0e077b8e860b6c7690e4a4cdfb1675b57c794d4ebd00ab6404ac122fb25ecde608eee

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

@@ -8,6 +8,7 @@ module Vx
             consumer_id:   self.class.consumer_id,
             consumer:      self.class.consumer_name,
             multiple:      multiple,
+            payload:       payload,
             uuid:          uuid,
           }
           self.class.session.channel.ack delivery_info.delivery_tag, multiple
@@ -18,6 +19,7 @@ module Vx
           instrumentation = {
             consumer_id:   self.class.consumer_id,
             consumer:      self.class.consumer_name,
+            payload:       payload,
             multiple:      multiple,
             requeue:       requeue,
             uuid:          uuid,

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

@@ -14,7 +14,7 @@ module Vx
           x = declare_exchange
 
           instrumentation = {
-            message:     message.inspect,
+            payload:     message,
             exchange:    x.name,
             consumer:    consumer_name,
             consumer_id: consumer_id

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

@@ -18,7 +18,12 @@ module Vx
             x = declare_exchange
             q = declare_queue
 
-            instrumentation = { exchange: x.name, queue: q.name, consumer: consumer_id }
+            instrumentation = {
+              exchange:    x.name,
+              queue:       q.name,
+              consumer_id: consumer_id,
+              consumer:    consumer_name
+            }
             instrument("start.consumer.amqp", instrumentation)
 
             q.bind(x, bind_options)
@@ -33,16 +38,8 @@ module Vx
           unpacked = nil
           delivery_info, properties, payload = q.pop(ack: ack)
 
-          instrumentation = {
-            properties:    properties,
-            consumer_id:   consumer_id,
-            consumer:      consumer_name
-          }
-
           if payload
-            instrument("unpacking.consumer.amqp", instrumentation) do
-              unpacked = deserialize_message properties, payload
-            end
+            unpacked = deserialize_message properties, payload
           end
 
           [unpacked, delivery_info, properties]
@@ -57,21 +54,19 @@ module Vx
               delivery_info, properties, payload = q.pop(ack: ack)
 
               if payload
-                result = nil
-                uuid   = SecureRandom.uuid
+                payload = deserialize_message properties, payload
+                result  = nil
+                uuid    = SecureRandom.uuid
 
                 instrumentation = {
-                  properties:    properties,
                   consumer_id:   consumer_id,
                   consumer:      consumer_name,
+                  payload:       payload,
                   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
 
@@ -87,6 +82,7 @@ module Vx
               inst.properties    = properties
               inst.delivery_info = delivery_info
               inst.uuid          = uuid
+              inst.payload       = payload
             end.perform payload
           end
 

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

@@ -18,6 +18,7 @@ module Vx
         attr_accessor :properties
         attr_accessor :channel
         attr_accessor :uuid
+        attr_accessor :payload
 
         @@classes = []
 

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-common-amqp
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dmitry Galinsky