skylight 1.0.0.beta3 → 1.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4624d9778ee894c7de5d5b892c1c691a90597ea9
-  data.tar.gz: 041745f8d26066a7bfbe0e2db38f7ba84be1b1d1
+  metadata.gz: 17f5108640b6ddd60f1e126dda1e69005a2aa130
+  data.tar.gz: ee06fc206e7a6b570db1e23c89b83c53362f4b5d
 SHA512:
-  metadata.gz: 728c0f355ba9b206376b78db6201da29d365c56d11e7dc8c5c4f32457ce52817440ff0c8cd2c22825fecb094b8aa915526ea80e3d1b3594a3cff65ed35fd077d
-  data.tar.gz: 0f0d0eb10449986b40cb2feadd57fc9d947798e9920f2d6b893b987b0a6ce3a6480c3db170bc430ba8e18de59cdfad81ae250bf1dd4a07175c2c721818b94c45
+  metadata.gz: adde4cc18fa3673ce4dd410e1446f6dad659884f88ad7a6095f0f1444a2ae28148d24679eda2ee2dd86c17f264ba90eeba2d9d51526436846f1dcd5a7d584d52
+  data.tar.gz: 3548e5730c12bce02eee29f46a4a415b80ebe8f811c0fe83d584836d565d8bb435bc72488d730cd90b8b2bbc4e1fb09c8077beefca3bca91caf058d889cb3513

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.0.beta4 (April 22, 2016)
+
+* [FEATURE] Track formats separately in Rails endpoints. Turn on with `separate_formats: true`.
+* [BUGFIX] Finish Rack::Responses in Middleware as some Rack apps don't do this
+
 ## 1.0.0.beta3 (February 23, 2016)
 
 * [BUGFIX] Update Rust Agent with SQL improvements, including handling for arrays and WITH
@@ -34,7 +39,7 @@
 
 ## 0.9.4 (November 23, 2015)
 
-* [FEATURE] Added instrumentation for official Mongo Ruby Driver (utilized by Mongoid 5+). Add 'mongo' to probes list to enable. 
+* [FEATURE] Added instrumentation for official Mongo Ruby Driver (utilized by Mongoid 5+). Add 'mongo' to probes list to enable.
 * [BUGFIX] SQL lexer now handles indentifiers beginning with underscores.
 * [BUGFIX] Excon instrumentation now works correctly.
 * [BUGFIX] Graceful handling of native agent failures on old OS X versions.

data/LICENSE.md

@@ -1,5 +1,5 @@
 All other components of this product, except where otherwise noted, are
-Copyright (c) 2013-2014 Tilde, Inc.
+Copyright (c) 2013-2016 Tilde, Inc.
 All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within patents
@@ -39,14 +39,14 @@ for lost profits or data.
 Other Licenses
 ==============
 
-ActiveSupport
+Ruby on Rails
 -------------
 
-Copyright (c) 2005-2014 David Heinemeier Hansson
+Copyright (c) 2005-2016 David Heinemeier Hansson
 
 Released under the MIT License.
 
-Original source at https://github.com/rails/rails/tree/master/activesupport.
+Original source at https://github.com/rails/rails.
 
 
 HighLine

data/lib/skylight/config.rb

@@ -42,6 +42,7 @@ module Skylight
       "IGNORED_ENDPOINT" => :'ignored_endpoint',
       "IGNORED_ENDPOINTS" => :'ignored_endpoints',
       "SQL_MODE" => :'sql_mode',
+      "SEPARATE_FORMATS" => :'separate_formats',
 
       # == Skylight Remote ==
       "AUTH_URL"                     => :'auth_url',
@@ -95,6 +96,7 @@ module Skylight
       :'log_level'            => 'INFO'.freeze,
       :'alert_log_file'       => '-'.freeze,
       :'log_sql_parse_errors' => false,
+      :'separate_formats'     => false,
       :'hostname'             => Util::Hostname.default_hostname,
       :'heroku.dyno_info_path' => '/etc/heroku/dyno'
     }
@@ -525,6 +527,10 @@ authentication: #{self[:authentication]}
       @deploy ||= Util::Deploy.build(self)
     end
 
+    def separate_formats?
+      !!get(:separate_formats)
+    end
+
   private
 
     def check_nfs(path)

data/lib/skylight/middleware.rb

@@ -59,6 +59,13 @@ module Skylight
           t { "middleware beginning trace" }
           trace = Skylight.trace "Rack", 'app.rack.request'
           resp = @app.call(env)
+
+          # Responses should be finished but in some situations they aren't
+          #   e.g. https://github.com/ruby-grape/grape/issues/1041
+          if resp.respond_to?(:finish)
+            resp = resp.finish
+          end
+
           resp[2] = BodyProxy.new(resp[2]) { trace.submit } if trace
           resp
         rescue Exception

data/lib/skylight/normalizers.rb

@@ -38,6 +38,13 @@ module Skylight
         @config = config
         setup if respond_to?(:setup)
       end
+
+      def normalize(trace, name, payload)
+        :skip
+      end
+
+      def normalize_after(trace, span, name, payload)
+      end
     end
 
     class RenderNormalizer < Normalizer
@@ -121,6 +128,10 @@ module Skylight
         normalizer_for(name).normalize(trace, name, payload)
       end
 
+      def normalize_after(trace, span, name, payload)
+        normalizer_for(name).normalize_after(trace, span, name, payload)
+      end
+
       def normalizer_for(name)
         @normalizers[name] || DEFAULT
       end

data/lib/skylight/normalizers/action_controller/process_action.rb

@@ -5,13 +5,25 @@ module Skylight
         register "process_action.action_controller"
 
         CAT = "app.controller.request".freeze
-        PAYLOAD_KEYS = %w[ controller action params format method path ].map(&:to_sym).freeze
+
+        # Payload Keys: controller, action, params, format, method, path
+        #   Additional keys available in `normalize_after`: status, view_runtime
+        #     Along with ones added by probe: variant
 
         def normalize(trace, name, payload)
           trace.endpoint = controller_action(payload)
           [ CAT, trace.endpoint, nil ]
         end
 
+        def normalize_after(trace, span, name, payload)
+          return unless config.separate_formats?
+
+          format = [payload[:format], payload[:variant]].compact.flatten.join('+')
+          unless format.empty?
+            trace.endpoint += "<sk-format>#{format}</sk-format>"
+          end
+        end
+
       private
 
         def controller_action(payload)

data/lib/skylight/normalizers/active_model_serializers/render.rb

@@ -12,7 +12,9 @@ module Skylight
           title = serializer_class.name.sub(/^ActiveModel::(Serializer::)?/, '')
 
           if adapter_instance = payload[:adapter]
-            adapter_name = adapter_instance.class.name.sub(/^ActiveModel::Serializer::Adapter::/, '')
+            adapter_name = adapter_instance.class.name
+                              .sub(/^ActiveModel::Serializer::Adapter::/, '')
+                              .sub(/^ActiveModelSerializers::Adapter::/, '')
             desc = "Adapter: #{adapter_name}"
           end
 

data/lib/skylight/probes/action_controller.rb

@@ -0,0 +1,48 @@
+module Skylight
+  module Probes
+    module ActionController
+      class Probe
+        def install
+          ::ActionController::Instrumentation.class_eval do
+            private
+            alias append_info_to_payload_without_sk append_info_to_payload
+            def append_info_to_payload(payload)
+              append_info_to_payload_without_sk(payload)
+              payload[:variant] = request.respond_to?(:variant) ? request.variant : nil
+            end
+          end
+
+          #if RAILS_VERSION < 4.2.1
+            # Backport https://github.com/rails/rails/pull/17978
+            ::ActionController::Instrumentation.class_eval do
+              def process_action(*args)
+                raw_payload = {
+                  :controller => self.class.name,
+                  :action     => self.action_name,
+                  :params     => request.filtered_parameters,
+                  :format     => request.format.try(:ref),
+                  :method     => request.request_method,
+                  :path       => (request.fullpath rescue "unknown")
+                }
+
+                ActiveSupport::Notifications.instrument("start_processing.action_controller", raw_payload.dup)
+
+                ActiveSupport::Notifications.instrument("process_action.action_controller", raw_payload) do |payload|
+                  begin
+                    result = super
+                    payload[:status] = response.status
+                    result
+                  ensure
+                    append_info_to_payload(payload)
+                  end
+                end
+              end
+            #end
+          end
+        end
+      end
+    end
+
+    register("ActionController::Instrumentation", "action_controller/metal/instrumentation", ActionController::Probe.new)
+  end
+end

data/lib/skylight/railtie.rb

@@ -13,9 +13,9 @@ module Skylight
     config.skylight.config_path = "config/skylight.yml"
 
     # The probes to load
-    #   net_http, action_view, and grape are on by default
+    #   net_http, action_controller, action_view, and grape are on by default
     #   Also available: excon, redis, sinatra, tilt, sequel
-    config.skylight.probes = ['net_http', 'action_view', 'grape']
+    config.skylight.probes = ['net_http', 'action_controller', 'action_view', 'grape']
 
     initializer 'skylight.configure' do |app|
       # Load probes even when agent is inactive to catch probe related bugs sooner

data/lib/skylight/subscriber.rb

@@ -86,6 +86,7 @@ module Skylight
 
       while curr = trace.notifications.pop
         if curr.name == name
+          normalize_after(trace, curr.span, name, payload)
           trace.done(curr.span) if curr.span
           return
         end
@@ -110,5 +111,9 @@ module Skylight
       @normalizers.normalize(*args)
     end
 
+    def normalize_after(*args)
+      @normalizers.normalize_after(*args)
+    end
+
   end
 end

data/lib/skylight/user_config.rb

@@ -14,7 +14,7 @@ module Skylight
     end
 
     def file_path
-      File.expand_path("~/.skylight")
+      File.expand_path(ENV["SKYLIGHT_USER_CONFIG_PATH"] || "~/.skylight")
     end
 
     def disable_dev_warning?

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '1.0.0-beta3'
+  VERSION = '1.0.0-beta4'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -83,6 +83,7 @@ files:
 - lib/skylight/normalizers/grape/endpoint_run_filters.rb
 - lib/skylight/normalizers/moped/query.rb
 - lib/skylight/probes.rb
+- lib/skylight/probes/action_controller.rb
 - lib/skylight/probes/action_view.rb
 - lib/skylight/probes/active_model_serializers.rb
 - lib/skylight/probes/excon.rb