skylight-core 4.0.0.beta2 → 4.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5667f3a36781897ae62521c5d959f4b840901098bd3fe639b8bbce7751b7339b
-  data.tar.gz: c39fbb604997035cbfdaabafb2a6f9774c744711b41ae2201e34bf8ba6ee82ca
+  metadata.gz: c7f814841fc2a99900fe3822a5d94a09712ce2d1cdd3c42435386f82715acad6
+  data.tar.gz: 681c34b79a73d5f5eb53a04944046ef8d133db0ab349c204619359e65678e325
 SHA512:
-  metadata.gz: 4afc3b9e000c00161e196a91936894b15a04adc6edb15760c69dd6adaa44357d1ed397f8dfe59f5105268f68faff22a72fcc1c1e8a0060236adc1141c97c3416
-  data.tar.gz: 23f7bca0c54d9266865ea766798640a6bc4d24815611fcde6dc0e0bd81a05a7710a81ab6e22ef19dd959cbdbef099b8af0c4854ccab4daea96366825369e0c0a
+  metadata.gz: 6a90106d989fce292267c2be2166045cb175a3bde412ca9cff73c8a1a5321c3c131440d2c0802a313278db987ca5cc07085ff1415385b416492aa501a604b3b4
+  data.tar.gz: 7bc49449984efa83ceef8ea6ee020027ea98730c4ccf45aeb3b27fc8d1d5a252bb3d757854a958f3783298a5cb5c244160a7d927e558dc1cacb3e97d6a2d8665

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

@@ -25,16 +25,7 @@ module Skylight::Core
         def normalize_after(trace, _span, _name, payload)
           return unless config.enable_segments?
 
-          # Show 'error' if there's an unhandled exception or if the status is 4xx or 5xx
-          if payload[:exception] || payload[:exception_object] || payload[:status].to_s =~ /^[45]/
-            segment = "error"
-          # We won't have a sk_rendered_format if it's a `head` outside of a `respond_to` block.
-          elsif payload[:sk_rendered_format]
-            # We only show the variant if we actually have a format
-            segment = [payload[:sk_rendered_format], payload[:sk_variant]].compact.flatten.join("+")
-          end
-
-          if segment
+          if (segment = segment_from_payload(payload))
             trace.segment = segment
           end
         end
@@ -44,6 +35,27 @@ module Skylight::Core
           def controller_action(payload)
             "#{payload[:controller]}##{payload[:action]}"
           end
+
+          def segment_from_payload(payload)
+            # Show 'error' if there's an unhandled exception or if the status is 4xx or 5xx
+            return "error" if payload[:exception] || payload[:exception_object]
+            segment_from_status(payload[:status]) || if payload[:sk_rendered_format]
+              # We only show the variant if we actually have a format
+              # We won't have a sk_rendered_format if it's a `head` outside of a `respond_to` block.
+              [payload[:sk_rendered_format], payload[:sk_variant]].compact.flatten.join("+")
+            end
+          end
+
+          def segment_from_status(status)
+            case status
+            when 304
+              "not modified"
+            when (300..399)
+              "redirect"
+            when (400..599)
+              "error"
+            end
+          end
       end
     end
   end

data/lib/skylight/core/normalizers/action_dispatch/process_middleware.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Skylight::Core
+  module Normalizers
+    module ActionDispatch
+      class ProcessMiddleware < Normalizer
+        register "process_middleware.action_dispatch"
+
+        CAT = "rack.middleware"
+        ANONYMOUS_MIDDLEWARE = "Anonymous Middleware"
+        ANONYMOUS = /\A#<(Class|Module|Proc):/
+
+        def normalize(trace, _name, payload)
+          name = payload[:middleware].to_s
+          name = ANONYMOUS_MIDDLEWARE if name[ANONYMOUS]
+          trace.endpoint = name
+          [CAT, name, nil]
+        end
+      end
+    end
+  end
+end

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

@@ -5,14 +5,16 @@ module Skylight::Core
         register "render.active_model_serializers"
 
         CAT = "view.render.active_model_serializers".freeze
+        ANONYMOUS = "<Anonymous Serializer>".freeze
 
         def normalize(_trace, _name, payload)
           serializer_class = payload[:serializer]
 
-          title = serializer_class.name.sub(/^ActiveModel::(Serializer::)?/, "")
+          title = serializer_class.name || ANONYMOUS
+          title = title.sub(/^ActiveModel::(Serializer::)?/, "")
 
           if (adapter_instance = payload[:adapter])
-            adapter_name = adapter_instance.class.name.
+            adapter_name = adapter_instance.class.name.to_s.
                            sub(/^ActiveModel::Serializer::Adapter::/, "").
                            sub(/^ActiveModelSerializers::Adapter::/, "")
             desc = "Adapter: #{adapter_name}"

data/lib/skylight/core/normalizers/faraday/request.rb

@@ -1,3 +1,5 @@
+require 'skylight/core/formatters/http'
+
 module Skylight::Core
   module Normalizers
     module Faraday

data/lib/skylight/core/normalizers.rb

@@ -94,6 +94,7 @@ module Skylight::Core
 
     %w[ action_controller/process_action
         action_controller/send_file
+        action_dispatch/process_middleware
         action_view/render_collection
         action_view/render_partial
         action_view/render_template

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

@@ -10,13 +10,13 @@ module Skylight::Core
                 append_info_to_payload_without_sk(payload)
 
                 rendered_mime = begin
-                  if respond_to?(:rendered_format) && rendered_format
-                    rendered_format
-                  elsif content_type.is_a?(Mime::Type)
+                  if content_type.is_a?(Mime::Type)
                     content_type
                   elsif content_type.respond_to?(:to_s)
                     type_str = content_type.to_s.split(';').first
                     Mime::Type.lookup(type_str) unless type_str.blank?
+                  elsif respond_to?(:rendered_format) && rendered_format
+                    rendered_format
                   end
                 end
 

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

@@ -11,8 +11,8 @@ module Skylight::Core
                              when 2
                                args
                              when 4
-                               # Rails >= 6.0.0.beta2 arguments are (view, path, template, locals)
-                               [args[1], args[3]]
+                               # Rails > 6.0.0.beta3 arguments are (view, template, path, locals)
+                               [args[2], args[3]]
                              end
 
               layout = nil

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

@@ -28,7 +28,7 @@ module Skylight::Core
               begin
                 name = self.class.name || "#{default_name}"
 
-                traces.each{|t| t.endpoint = name }
+                traces.each{ |t| t.endpoint = name }
 
                 spans = Skylight::Core::Fanout.instrument(title: name, category: "#{category}")
                 resp = call_without_sk(*args, &block)
@@ -54,6 +54,8 @@ module Skylight::Core
         end
 
         def install
+          return if defined?(::ActionDispatch::MiddlewareStack::InstrumentationProxy)
+
           ::ActionDispatch::MiddlewareStack::Middleware.class_eval do
             alias_method :build_without_sk, :build
             def build(*args)

data/lib/skylight/core/railtie.rb

@@ -36,15 +36,11 @@ module Skylight::Core
 
         if activate?(config)
           if config
-            begin
-              if self.class.namespace.start!(config)
-                set_middleware_position(app, config)
-                Rails.logger.info "#{log_prefix} #{self.class.gem_name} agent enabled"
-              else
-                Rails.logger.info "#{log_prefix} Unable to start, see the #{self.class.gem_name} logs for more details"
-              end
-            rescue ConfigError => e
-              Rails.logger.error "#{log_prefix} #{e.message}; disabling #{self.class.gem_name} agent"
+            if self.class.namespace.start!(config)
+              set_middleware_position(app, config)
+              Rails.logger.info "#{log_prefix} #{self.class.gem_name} agent enabled"
+            else
+              Rails.logger.info "#{log_prefix} Unable to start, see the #{self.class.gem_name} logs for more details"
             end
           end
         elsif Rails.env.development?
@@ -57,6 +53,8 @@ module Skylight::Core
             log_warning config, "#{log_prefix} You are running in the #{Rails.env} environment but haven't added it to config.#{self.class.root_key}.environments, so no data will be sent to #{config.class.service_name} servers."
           end
         end
+      rescue ConfigError => e
+        Rails.logger.error "#{log_prefix} #{e.message}; disabling #{self.class.gem_name} agent"
       end
 
       def log_warning(config, msg)

data/lib/skylight/core/subscriber.rb

@@ -3,7 +3,7 @@ module Skylight::Core
   class Subscriber
     include Util::Logging
 
-    attr_reader :config
+    attr_reader :config, :normalizers
 
     def initialize(config, instrumenter)
       @config       = config
@@ -41,29 +41,7 @@ module Skylight::Core
     def start(name, _id, payload)
       return if @instrumenter.disabled?
       return unless (trace = @instrumenter.current_trace)
-
-      result = normalize(trace, name, payload)
-
-      unless result == :skip
-        case result.size
-        when 3, 4
-          cat, title, desc, meta = result
-        else
-          raise "Invalid normalizer result: #{result.inspect}"
-        end
-
-        span = trace.instrument(cat, title, desc, meta)
-      end
-
-      trace.notifications << Notification.new(name, span)
-    rescue Exception => e
-      error "Subscriber#start error; msg=%s", e.message
-      debug "trace=%s", trace.inspect
-      debug "in:  name=%s", name.inspect
-      debug "in:  payload=%s", payload.inspect
-      debug "out: cat=%s, title=%s, desc=%s", cat.inspect, name.inspect, desc.inspect
-      t { e.backtrace.join("\n") }
-      nil
+      _start(trace, name, payload)
     end
 
     def finish(name, _id, payload)
@@ -104,5 +82,30 @@ module Skylight::Core
       def normalize_after(*args)
         @normalizers.normalize_after(*args)
       end
+
+      def _start(trace, name, payload)
+        result = normalize(trace, name, payload)
+
+        unless result == :skip
+          case result.size
+          when 3, 4
+            cat, title, desc, meta = result
+          else
+            raise "Invalid normalizer result: #{result.inspect}"
+          end
+
+          span = trace.instrument(cat, title, desc, meta)
+        end
+      rescue Exception => e
+        error "Subscriber#start error; msg=%s", e.message
+        debug "trace=%s", trace.inspect
+        debug "in:  name=%s", name.inspect
+        debug "in:  payload=%s", payload.inspect
+        debug "out: cat=%s, title=%s, desc=%s", cat.inspect, name.inspect, desc.inspect
+        t { e.backtrace.join("\n") }
+        nil
+      ensure
+        trace.notifications << Notification.new(name, span)
+      end
   end
 end

data/lib/skylight/core/version.rb

@@ -1,5 +1,5 @@
 module Skylight
   module Core
-    VERSION = "4.0.0-beta2".freeze
+    VERSION = "4.0.0-beta3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,6 +170,7 @@ files:
 - lib/skylight/core/normalizers.rb
 - lib/skylight/core/normalizers/action_controller/process_action.rb
 - lib/skylight/core/normalizers/action_controller/send_file.rb
+- lib/skylight/core/normalizers/action_dispatch/process_middleware.rb
 - 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
@@ -265,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The core methods of the Skylight profiler.