skylight-core 3.1.0.beta → 3.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e728cb584714e19aa0ccdc0922ac399c52e59b580033094eff49a478589da1fa
-  data.tar.gz: d0e4c19a788911437dd92e89a9161c00462aab63815490ea2818ae4c821e3e46
+  metadata.gz: 59e92f03b6e19af50c182dee290299e10b4bb05225aec38c918512542e3152e3
+  data.tar.gz: 76b0193a7075b9a1e7ff8c4999bd9c554801c83b6a7eeeb8508c70deebbdaf24
 SHA512:
-  metadata.gz: f4489f1a54319bc0cdc05048d38b0f96e54caacce381893f16e8b3dcf55a043a8e4e0f65b6b65a53cf2509181fbe50f86d81870a43ec122b18a79acbe6ae42b6
-  data.tar.gz: b29c30f1beff1a30702513955ebcfc711acbb6677786f2eb28072845593f2824fee3a14ab8490f0c4d86f048bdc8b9ea7348b9c81e66aa5e39b0f20d64bf8f2b
+  metadata.gz: cca82836c6ee0aae77e9959db514f266e3ed608909c71ada1135c62d4e8caf2f8ce246d4e7b673838f63978fe85ecf3dbb1d8e249185de646a1102be9ed67f32
+  data.tar.gz: 282bb8f0efb7ec70d81f74916ed0b9213258f1a4e819e35b3065eebe5cdc4f58f2b93365f9e61b63626c4094cb8653c5feb3e4bb5635be511cd720ef409bf065

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

@@ -0,0 +1,35 @@
+module Skylight::Core
+  module Normalizers
+    module ActiveJob
+      class Perform < Normalizer
+        register "perform.active_job"
+
+        CAT = "app.job.perform".freeze
+
+        def normalize(trace, _name, payload)
+          title = "#{payload[:job].class}"
+          adapter_name = normalize_adapter_name(payload[:adapter])
+          desc = "{ adapter: '#{adapter_name}', queue: '#{payload[:job].queue_name}' }"
+
+          trace.endpoint = title
+
+          [ CAT, title, desc ]
+        end
+
+        def normalize_after(trace, _span, _name, payload)
+          return unless config.enable_segments?
+          trace.endpoint += "<sk-segment>#{payload[:job].queue_name}</sk-segment>"
+        end
+
+        private
+
+        def normalize_adapter_name(adapter)
+          adapter_string = adapter.is_a?(Class) ? adapter.to_s : adapter.class.to_s
+          adapter_string[/ActiveJob::QueueAdapters::(\w+)Adapter/, 1].underscore
+        rescue
+          'active_job'
+        end
+      end
+    end
+  end
+end

data/lib/skylight/core/normalizers.rb

@@ -99,6 +99,7 @@ module Skylight::Core
         action_view/render_collection
         action_view/render_partial
         action_view/render_template
+        active_job/perform
         active_model_serializers/render
         active_record/instantiation
         active_record/sql

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

@@ -0,0 +1,21 @@
+module Skylight::Core
+  module Probes
+    module ActiveJob
+      class Probe
+        def install
+          ::ActiveJob::Base.instance_eval do
+            alias execute_without_sk execute
+
+            def execute(*args)
+              Skylight.trace('ActiveJob.execute', 'app.job.execute') do
+                execute_without_sk(*args)
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register(:active_job, "ActiveJob::Base", "active_job/base", ActiveJob::Probe.new)
+  end
+end

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

@@ -12,7 +12,7 @@ module Skylight::Core
       class Subscriber
         include Util::Logging
 
-        COMMANDS = [:insert, :find, :count, :distinct, :update, :findandmodify, :delete].freeze
+        COMMANDS = [:insert, :find, :count, :distinct, :update, :findandmodify, :delete, :aggregate].freeze
 
         COMMAND_NAMES = {
           findandmodify: 'findAndModify'.freeze
@@ -108,6 +108,9 @@ module Skylight::Core
               end
             end
 
+            if (pipeline = command['pipeline'.freeze])
+              payload['pipeline'.freeze] = pipeline.map { |segment| extract_binds(segment) }
+            end
 
             # We're ignoring documents from insert because they could have completely inconsistent
             # format which would make it hard to merge.
@@ -168,4 +171,4 @@ module Skylight::Core
 
     register(:mongo, "Mongo", "mongo", Mongo::Probe.new)
   end
-end
+end

data/lib/skylight/core/sidekiq.rb

@@ -23,7 +23,7 @@ module Skylight
           t { "Sidekiq middleware beginning trace" }
           job_class = job['wrapped'] || job['class']
           title = "#{job_class}#perform"
-          segment = queue != 'default' ? "<sk-segment>#{queue}</sk-segment>" : ""
+          segment = "<sk-segment>#{queue}</sk-segment>"
           @instrumentable.trace("#{title}#{segment}", 'app.sidekiq.worker', title) do
             yield
           end

data/lib/skylight/core/version.rb

@@ -1,6 +1,6 @@
 module Skylight
   module Core
-    VERSION = '3.1.0-beta'
+    VERSION = '3.1.0-beta2'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta
+  version: 3.1.0.beta2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,6 +173,7 @@ files:
 - lib/skylight/core/normalizers/action_view/render_collection.rb
 - lib/skylight/core/normalizers/action_view/render_partial.rb
 - lib/skylight/core/normalizers/action_view/render_template.rb
+- lib/skylight/core/normalizers/active_job/perform.rb
 - lib/skylight/core/normalizers/active_model_serializers/render.rb
 - lib/skylight/core/normalizers/active_record/instantiation.rb
 - lib/skylight/core/normalizers/active_record/sql.rb
@@ -208,6 +209,7 @@ files:
 - lib/skylight/core/probes/action_dispatch/request_id.rb
 - lib/skylight/core/probes/action_dispatch/routing/route_set.rb
 - lib/skylight/core/probes/action_view.rb
+- lib/skylight/core/probes/active_job.rb
 - lib/skylight/core/probes/active_job_enqueue.rb
 - lib/skylight/core/probes/active_model_serializers.rb
 - lib/skylight/core/probes/elasticsearch.rb