skylight-core 4.0.0.alpha3 → 4.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9eb39c7b8b4247a019740d8ac1784ed1442ae33f20bfc04fe061be5151a8e3
-  data.tar.gz: 78c44b3fe3015152a7ebef7da37986e25bd87d48ddae853fdd7af77030dcb40b
+  metadata.gz: 5b333f6d3704521099216e030773e068bbae7fb08cdea202b8ffc81e76a0beed
+  data.tar.gz: 00042ab9ca7c24ccba1ea0ebebcbfb664aa78755cfc9d6ae6595f2f7e5754bd4
 SHA512:
-  metadata.gz: 6797bce1826972cba73f28d2f4c0c941fb3b9f6e593e022d6d58f7fccb155e9162055a0d3defc82aa790d8c2d4c308cd662ea9014dcdce19c3e8d3cf6eaaf201
-  data.tar.gz: 9831703c5ed2ecf9468c0b6ffde0237c04fe7f7abadb9c4eee9b4697730521a8a870cff9d42089edb571d3ff3ce96f16c017fbef132c4f6af0e9580b38a2ae05
+  metadata.gz: 38a125f7978eb1c05a848a06edaf10ffea2b16227ea474ea0e9a069633ed40029baf8667e569a9664621a486e0bea053011609c9703d634f20ca04489d9aae46
+  data.tar.gz: c53a44d21608de2a245a8b36ef8d7d4b02870723c88dde340d036473803002f2bef202354cafe3e5b040988adc083dceebf4e575508add93d068945dd13f1fd5

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

@@ -11,7 +11,7 @@ module Skylight::Core
           adapter_name = normalize_adapter_name(payload[:adapter])
           desc = "{ adapter: '#{adapter_name}', queue: '#{payload[:job].queue_name}' }"
 
-          trace.endpoint = title
+          maybe_set_endpoint(trace, title)
 
           [CAT, title, desc]
         end
@@ -29,6 +29,16 @@ module Skylight::Core
           rescue
             "active_job"
           end
+
+          def maybe_set_endpoint(trace, string)
+            trace.endpoint ||= string
+
+            # 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
+            # overwrite the existing endpoint name (unless it is the default from ActiveJob).
+            return unless trace.endpoint == Skylight::Core::Probes::ActiveJob::Probe::TITLE
+            trace.endpoint = string
+          end
       end
     end
   end

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

@@ -2,12 +2,14 @@ module Skylight::Core
   module Probes
     module ActiveJob
       class Probe
+        TITLE = "ActiveJob.execute".freeze
+
         def install
           ::ActiveJob::Base.instance_eval do
             alias execute_without_sk execute
 
             def execute(*args)
-              Skylight.trace("ActiveJob.execute", "app.job.execute") do |trace|
+              Skylight.trace(TITLE, "app.job.execute") do |trace|
                 # See normalizers/active_job/perform for endpoint/segment assignment
                 begin
                   execute_without_sk(*args)

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.0.0-alpha3".freeze
+    VERSION = "4.0.0-alpha4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha3
+  version: 4.0.0.alpha4
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport