sqewer 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3551145e9869e9bfd543de4fc88b47a08d4cfeec
-  data.tar.gz: 9309e047cdbeae9a9c8e82e3f65cb113781df440
+  metadata.gz: 46d6379551635abf688acf36eae180bf893cd1d1
+  data.tar.gz: 1b72a67a522b77932306175616e7e4ca875e480d
 SHA512:
-  metadata.gz: 791d2cf7b39235df354acade60340c3c9ef513a116462586554e5bd58b3ba8582de2878cb03cd4f76bbffae495dc6f448e5939d460ea4adb646698200038347e
-  data.tar.gz: 7354e23d35a4a0d7d5e153557970f795c1c57b9ea2d34029a920826337dd99b887c00ccc8d546fabab021b877f1c768fef77c62dbd99b6f6cb68b0a1a9f49039
+  metadata.gz: 41b592290fa5616d61f5a2ca30a3a43e513ed603785426902d9677cb4406c4c08dd3db052aa3c22fb34bd6775443e89e12fab7ceacc2ccace5a65bd83c0a34bb
+  data.tar.gz: 066c8923a4db8070804c322335134af46f61426e84fc000a04712c43a9fc60b7ffff6d55064315dbd7fc0b11d83aded4fed5a07b9512838fa474dd6d55a29e10

data/lib/sqewer/extensions/appsignal_wrapper.rb

@@ -4,25 +4,73 @@ module Sqewer
     # to Appsignal and to monitor performance. Will only activate
     # if the Appsignal gem is loaded within the current process and active.
     class AppsignalWrapper
-      # Unserialize the job
+      def self.new
+        if defined?(Appsignal)
+          super
+        else
+          nil
+        end
+      end
+
+      # Acts as a replacement for Appsignal::GenericRequest
+      class FakeRequest < Struct.new(:params)
+        def initialize; super({}); end
+        def env; {params: self.params}; end
+      end
+
       def around_deserialization(serializer, msg_id, msg_payload)
-        return yield unless (defined?(Appsignal) && Appsignal.active?)
+        return yield unless Appsignal.active?
+
+        # This creates a transaction, but also sets it as the Appsignal.current_transaction
+        # which is a thread-local variable. We DO share this middleware between threads,
+        # but since the object lives in thread locals it should be fine.
+        transaction = Appsignal::Transaction.create(
+          SecureRandom.uuid,
+          namespace = Appsignal::Transaction::BACKGROUND_JOB,
+          request = FakeRequest.new)
+
+        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
 
-        Appsignal.monitor_transaction('perform_job.demarshal', 
-          :class => serializer.class.to_s, :params => {:recepit_handle => msg_id}, :method => 'deserialize') do
-          yield
+        job_unserialized = yield
+
+        if !job_unserialized
+          # If the job is nil or falsy, we skip the execution. In that case we finish the transaction.
+          Appsignal::Transaction.complete_current!
+        else
+          # If not, then the job will be executed - keep the transaction open for execution block
+          # that comes next. Hacky but should work.
+          set_transaction_details_from_job(transaction, job_unserialized)
+        end
+        return job_unserialized
+      rescue Exception => e
+        if transaction
+          # If an exception is raised, raise it through and also set it as the Appsignal exception
+          # and commit the transaction.
+          transaction.set_error(e)
+          Appsignal::Transaction.complete_current!
         end
+        raise e
+      end
+
+      def set_transaction_details_from_job(transaction, job)
+        transaction.set_action('%s#%s' % [job.class.to_s, 'run'])
+        job_params = job.respond_to?(:to_h) ? job.to_h : {}
+        transaction.request.params = job_params
       end
 
       # Run the job with Appsignal monitoring.
       def around_execution(job, context)
-        return yield unless (defined?(Appsignal) && Appsignal.active?)
-        job_params = job.respond_to?(:to_h) ? job.to_h : {}
-        Appsignal.monitor_transaction('perform_job.sqewer', 
-          :class => job.class.to_s, :params => job_params, :method => 'run') do |t|
-            context['appsignal.transaction'] = t
-          yield
-        end
+        return yield unless Appsignal.active?
+        transaction = Appsignal::Transaction.current
+        set_transaction_details_from_job(transaction, job)
+        yield
+      rescue Exception => e
+        transaction.set_error(e) if transaction
+        raise e
+      ensure
+        Appsignal::Transaction.complete_current! if transaction
       end
     end
   end

data/lib/sqewer/version.rb

@@ -1,3 +1,3 @@
 module Sqewer
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
 end

data/sqewer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sqewer 5.0.2 ruby lib
+# stub: sqewer 5.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sqewer"
-  s.version = "5.0.2"
+  s.version = "5.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2016-07-01"
+  s.date = "2016-09-06"
   s.description = "Process jobs from SQS"
   s.email = "me@julik.nl"
   s.executables = ["sqewer", "sqewer_rails"]
@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://gitlab.wetransfer.net/julik/sqewer"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.5.1"
   s.summary = "A full-featured library for all them worker needs"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqewer
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A full-featured library for all them worker needs