alacrity-rails 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e71baac37d033be722f516ca9e2517f37acb4a1
-  data.tar.gz: f56b3bc0f27d22f9790d6fd2effd77bb4ef8174d
+  metadata.gz: 7666d6b3cb82b1026dc43efb158d4033bb84475e
+  data.tar.gz: ee882991c3880d6b931ebca2960d27d228582d12
 SHA512:
-  metadata.gz: a94cc4f73f7f24f4a148aedff5494fa993cf30c14e012a0b516b53a5fdad4f7cdfcbe54c502b9b68a5337caf2ddd083c23d3ab01470a02b9f213ebe82c9112f7
-  data.tar.gz: 86f3312d6b307c6b7f30262ee32836d3c3026a0cb8145c9af848de9eaa7057a7cd3d383a66cd64d5dd58657f683e6e11667299890be437cd11e476e7d0e37b05
+  metadata.gz: 3518a958c64a7529d4c208a842827282caf65d8fcd1ce27274184f36b20235ee5e1601b5dd42a2da1ef7eb336ced76f82975ebc05d3dffa2c243842083d92642
+  data.tar.gz: 8da3cf36ce329bcab43f9b6194e75065e6a1a317adfc87f1cfa53bb077a88d0f55325dc65fb16ccba09e40a474aa05ecb4a5971b5f431919ff0167f441bee2f6

data/lib/alacrity-rails.rb

@@ -23,6 +23,18 @@ module AlacrityRails
     autoload :MongoDriver,             'alacrity-rails/probe/mongo_driver'
     autoload :Sidekiq,                 'alacrity-rails/probe/sidekiq'
     autoload :SidekiqServerMiddleware, 'alacrity-rails/probe/sidekiq'
+
+    LIST = [
+      Probe::ActionController,
+      Probe::ActionMailer,
+      Probe::ActionView,
+      Probe::ActiveJob,
+      Probe::ActiveModelSerializers,
+      Probe::ActiveRecord,
+      Probe::MongoDriver,
+      Probe::Excon,
+      Probe::Sidekiq
+    ].freeze
   end
 
   module Transaction

data/lib/alacrity-rails/probe/active_job.rb

@@ -16,3 +16,21 @@ module AlacrityRails
     end
   end
 end
+
+class ::ActiveJob::Base
+  around_perform :alacrity_instrumentor
+
+  private
+
+  def alacrity_instrumentor
+    AlacrityRails::Instrumentor.instrument(
+      type: AlacrityRails::Transaction::Job,
+      data: {
+        worker_class: self.class.to_s,
+        args: @arguments
+      }
+    ) do
+      yield
+    end
+  end
+end

data/lib/alacrity-rails/probe/sidekiq.rb

@@ -1,7 +1,11 @@
 module AlacrityRails
   module Probe
     class SidekiqServerMiddleware
+      ACTIVE_JOB_WRAPPER = /^ActiveJob::QueueAdapters::.+$/
+
       def call(worker_instance, msg, queue)
+        return if ACTIVE_JOB_WRAPPER.match(msg['class'])
+
         AlacrityRails::Instrumentor.instrument(
           type: AlacrityRails::Transaction::Job,
           data: {

data/lib/alacrity-rails/railtie.rb

@@ -6,17 +6,7 @@ module AlacrityRails
 
         config.middleware.insert_before 0, AlacrityRails::Middleware
 
-        [
-          Probe::ActionController,
-          Probe::ActionMailer,
-          Probe::ActionView,
-          Probe::ActiveJob,
-          Probe::ActiveModelSerializers,
-          Probe::ActiveRecord,
-          Probe::MongoDriver,
-          Probe::Excon,
-          Probe::Sidekiq
-        ].each(&:activate)
+        Probe::LIST.each(&:activate)
       end
     end
   end

data/lib/alacrity-rails/version.rb

@@ -1,3 +1,3 @@
 module AlacrityRails
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alacrity-rails
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Alacrity, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-24 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails