scout_apm 2.1.15 → 2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2432d4b3a94011da560df94d67bfda1c0e58ed80
-  data.tar.gz: bafd8c126d8ea5e1329d7d9e119ce24cacea9af3
+  metadata.gz: 29e9f474f0b675658b415e0d23a1f498217b1edd
+  data.tar.gz: 870419ac7831ba6bed3fe631b86cab7858125f70
 SHA512:
-  metadata.gz: 766e322ec27e6ba797cb7756e67975e2b4c41b3cc5c1ad957054445e798b05c75878e28d46641f6d6fc5ff86dfb8351d4500a5264f5aa7d3f9f778715b8c7517
-  data.tar.gz: 62a7ce7ee17fcfed6011fba1b62fb40795ba7c5b31fc6a7bd2d20f17c9af2c84ffe3c9c3bd56a513b6561f8cb3170fe078c76e1dd6892df22a03d1facc0555e0
+  metadata.gz: dd9b7433c16697e9a5757f7f5839a48ea5ddd5dfe7f8ea69e7eca137020f90a7670d2ee7bd0395e2b66787f9328884d3087cc09628c17cb2c52bb9813b165f4a
+  data.tar.gz: 3e77160ad682754733aefe1a6d8be67b3a70274f3685c006fdad8c37834d3a45263724255cdab3407b4c50e7ebe7da5748085895dbd1762969dc6f798ebfd06e

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.1.16
+
+* Extract the name correctly for DelayedJob workers run via ActiveJob
+
 # 2.1.15
 
 * Limit memory usage for very long running requests.

data/lib/scout_apm/background_job_integrations/delayed_job.rb

@@ -1,6 +1,8 @@
 module ScoutApm
   module BackgroundJobIntegrations
     class DelayedJob
+      ACTIVE_JOB_KLASS = 'ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper'.freeze
+
       attr_reader :logger
 
       def name
@@ -23,7 +25,15 @@ module ScoutApm
             lifecycle.around(:invoke_job) do |job, *args, &block|
               ScoutApm::Agent.instance.start_background_worker unless ScoutApm::Agent.instance.background_worker_running?
 
-              name = job.name
+              name = begin
+                       if job.payload_object.class.to_s == ACTIVE_JOB_KLASS
+                         job.payload_object.job_data["job_class"]
+                       else
+                         job.name
+                       end
+                     rescue
+                       job.name
+                     end
               queue = job.queue || "default"
 
               req = ScoutApm::RequestManager.lookup

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.15"
+  VERSION = "2.1.16"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.15
+  version: 2.1.16
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest