skylight 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad288b69779cb31529b64adbc47d976b06f5300cbb7ff0687b94d412880311dc
-  data.tar.gz: de757d14b9080b43e2e0d139965fade57bcaabe924e975b4b46ddbe1f7907563
+  metadata.gz: 38b118d85b7e46213e2514bbaa79fea48031adab3189a911220efc8a73d8d193
+  data.tar.gz: 1c9654be2fe1269c907a39d18621116f62f66f268dd0c137bc6e01ef6aec77e7
 SHA512:
-  metadata.gz: 023eff94d6cacf557aeac45a4fee501bf90ac4595d58a671789f3bb6b4726230be6fe3b36805af173809226bbc8c1181d0c073f45d935486da818b824ae47f3f
-  data.tar.gz: 4e538a415d63cd62208c6b51ed816e0202e20b9ffc926628e631eeedd896d6dc3c95d83bfc24d1894e83664dadee68a0b80d94e49c2207c5c55b286c333b6e61
+  metadata.gz: db3dd167fdfe558b82794cfd832f7f35732ad9c63bcf63d6d68645fdce714f4793cb5cfb055668843fd5993806a92bf7233a8093e1b5d4c84580048c253a5cbb
+  data.tar.gz: 6445f6c23aa6d6fc3ca14dbfb46606756234294806dcd6b92042a7edfc6e2cff586a778c7053ff22a26698c45bb7723903cb7c8954b6aea2e6bdd50b99a5c164

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.7.2 (December 14 2018)
+* [BUGFIX] (Backported from 3.1.x series) Fix issue where routes in mounted engines could cause spans to be closed out-of-order.
+
 ## 1.7.1 (October 16 2018)
 * [BUGFIX] (Backported from 2.x series) Fix issue wherein certain error-handling patterns could break the middleware probe.
 

data/lib/skylight/probes/action_dispatch.rb

@@ -0,0 +1,30 @@
+module Skylight
+  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)
+                  trace = Skylight::Instrumenter.try(:instance).try(:current_trace)
+                  return call_without_sk(env) unless trace
+
+                  trace.endpoint = self.class.name
+                  Skylight.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/probes/middleware.rb

@@ -38,29 +38,8 @@ module Skylight
       end
 
       class Probe
-
         def install
-          ActionDispatch::MiddlewareStack.class_eval do
-            alias build_without_sk build
-
-            if ::ActionPack.respond_to?(:gem_version) && ::ActionPack.gem_version >= Gem::Version.new('5.x')
-              # Rails 5
-              def build(app = Proc.new)
-                Skylight::Probes::Middleware.add_instrumentation(app, "Rack App", "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::Probes::Middleware.add_instrumentation(app, "Rack App", "rack.app")
-                build_without_sk(app)
-              end
-            end
-          end
-
-          ActionDispatch::MiddlewareStack::Middleware.class_eval do
+          ::ActionDispatch::MiddlewareStack::Middleware.class_eval do
             alias build_without_sk build
             def build(*args)
               sk_instrument_middleware(build_without_sk(*args))

data/lib/skylight/railtie.rb

@@ -16,7 +16,7 @@ module Skylight
     #   net_http, action_controller, action_view, middleware, and grape are on by default
     #   See https://www.skylight.io/support/getting-more-from-skylight#available-instrumentation-options
     #   for a full list.
-    config.skylight.probes = ['net_http', 'action_controller', 'action_view', 'middleware', 'grape']
+    config.skylight.probes = ['net_http', 'action_dispatch', 'action_controller', 'action_view', 'middleware', 'grape']
 
     # The position in the middleware stack to place Skylight
     # Default is first, but can be `{ after: Middleware::Name }` or `{ before: Middleware::Name }`

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,7 @@ files:
 - lib/skylight/normalizers/moped/query.rb
 - lib/skylight/probes.rb
 - lib/skylight/probes/action_controller.rb
+- lib/skylight/probes/action_dispatch.rb
 - lib/skylight/probes/action_view.rb
 - lib/skylight/probes/active_model_serializers.rb
 - lib/skylight/probes/elasticsearch.rb