sqewer 6.0.6 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a2ea4f82f0df911ffb45032ec714b8d2545780a
-  data.tar.gz: 3bde7fb9fb85a51a80ab566768a3eafd23c2825d
+  metadata.gz: 1301945308afd9596e1b563dd0ed568f8dd2bd82
+  data.tar.gz: 770c8114bf9ef3bc84b96dcfb6a08fb251d77643
 SHA512:
-  metadata.gz: 592ba8e297da9d9e7a07a35cbb0521cd6f932e376709933560eec4ea609482f0ca00956612ab839ca4df83e2bec7dd35fb3612c856fb2ee0fc1c0e0d92ba9a9d
-  data.tar.gz: 56005129f98d24234235de265cf1216433392276018011276f4872fa742ab80b5c62aea82b227881a4aca7e65fe56d24f2e424fa1afea64e040c7c79948b2854
+  metadata.gz: fdcd703b863c6e5ce2af7adeaf4a6205304d7c42ed0a227dc7d466c270294013efba20d7f2030c644663c6f6a6c98549b364802eeb407664e646056fa9d7adbe
+  data.tar.gz: 408b96e763f411673b914011cb5f70dfde2b791da07a4487f3b018d5dad8ae1b1f01a83cc0a5cf182ec7852672dfadb97a46c92a34e0007e47aa22a5b6673b2f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 6.1.0
+- Pass SQS message attributes through the middleware chain
+- Recover the SentTimestamp attribute and set it as queue start in Appsignal
+- Make sure a job given to `submit!` responds to `run`
+
 ### 6.0.6
 - Make sure :sqewer ActiveJob adapter parameter works in both Rails 4
   and Rails 5.

data/README.md

@@ -248,8 +248,8 @@ You can wrap job processing in middleware. A full-featured middleware class look
 
     class MyWrapper
       # Surrounds the job instantiation from the string coming from SQS.
-      def around_deserialization(serializer, msg_id, msg_payload)
-        # msg_id is the receipt handle, msg_payload is the message body string
+      def around_deserialization(serializer, msg_id, msg_payload, msg_attributes)
+        # msg_id is the receipt handle, msg_payload is the message body string, msg_attributes are the message's attributes
         yield
       end
       

data/lib/sqewer/connection.rb

@@ -14,7 +14,7 @@ class Sqewer::Connection
   NotOurFaultAwsError = Class.new(StandardError)
 
   # A wrapper for most important properties of the received message
-  class Message < Struct.new(:receipt_handle, :body)
+  class Message < Struct.new(:receipt_handle, :body, :attributes)
     def inspect
       body.inspect
     end
@@ -57,7 +57,7 @@ class Sqewer::Connection
     Retriable.retriable on: Seahorse::Client::NetworkingError, tries: MAX_RANDOM_RECEIVE_FAILURES do
       response = client.receive_message(queue_url: @queue_url,
         wait_time_seconds: DEFAULT_TIMEOUT_SECONDS, max_number_of_messages: BATCH_RECEIVE_SIZE)
-      response.messages.map {|message| Message.new(message.receipt_handle, message.body) }
+      response.messages.map {|message| Message.new(message.receipt_handle, message.body, message.attributes) }
     end
   end
 

data/lib/sqewer/extensions/appsignal_wrapper.rb

@@ -22,7 +22,7 @@ module Sqewer
         def env; {params: self.params}; end
       end
 
-      def around_deserialization(serializer, msg_id, msg_payload)
+      def around_deserialization(serializer, msg_id, msg_payload, msg_attributes)
         return yield unless Appsignal.active?
 
         # This creates a transaction, but also sets it as the Appsignal.current_transaction
@@ -35,7 +35,9 @@ module Sqewer
 
         transaction.set_action('%s#%s' % [serializer.class, 'unserialize'])
         transaction.request.params = {:sqs_message_body => msg_payload.to_s}
-        transaction.set_http_or_background_queue_start
+        if msg_attributes.key?('SentTimestamp')
+          transaction.set_queue_start = Time.at(msg_attributes['SentTimestamp'].to_i / 1000.0)
+        end
 
         job_unserialized = yield
 

data/lib/sqewer/middleware_stack.rb

@@ -33,12 +33,12 @@ class Sqewer::MiddlewareStack
     }.call
   end
 
-  def around_deserialization(serializer, message_id, message_body, &inner_block)
+  def around_deserialization(serializer, message_id, message_body, message_attributes, &inner_block)
     return yield if @handlers.empty?
 
     responders = @handlers.select{|e| e.respond_to?(:around_deserialization) }
     responders.reverse.inject(inner_block) {|outer_block, middleware_object|
-      ->{ middleware_object.public_send(:around_deserialization, serializer, message_id, message_body, &outer_block) }
+      ->{ middleware_object.public_send(:around_deserialization, serializer, message_id, message_body, message_attributes, &outer_block) }
     }.call
   end
 end

data/lib/sqewer/submitter.rb

@@ -3,6 +3,7 @@
 # and the serializer (something that responds to `#serialize`) to
 # convert the job into the string that will be put in the queue.
 class Sqewer::Submitter < Struct.new(:connection, :serializer)
+  NotSqewerJob = Class.new(StandardError)
 
   # Returns a default Submitter, configured with the default connection
   # and the default serializer.
@@ -11,6 +12,7 @@ class Sqewer::Submitter < Struct.new(:connection, :serializer)
   end
 
   def submit!(job, **kwargs_for_send)
+    raise NotSqewerJob.new("Submitted object is not a valid job: #{job.inspect}") unless job.respond_to?(:run)
     message_body = if delay_by_seconds = kwargs_for_send[:delay_seconds]
       clamped_delay = clamp_delay(delay_by_seconds)
       kwargs_for_send[:delay_seconds] = clamped_delay

data/lib/sqewer/version.rb

@@ -1,3 +1,3 @@
 module Sqewer
-  VERSION = '6.0.6'
+  VERSION = '6.1.0'
 end

data/lib/sqewer/worker.rb

@@ -204,7 +204,7 @@ class Sqewer::Worker
     box = Sqewer::ConnectionMessagebox.new(connection)
     return box.delete_message(message.receipt_handle) unless message.has_body?
 
-    job = middleware_stack.around_deserialization(serializer, message.receipt_handle, message.body) do
+    job = middleware_stack.around_deserialization(serializer, message.receipt_handle, message.body, message.attributes) do
       serializer.unserialize(message.body)
     end
     return unless job
@@ -243,7 +243,7 @@ class Sqewer::Worker
     # thread-safe - or at least not it's HTTP client part).
     box = Sqewer::ConnectionMessagebox.new(connection)
 
-    job = middleware_stack.around_deserialization(serializer, message.receipt_handle, message.body) do
+    job = middleware_stack.around_deserialization(serializer, message.receipt_handle, message.body, message.attributes) do
       serializer.unserialize(message.body)
     end
     return unless job

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqewer
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.1.0
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs