scout_apm 2.1.31 → 2.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb46c36dc0f4c1ccda7a499e8f24b3a169b18f96
-  data.tar.gz: 931412d8a6a6fda9f07e3b996414da0670590e1a
+  metadata.gz: 13a92807ec823e335d8c008de7b2ee934f2b2a5a
+  data.tar.gz: 0914f1345038c081b84dd22ee1b98f009cbd8bb5
 SHA512:
-  metadata.gz: e496c29a689f6b651766f219c4e89b42bf7b105c270601f101e3790a53df2eba8e1cfb43df0c4d54f3faffff7c195819307d97bdabe49740e454c6eff1fc7dd4
-  data.tar.gz: ff5fd16fc53b58e2bb9a9dfd4198a56428e197f7a3b49c463acbc66ef1f6d2ff96cc2f630244165c143e55293f9bf0811c3dda58c55d2c01f89158425ed346a7
+  metadata.gz: 917cd00759988d396425711cc5471641edbf8c02a5434e2cea567a6d4bb1aea8fdb06b429950289631b7338432a528a9bd82033a154c6ccdf58a5ca835deed4d
+  data.tar.gz: 958687024b4bc80bf5c7364196b0a06c8cfc61e3afce63777c0fa31a5203c6ba892a7089a58e0539d2a6976c53fae2f4557f47a279eea89718d0d9cdc2cb0dc1

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 2.1.32
+
+* Better naming when using Resque + ActiveJob
+* Better naming when using Sidekiq + DelayedExtension
+
 # 2.1.31
 
 * Better detection of Resque queue names

data/lib/scout_apm/background_job_integrations/sidekiq.rb

@@ -55,8 +55,6 @@ module ScoutApm
     # We insert this middleware into the Sidekiq stack, to capture each job,
     # and time them.
     class SidekiqMiddleware
-      ACTIVE_JOB_KLASS = 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper'.freeze
-
       def call(_worker, msg, queue)
         req = ScoutApm::RequestManager.lookup
         req.job!
@@ -79,12 +77,30 @@ module ScoutApm
       end
 
       UNKNOWN_CLASS_PLACEHOLDER = 'UnknownJob'.freeze
+      ACTIVE_JOB_KLASS = 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper'.freeze
+      DELAYED_WRAPPER_KLASS = 'Sidekiq::Extensions::DelayedClass'.freeze
+
 
       def job_class(msg)
         job_class = msg.fetch('class', UNKNOWN_CLASS_PLACEHOLDER)
+
         if job_class == ACTIVE_JOB_KLASS && msg.key?('wrapped')
-          job_class = msg['wrapped']
+          begin
+            job_class = msg['wrapped']
+          rescue
+            ACTIVE_JOB_KLASS
+          end
+        elsif job_class == DELAYED_WRAPPER_KLASS
+          begin
+            yml = msg['args'].first
+            deserialized_args = YAML.load(yml)
+            klass, method, *rest = deserialized_args
+            job_class = [klass,method].map(&:to_s).join(".")
+          rescue
+            DELAYED_WRAPPER_KLASS
+          end
         end
+
         job_class
       rescue
         UNKNOWN_CLASS_PLACEHOLDER

data/lib/scout_apm/instruments/resque.rb

@@ -5,6 +5,11 @@ module ScoutApm
         job_name = self.to_s
         queue = find_queue
 
+        if job_name == "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper"
+          job_name = args.first["job_class"] rescue job_name
+          queue = args.first["queue_name"] rescue queue_name
+        end
+
         req = ScoutApm::RequestManager.lookup
         req.job!
 

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.31"
+  VERSION = "2.1.32"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.31
+  version: 2.1.32
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest