skylight-core 3.0.0 → 3.1.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d97b6d1400373026e6e07e96ca90536f88970d610f0be6ff221742e49e8bdb
-  data.tar.gz: af643c98b238ec0a2ac8e9c466c6a689063796f13e958647f4ca4ca4d9dcbc49
+  metadata.gz: e728cb584714e19aa0ccdc0922ac399c52e59b580033094eff49a478589da1fa
+  data.tar.gz: d0e4c19a788911437dd92e89a9161c00462aab63815490ea2818ae4c821e3e46
 SHA512:
-  metadata.gz: 52466d912d7c7d50d3838160fa482a1623c72e1ee0291d437ff5e5f937dd4182e4b826db39ab8488904b07e819707dfd38023e5dd3c1d46d1e56538a85849015
-  data.tar.gz: 33cacc4894854e077e26367039c355213dc7706108ac1182d086132b8e3f487fd5d3a4ceea63313b85363c80f28c3e166214a993442b34f974a6a1c43c8e4fa3
+  metadata.gz: f4489f1a54319bc0cdc05048d38b0f96e54caacce381893f16e8b3dcf55a043a8e4e0f65b6b65a53cf2509181fbe50f86d81870a43ec122b18a79acbe6ae42b6
+  data.tar.gz: b29c30f1beff1a30702513955ebcfc711acbb6677786f2eb28072845593f2824fee3a14ab8490f0c4d86f048bdc8b9ea7348b9c81e66aa5e39b0f20d64bf8f2b

data/lib/skylight/core/fanout.rb

@@ -1,7 +1,6 @@
 module Skylight
   module Core
     module Fanout
-
       def self.registered
         @registered ||= []
       end
@@ -21,10 +20,11 @@ module Skylight
       def self.instrument(*args)
         if block_given?
           spans = instrument(*args)
+          meta = {}
           begin
             yield spans
           ensure
-            done(spans)
+            done(spans, meta)
           end
         else
           registered.map do |r|
@@ -42,6 +42,18 @@ module Skylight
       def self.broken!
         registered.each(&:broken!)
       end
+
+      def self.endpoint=(endpoint)
+        each_trace { |t| t.endpoint = endpoint }
+      end
+
+      def self.each_trace
+        return to_enum(__method__) unless block_given?
+        registered.each do |r|
+          next unless r.instrumenter && (trace = r.instrumenter.current_trace)
+          yield trace
+        end
+      end
     end
   end
 end

data/lib/skylight/core/probes/action_dispatch/routing/route_set.rb

@@ -0,0 +1,27 @@
+module Skylight::Core
+  module Probes
+    module ActionDispatch
+      module Routing
+        module RouteSet
+          class Probe
+            def install
+              ::ActionDispatch::Routing::RouteSet.class_eval do
+                alias call_without_sk call
+
+                def call(env)
+                  Skylight::Core::Fanout.endpoint = self.class.name
+                  Skylight::Core::Fanout.instrument(title: self.class.name, category: 'rack.app') do
+                    call_without_sk(env)
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+    end
+
+    register(:rails_router, "ActionDispatch::Routing::RouteSet", "action_dispatch/routing/route_set", ActionDispatch::Routing::RouteSet::Probe.new)
+  end
+end

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

@@ -1 +1,2 @@
 Skylight::Core::Probes.probe('action_dispatch/request_id')
+Skylight::Core::Probes.probe('action_dispatch/routing/route_set')

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

@@ -22,10 +22,7 @@ module Skylight::Core
             def call(*args, &block)
               return call_without_sk(*args, &block) if Skylight::Core::Probes::Middleware::Probe.disabled?
 
-              traces = Skylight::Core::Fanout.registered.map do |r|
-                r.instrumenter ? r.instrumenter.current_trace : nil
-              end.compact
-
+              traces = Skylight::Core::Fanout.each_trace.to_a
               return call_without_sk(*args, &block) if traces.empty?
 
               begin
@@ -57,26 +54,6 @@ module Skylight::Core
         end
 
         def install
-          ::ActionDispatch::MiddlewareStack.class_eval do
-            alias build_without_sk build
-
-            if ::ActionPack.gem_version >= Gem::Version.new('5.x')
-              # Rails 5
-              def build(app = Proc.new)
-                Skylight::Core::Probes::Middleware::Probe.add_instrumentation(app, default_name: "Rack App", category: "rack.app")
-                build_without_sk(app)
-              end
-            else
-              # Rails 3 and 4
-              def build(app, &block)
-                app ||= block
-                raise "MiddlewareStack#build requires an app" unless app
-                Skylight::Core::Probes::Middleware::Probe.add_instrumentation(app, default_name: "Rack App", category: "rack.app")
-                build_without_sk(app)
-              end
-            end
-          end
-
           ::ActionDispatch::MiddlewareStack::Middleware.class_eval do
             alias build_without_sk build
             def build(*args)

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

@@ -34,12 +34,7 @@ module Skylight::Core
 
             def dispatch!(*args, &block)
               dispatch_without_sk!(*args, &block).tap do
-                Skylight::Core::Fanout.registered.each do |target|
-                  instrumenter = target.instrumenter
-                  next unless instrumenter
-                  trace = instrumenter.current_trace
-                  next unless trace
-
+                Skylight::Core::Fanout.each_trace do |trace|
                   # Set the endpoint name to the route name
                   route = env['sinatra.route']
                   trace.endpoint = route if route

data/lib/skylight/core/trace.rb

@@ -138,6 +138,10 @@ module Skylight::Core
       nil
     end
 
+    def inspect
+      to_s
+    end
+
     def release
       t { "release; is_current=#{@instrumenter.current_trace == self}" }
       return unless @instrumenter.current_trace == self

data/lib/skylight/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0.beta
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,6 +206,7 @@ files:
 - lib/skylight/core/probes/action_controller.rb
 - lib/skylight/core/probes/action_dispatch.rb
 - 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_enqueue.rb
 - lib/skylight/core/probes/active_model_serializers.rb
@@ -260,9 +261,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6