skylight-core 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f304ee5634a0e64ef85b3b34bf2f29f21db7ec1a512d4e6c0441e2e1977ba86
-  data.tar.gz: 85ee002ae23cb1a6b61858e23294c97258da9a06723f815afd9ad741a0a389b3
+  metadata.gz: 5c97eeb92d20fa41cb51d27ca04a7fd736ba6fcb0c81f7697fa89bff76666cbb
+  data.tar.gz: 439e037bbb5e5d0e9f8262fd533b4b570e84392122ea4a9eb4e8f5bd36d5308a
 SHA512:
-  metadata.gz: 1721fb03d1982d06c9f1e9b7d668f9ea7efdc3c416a796e70613fa71b20804c0dc922bc9b218af6fba2897074a42bb909b1e8f866ceaa0949cf137f9f531d4fc
-  data.tar.gz: 215e468eea9895f4a1181b9717d3a0fb49cf036c13188fc33e3516dd4d0c3c05d002a121eed9180cf9ef20c7866f9ac165de1cb9c984bfcfa5b2551e4be86d08
+  metadata.gz: 3681da84f5e8bcc320de64d555b7520311c4143d593ac1df00e06991d85368b43b157d12f25b771be5dd9ef7ae2b512b8d5126c126a02b1f385180cac18fb7c8
+  data.tar.gz: b087cdf2965947ead6ea3186fdc85a7c25f6e0fbe7402b11fa5082fc1b7919338b57eec43a7c3f8b327eb8496996414a75f249b236f907457c16cbf951ceb537

data/lib/skylight/core/normalizers/active_job/perform.rb

@@ -5,6 +5,7 @@ module Skylight::Core
         register "perform.active_job"
 
         DELIVERY_JOB = "ActionMailer::DeliveryJob".freeze
+        DELAYED_JOB_WRAPPER = "ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper".freeze
 
         def self.normalize_title(job_instance)
           job_instance.class.name.to_s.tap do |str|
@@ -51,7 +52,10 @@ module Skylight::Core
           def assign_endpoint?(trace, payload)
             # Always assign the endpoint if it has not yet been assigned by the ActiveJob probe.
             return true unless trace.endpoint
-            return unless defined?(Skylight::Core::Probes::ActiveJob::Probe::TITLE)
+            return true if defined?(Skylight::Core::Probes::ActiveJob::Probe::TITLE) &&
+              trace.endpoint == Skylight::Core::Probes::ActiveJob::Probe::TITLE
+            return true if defined?(SKylight::Core::Probes::DelayedJob::Probe::UNKNOWN) &&
+              trace.endpoint == Skylight::Core::Probes::DelayedJob::Probe::UNKNOWN
 
             # If a job is called using #perform_now inside a controller action
             # or within another job's #perform method, we do not want this to
@@ -59,9 +63,12 @@ module Skylight::Core
             #
             # If the current endpoint name matches this payload, return true to allow the
             # segment to be assigned by normalize_after.
-            trace.endpoint == Skylight::Core::Probes::ActiveJob::Probe::TITLE ||
-              trace.endpoint == DELIVERY_JOB ||
-              trace.endpoint == normalize_title(payload[:job])
+            trace.endpoint == DELIVERY_JOB ||
+              trace.endpoint == normalize_title(payload[:job]) ||
+              # This adapter wrapper needs to be handled specifically due to interactions with the
+              # standalone Delayed::Job probe, as there is no consistent way to get the wrapped
+              # job name among all Delayed::Job backends.
+              trace.endpoint == DELAYED_JOB_WRAPPER
           end
 
           def normalize_title(job_instance)

data/lib/skylight/core/probes/delayed_job.rb

@@ -2,6 +2,8 @@ module Skylight::Core
   module Probes
     module DelayedJob
       class Probe
+        UNKNOWN = "<Delayed::Job Unknown>".freeze
+
         def install
           return unless validate_version
           ::Delayed::Worker.class_eval do
@@ -11,7 +13,18 @@ module Skylight::Core
 
             def run(job, *args)
               t { "Delayed::Job beginning trace" }
-              Skylight.trace(job.name, "app.delayed_job.worker", "Delayed::Worker#run", segment: job.queue) do
+
+              handler_name = begin
+                if defined?(::Delayed::PerformableMethod) && job.payload_object.is_a?(::Delayed::PerformableMethod)
+                  job.name
+                else
+                  job.payload_object.class.name
+                end
+              rescue
+                UNKNOWN
+              end
+
+              Skylight.trace(handler_name, "app.delayed_job.worker", "Delayed::Worker#run", segment: job.queue) do
                 run_without_sk(job, *args)
               end
             end

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.0.1".freeze
+    VERSION = "4.0.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport