skylight-core 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06889a19d37ec9b12ae47c1644a8d8eda1f01328caeed931a5c4459e8efff6b0'
-  data.tar.gz: e4a6317fd536c10e97949a0a1bb76dc8fd3b8b7ee78e75e67cea8e199097894c
+  metadata.gz: df3ec461ddd41697f525347a5321300d4c4fd414466405edf173bd8224f8422d
+  data.tar.gz: b8d4602521b419866e94d1799639331e49fa256e550af7806cdc4a5e6aa057cd
 SHA512:
-  metadata.gz: 871356b1ff5214e0a322798bca7749e2e8f8081cf0fad3611dc35cd98f18ea922650c03c9e0be6fed5197f3fee77e69bf36f9230069150ff2633c971c1bfae3d
-  data.tar.gz: c265c61910a054232d749b34de7f406c12c4f86c779a5873c2f19264f9d6987f26b73badd234f5b04b8857d58f043118938e2cd9e0ab83e6ad153ae580e19790
+  metadata.gz: ddda351c0978c6f3114ecc7fe2dc1a05ea38754931cdf7574c3534112c35928a862bfe99ee740a18d678e78976d6066cc6b81eaeb531ded763679a511b773c90
+  data.tar.gz: 6513777f0659db9ea52c9b29487358efa45a9642170cabb76f4b82d8efca467f8ee38e5980ba3ce7ee5f934f9192d78fc54950a20c709f27dab7f9782832e9f4

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

@@ -7,17 +7,18 @@ module Skylight::Core
         CAT = "app.job.perform".freeze
 
         def normalize(trace, _name, payload)
-          title = "#{payload[:job].class}"
+          title = normalize_title(payload[:job])
           adapter_name = normalize_adapter_name(payload[:adapter])
           desc = "{ adapter: '#{adapter_name}', queue: '#{payload[:job].queue_name}' }"
 
-          trace.endpoint = title
+          trace.endpoint = title if assign_endpoint?(trace, payload)
 
           [ CAT, title, desc ]
         end
 
         def normalize_after(trace, _span, _name, payload)
-          return unless config.enable_segments?
+          return unless config.enable_segments? && assign_endpoint?(trace, payload)
+
           trace.endpoint += "<sk-segment>#{payload[:job].queue_name}</sk-segment>"
         end
 
@@ -29,6 +30,17 @@ module Skylight::Core
         rescue
           'active_job'
         end
+
+        def assign_endpoint?(trace, payload)
+          return false unless defined?(Skylight::Core::Probes::ActiveJob::Probe::TITLE)
+
+          trace.endpoint == Skylight::Core::Probes::ActiveJob::Probe::TITLE ||
+            trace.endpoint == normalize_title(payload[:job])
+        end
+
+        def normalize_title(job_instance)
+          "#{job_instance.class}"
+        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
+              Skylight.trace(TITLE, 'app.job.execute') do
                 execute_without_sk(*args)
               end
             end

data/lib/skylight/core/version.rb

@@ -1,6 +1,6 @@
 module Skylight
   module Core
-    VERSION = '3.1.3'
+    VERSION = '3.1.4'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -267,8 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: The core methods of the Skylight profiler.