skylight 0.8.0.beta.1 → 0.8.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e3fa37632ad3220389279e789146f96720de4d
-  data.tar.gz: 6a338bac5dfcaaafa26e1737da491f6281bc5470
+  metadata.gz: 0993e8d64b2871c815490a9f891733c1a6beaf7d
+  data.tar.gz: c003faa733b2421b9cca0843ee188333556a045e
 SHA512:
-  metadata.gz: 5b15f061ab93da78cbe138458d81b93c2019473c46040740c06bdd079179c781b2267f2261d16ef3325bc9c91fff2c459c1a78c731e782ff2bd95f9d4baa2c90
-  data.tar.gz: 70bb2e9ea8f4effb5d3878a0e6159366ebbdf836f7111f65f004ac9244933420edf1121a9533989c2abb8891261e12a12cc70495c59898c2dcd60a708364fe62
+  metadata.gz: 5da96227e2f82d8f035f71647d8a3bbbcbd65655c16bf3bc5a1ec244a30cf95dd50747b047919c7d6931d8982e51bae69edb68e84ad6da2e6efaeb0c6babd2c5
+  data.tar.gz: ff421edd707482cbf4e750d86b9977925448d1159bce989a72fd58852dec1197f8ef1066dea0b70046f76aed7afbf2f10896d6590ccb10b8b2356f0f3950997d

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.8.0-beta.3 (August 10, 2015)
+
+* [BUGFIX] Fix require issue in Grape probe
+
+## 0.8.0-beta.2 (August 10, 2015) [YANKED]
+
+* [FEATURE] Process ERB in config/skylight.yml
+* [IMPROVEMENT] Switch Grape instrumentation to use ActiveSupport::Notifications hooks provided by future Grape versions.
+* [IMPROVEMENT] Internal cleanup
+
 ## 0.8.0-beta.1 (August 4, 2015)
 
 * [FEATURE] Add Grape instumentation
@@ -60,6 +70,10 @@
 * Featherweight Agent: lowered CPU and memory overhead
 * [IMPROVEMENT] Add support for ignoring an endpoint by name
 
+## 0.3.21 (October 8, 2014)
+
+* [BUGFIX] Skylight crashing on start won't crash entire app
+
 ## 0.3.20 (September 3, 2014)
 
 * [BUGFIX] Fix app name fetching on Windows for `skylight setup`

data/lib/skylight/config.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'fileutils'
 require 'thread'
 require 'openssl'
+require 'erb'
 require 'skylight/util/hostname'
 require 'skylight/util/logging'
 require 'skylight/util/platform'
@@ -181,7 +182,7 @@ module Skylight
       if path
         error = nil
         begin
-          attrs = YAML.load_file(path)
+          attrs = YAML.load(ERB.new(File.read(path)).result)
           error = "empty file" unless attrs
           error = "invalid format" if attrs && !attrs.is_a?(Hash)
         rescue Exception => e

data/lib/skylight/core.rb

@@ -95,18 +95,19 @@ module Skylight
       category    = opts[:category] || DEFAULT_CATEGORY
       title       = opts[:title]
       desc        = opts[:description]
-      annotations = opts[:annotations]
+      if opts.key?(:annotations)
+        warn "call to #instrument included deprecated annotations"
+      end
     else
       category    = DEFAULT_CATEGORY
       title       = opts.to_s
       desc        = nil
-      annotations = nil
     end
 
     if block_given?
-      inst.instrument(category, title, desc, annotations) { yield }
+      inst.instrument(category, title, desc) { yield }
     else
-      inst.instrument(category, title, desc, annotations)
+      inst.instrument(category, title, desc)
     end
   end
 

data/lib/skylight/formatters/http.rb

@@ -3,14 +3,7 @@ module Skylight
     module HTTP
       def self.build_opts(method, scheme, host, port, path, query)
         { category: "api.http.#{method.downcase}",
-          title:    "#{method.upcase} #{host}",
-          annotations: {
-            method: method.upcase,
-            scheme: scheme,
-            host:   host,
-            port:   port ? port.to_i : nil,
-            path:   path,
-            query:  query }}
+          title:    "#{method.upcase} #{host}" }
       end
     end
   end

data/lib/skylight/instrumenter.rb

@@ -138,7 +138,7 @@ module Skylight
       native_stop
     end
 
-    def trace(endpoint, cat, title=nil, desc=nil, annot=nil)
+    def trace(endpoint, cat, title=nil, desc=nil)
       # If a trace is already in progress, continue with that one
       if trace = @trace_info.current
         return yield(trace) if block_given?
@@ -146,7 +146,7 @@ module Skylight
       end
 
       begin
-        trace = Trace.new(self, endpoint, Util::Clock.nanos, cat, title, desc, annot)
+        trace = Trace.new(self, endpoint, Util::Clock.nanos, cat, title, desc)
       rescue Exception => e
         log_error e.message
         t { e.backtrace.join("\n") }
@@ -192,7 +192,7 @@ module Skylight
       trace.done(span)
     end
 
-    def instrument(cat, title=nil, desc=nil, annot=nil)
+    def instrument(cat, title=nil, desc=nil)
       raise ArgumentError, 'cat is required' unless cat
 
       unless trace = @trace_info.current
@@ -210,7 +210,7 @@ module Skylight
 
       cat = "other.#{cat}" unless match?(cat, TIER_REGEX)
 
-      unless sp = trace.instrument(cat, title, desc, annot)
+      unless sp = trace.instrument(cat, title, desc)
         return yield if block_given?
         return
       end

data/lib/skylight/normalizers.rb

@@ -47,16 +47,16 @@ module Skylight
         @paths = config['normalizers.render.view_paths'] || []
       end
 
-      def normalize_render(category, payload, annotations)
+      def normalize_render(category, payload)
         if path = payload[:identifier]
-          title = relative_path(path, annotations)
+          title = relative_path(path)
           path = nil if path == title
         end
 
-        [ category, title, nil, annotations ]
+        [ category, title, nil ]
       end
 
-      def relative_path(path, annotations)
+      def relative_path(path)
         return path if relative_path?(path)
 
         root = array_find(@paths) { |p| path.start_with?(p) }
@@ -114,8 +114,11 @@ module Skylight
       end
 
       def normalize(trace, name, payload)
-        normalizer = @normalizers[name] || DEFAULT
-        normalizer.normalize(trace, name, payload)
+        normalizer_for(name).normalize(trace, name, payload)
+      end
+
+      def normalizer_for(name)
+        @normalizers[name] || DEFAULT
       end
     end
 
@@ -126,6 +129,7 @@ module Skylight
         action_view/render_template
         active_record/sql
         active_support/cache
+        grape/endpoint
         moped/query).each do |file|
       require "skylight/normalizers/#{file}"
     end

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

@@ -9,7 +9,7 @@ module Skylight
 
         def normalize(trace, name, payload)
           trace.endpoint = controller_action(payload)
-          [ CAT, trace.endpoint, nil, normalize_payload(payload) ]
+          [ CAT, trace.endpoint, nil ]
         end
 
       private
@@ -17,18 +17,6 @@ module Skylight
         def controller_action(payload)
           "#{payload[:controller]}##{payload[:action]}"
         end
-
-        def normalize_payload(payload)
-          normalized = {}
-
-          PAYLOAD_KEYS.each do |key|
-            val = payload[key]
-            val = val.inspect unless val.is_a?(String) || val.is_a?(Numeric)
-            normalized[key] = val
-          end
-
-          normalized
-        end
       end
     end
   end

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

@@ -17,13 +17,6 @@ module Skylight
           def normalize(trace, name, payload)
             path = payload[:path]
 
-            annotations = {
-              path:        path,
-              filename:    payload[:filename],
-              type:        normalize_type(payload),
-              disposition: normalize_disposition(payload),
-              status:      normalize_status(payload) }
-
             title = TITLE
 
             # depending on normalization, we probably want this to eventually
@@ -31,7 +24,7 @@ module Skylight
             # deduping strategy first.
             desc = nil
 
-            [ CAT, title, desc, annotations ]
+            [ CAT, title, desc ]
           end
 
         private
@@ -47,25 +40,6 @@ module Skylight
               hash
             end
           end
-
-          def normalize_type(payload)
-            type = payload[:type] || OCTET_STREAM
-            type = @mimes[type] if type.is_a?(Symbol)
-            type
-          end
-
-          def mime_for(type)
-            @mimes[type] ||= Mime[type].to_s.freeze
-          end
-
-          def normalize_status(payload)
-            status = payload[:status] || 200
-            Rack::Utils.status_code(status)
-          end
-
-          def normalize_disposition(payload)
-            payload[:disposition] || ATTACHMENT
-          end
         end
 
       rescue LoadError

data/lib/skylight/normalizers/action_view/render_collection.rb

@@ -7,10 +7,7 @@ module Skylight
         CAT = "view.render.collection".freeze
 
         def normalize(trace, name, payload)
-          normalize_render(
-            CAT,
-            payload,
-            count: payload[:count])
+          normalize_render(CAT, payload)
         end
       end
     end

data/lib/skylight/normalizers/action_view/render_partial.rb

@@ -7,10 +7,7 @@ module Skylight
         CAT = "view.render.template".freeze
 
         def normalize(trace, name, payload)
-          normalize_render(
-            CAT,
-            payload,
-            partial: 1)
+          normalize_render(CAT, payload)
         end
       end
     end

data/lib/skylight/normalizers/action_view/render_template.rb

@@ -7,10 +7,7 @@ module Skylight
         CAT = "view.render.template".freeze
 
         def normalize(trace, name, payload)
-          normalize_render(
-            CAT,
-            payload,
-            partial: 0)
+          normalize_render(CAT, payload)
         end
       end
     end

data/lib/skylight/normalizers/active_record/sql.rb

@@ -26,52 +26,18 @@ module Skylight
             binds = binds.map { |col, val| val.inspect }
           end
 
-          extracted_title, sql, binds, _ = extract_binds(payload, binds)
+          extracted_title, sql, binds = extract_binds(payload, binds)
           title = extracted_title if extracted_title
 
-          if sql
-            annotations = {
-              sql:   sql,
-              binds: binds,
-            }
-          end
-
-          [ name, title, sql, annotations ]
+          [ name, title, sql ]
         end
 
       private
         def extract_binds(payload, precalculated)
-          title, sql, binds = SqlLexer::Lexer.bindify(payload[:sql], precalculated, true)
-          [ title, sql, binds, nil ]
+          SqlLexer::Lexer.bindify(payload[:sql], precalculated, true)
         rescue => e
-          group = "sql_parse"
-          description = e.inspect
-          details = encode(backtrace: e.backtrace,
-                            original_exception: {
-                              class_name: e.class.name,
-                              message: e.message
-                            },
-                            payload: payload,
-                            precalculated: precalculated)
-
-          error = [group, description, details]
-          [ nil, nil, nil, error ]
-        end
-
-        # While operating in place would save memory, some of these passed in items are re-used elsewhere
-        # and, as such, should not be modified.
-        def encode(body)
-          if body.is_a?(Hash)
-            hash = {}
-            body.each{|k,v| hash[k] = encode(v) }
-            hash
-          elsif body.is_a?(Array)
-            body.map{|v| encode(v) }
-          elsif body.respond_to?(:encoding) && (body.encoding == Encoding::BINARY || !body.valid_encoding?)
-            Base64.encode64(body)
-          else
-            body
-          end
+          # TODO: log
+          [ nil, nil, nil ]
         end
       end
     end

data/lib/skylight/normalizers/active_support/cache_clear.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache clear".freeze
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_decrement.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache decrement"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_delete.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache delete"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_exist.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache exist?"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_fetch_hit.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache fetch hit"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_generate.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache generate"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_increment.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache increment"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_read.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache read"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_read_multi.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache read multi"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/active_support/cache_write.rb

@@ -8,9 +8,9 @@ module Skylight
         TITLE = "cache write"
 
         def normalize(trace, name, payload)
-          [ CAT, TITLE, nil, payload ]
+          [ CAT, TITLE, nil ]
         end
       end
     end
   end
-end
+end

data/lib/skylight/normalizers/default.rb

@@ -4,12 +4,10 @@ module Skylight
 
       def normalize(trace, name, payload)
         if name =~ TIER_REGEX
-          annot = payload.dup
           [
             name,
-            annot.delete(:title),
-            annot.delete(:description),
-            annot
+            payload[:title],
+            payload[:description]
           ]
         else
           :skip

data/lib/skylight/normalizers/grape/endpoint.rb

@@ -0,0 +1,30 @@
+module Skylight
+  module Normalizers
+    module Grape
+      class Endpoint < Normalizer
+        %w(run
+            render
+            run_filters).each do |type|
+          require "skylight/normalizers/grape/endpoint_#{type}"
+        end
+
+        private
+
+          def get_method(endpoint)
+            method = endpoint.options[:method].first
+            method << "..." if endpoint.options[:method].length > 1
+            method
+          end
+
+          def get_path(endpoint)
+            endpoint.options[:path].join("/")
+          end
+
+          def get_namespace(endpoint)
+            ::Grape::Namespace.joined_space(endpoint.namespace_stackable(:namespace))
+          end
+
+      end
+    end
+  end
+end

data/lib/skylight/normalizers/grape/endpoint_render.rb

@@ -0,0 +1,26 @@
+module Skylight
+  module Normalizers
+    module Grape
+      class EndpointRender < Endpoint
+        register "endpoint_render.grape"
+
+        CAT = "app.grape.endpoint".freeze
+
+        def normalize(trace, name, payload)
+          if endpoint = payload[:endpoint]
+            path = get_path(endpoint)
+            namespace = get_namespace(endpoint)
+            method = get_method(endpoint)
+
+            title = [method, namespace, path].join(' ').gsub(/\s+/, ' ')
+
+            [CAT, title, nil]
+          else
+            :skip
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/skylight/normalizers/grape/endpoint_run.rb

@@ -0,0 +1,33 @@
+module Skylight
+  module Normalizers
+    module Grape
+      class EndpointRun < Endpoint
+        register "endpoint_run.grape"
+
+        def normalize(trace, name, payload)
+          trace.endpoint = get_endpoint_name(payload[:endpoint]) if payload[:endpoint]
+
+          # We don't necessarily want this to be all instrumented since it's fairly internal.
+          # However, it is a good place to get the endpoint name.
+          :skip
+        end
+
+        private
+
+          def get_endpoint_name(endpoint)
+            method = get_method(endpoint)
+            path = get_path(endpoint)
+            namespace = get_namespace(endpoint)
+
+            if namespace && !namespace.empty?
+              path = "/#{path}" if path[0] != '/'
+              path = "#{namespace}#{path}"
+            end
+
+            "#{endpoint.options[:for]} [#{method}] #{path}"
+          end
+
+      end
+    end
+  end
+end

data/lib/skylight/normalizers/grape/endpoint_run_filters.rb

@@ -0,0 +1,23 @@
+module Skylight
+  module Normalizers
+    module Grape
+      class EndpointRunFilters < Endpoint
+        register "endpoint_run_filters.grape"
+
+        CAT = "app.grape.filters".freeze
+
+        def normalize(trace, name, payload)
+          filters = payload[:filters]
+          type = payload[:type]
+
+          if (!filters || filters.empty?) || !type
+            return :skip
+          end
+
+          [CAT, "#{type.to_s.capitalize} Filters", nil]
+        end
+
+      end
+    end
+  end
+end

data/lib/skylight/normalizers/moped/query.rb

@@ -29,106 +29,60 @@ module Skylight
         def normalize_query(operation)
           title = normalize_title("QUERY", operation)
 
-          hash, binds = extract_binds(operation.selector)
+          hash = extract_binds(operation.selector)
           description = hash.to_json
 
-          annotations = build_annotations(operation)
-          annotations[:skip] = operation.skip
-          if operation.fields
-            annotations[:fields] = operation.fields.select{|k,v| v == 1 }.keys.map(&:to_s)
-          end
-          annotations[:binds] = binds unless binds.empty?
-
-          [CAT, title, description, annotations]
+          [CAT, title, description]
         end
 
         def normalize_get_more(operation)
           title = normalize_title("GET_MORE", operation)
 
-          annotations = build_annotations(operation)
-          annotations[:limit] = operation.limit
-
-          [CAT, title, nil, annotations]
+          [CAT, title, nil]
         end
 
         def normalize_insert(operation)
           title = normalize_title("INSERT", operation)
 
-          annotations = build_annotations(operation)
-          annotations[:count] = operation.documents.count
-
-          [CAT, title, nil, annotations]
+          [CAT, title, nil]
         end
 
         def normalize_update(operation)
           title = normalize_title("UPDATE", operation)
 
-          selector_hash, selector_binds = extract_binds(operation.selector)
-          update_hash, update_binds = extract_binds(operation.update)
+          selector_hash = extract_binds(operation.selector)
+          update_hash = extract_binds(operation.update)
 
           description = { selector: selector_hash, update: update_hash }.to_json
 
-          annotations = build_annotations(operation)
-
-          binds = {}
-          binds[:selector] = selector_binds unless selector_binds.empty?
-          binds[:update]   = update_binds   unless update_binds.empty?
-          annotations[:binds] = binds unless binds.empty?
-
-          [CAT, title, description, annotations]
+          [CAT, title, description]
         end
 
         def normalize_delete(operation)
           title = normalize_title("DELETE", operation)
 
-          hash, binds = extract_binds(operation.selector)
+          hash = extract_binds(operation.selector)
           description = hash.to_json
 
-          annotations = build_annotations(operation)
-          annotations[:binds] = binds unless binds.empty?
-
-          [CAT, title, description, annotations]
+          [CAT, title, description]
         end
 
         def normalize_title(type, operation)
           "#{type} #{operation.collection}"
         end
 
-        def build_annotations(operation)
-          annotations = {}
-
-          if operation.respond_to?(:flags)
-            flags = operation.flags.map{|f| flag_name(f) }
-            annotations[:flags] = flags unless flags.empty?
-          end
-
-          annotations
-        end
-
-        # Some flags used by Moped don't map directly to the Mongo docs
-        # See http://docs.mongodb.org/meta-driver/latest/legacy/mongodb-wire-protocol/
-        FLAG_MAP = {
-          tailable: "TailableCursor",
-          multi:    "MultiUpdate"
-        }
-
-        def flag_name(flag)
-          FLAG_MAP[flag] || flag.to_s.sub(/^[a-z\d]*/) { $&.capitalize }.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }
-        end
-
-        def extract_binds(hash, binds=[])
+        def extract_binds(hash)
           ret = {}
 
           hash.each do |k,v|
             if v.is_a?(Hash)
-              ret[k] = extract_binds(v, binds)[0]
+              ret[k] = extract_binds(v)
             else
-              binds << stringify(hash[k])
               ret[k] = '?'
             end
           end
 
-          [ret, binds]
+          ret
         end
 
         def stringify(value)

data/lib/skylight/probes/grape.rb

@@ -3,8 +3,14 @@ module Skylight
     module Grape
       class Probe
         def install
-          version = ::Grape::VERSION.split('.')
-          if version[0] == '0' && version[1].to_i < 10
+          version = Gem::Version.new(::Grape::VERSION)
+
+          if version > Gem::Version.new("0.12.1")
+            # AS::N is built in to newer versions
+            return
+          end
+
+          if version < Gem::Version.new("0.10.0")
             # Using $stderr here isn't great, but we don't have a logger accessible
             $stderr.puts "[SKYLIGHT] [#{Skylight::VERSION}] The Grape probe only works with version 0.10.0+ " \
                           "and will be disabled."
@@ -28,13 +34,8 @@ module Skylight
               # modified block. However, Grape does some odd stuff with the block binding
               # that makes this difficult to reason about.
               if original_block = @block
-                opts = {
-                  category: "app.grape.endpoint",
-                  title: method_name.gsub(/\s+/, ' ')
-                }
-
                 @block = lambda do |endpoint_instance|
-                  Skylight.instrument(opts) do
+                  ActiveSupport::Notifications.instrument('endpoint_render.grape', endpoint: endpoint_instance) do
                     original_block.call(endpoint_instance)
                   end
                 end
@@ -43,68 +44,35 @@ module Skylight
 
             alias run_without_sk run
             def run(*args)
-              # We run the original method first since it gives us access to more information
-              # about the current state, including populating `route`.
-              run_without_sk(*args)
-            ensure
-              if instrumenter = Skylight::Instrumenter.instance
-                if trace = instrumenter.current_trace
-                  # FIXME: How do we handle endpoints with multiple methods?
-                  #   Currently we'll see things like "PUT POST DELETE PATCH HEAD"
-
-                  # OPTION A: GET /prefix/name [v1]
-                  # # FIXME: Ideally we wouldn't have to do this, but I don't know
-                  # #   of a better way
-                  # info = route.instance_variable_get :@options
-
-                  # # FIXME: Consider whether we should include the module name
-                  # name = "#{info[:method]} #{info[:path]}"
-                  # name << " [#{info[:version]}]" if info[:version]
-
-
-                  # OPTION B: Module::Class GET /name
-                  http_method = options[:method].first
-                  http_method << "..." if options[:method].length > 1
-
-                  path = options[:path].join("/")
-                  namespace = ::Grape::Namespace.joined_space(namespace_stackable(:namespace))
-
-                  if namespace && !namespace.empty?
-                    path = "/#{path}" if path[0] != '/'
-                    path = "#{namespace}#{path}"
-                  end
-
-                  name = "#{options[:for]} [#{http_method}] #{path}"
-
-                  trace.endpoint = name
-                end
+              ActiveSupport::Notifications.instrument('endpoint_run.grape', endpoint: self) do
+                run_without_sk(*args)
               end
             end
 
             alias run_filters_without_sk run_filters
             def run_filters(filters)
-              if !filters || filters.empty?
-                # If there's no filters nothing should happen, but let Grape decide
-                return run_filters_without_sk(filters)
+              # Unfortunately, the type isn't provided to the method so we have
+              # to try to guess it by looking at the contents. This is only reliable
+              # if the filters aren't empty.
+              if filters && !filters.empty?
+                type = case filters
+                  when befores            then :before
+                  when before_validations then :before_validation
+                  when after_validations  then :after_validation
+                  when afters             then :after
+                  else                         :other
+                  end
+              else
+                type = :unknown
               end
 
-              # Unfortunately, this method only gets passed an array of filters.
-              # This means we have to compare to known lists to attempt to detect
-              # the type.
-              type = case filters
-                when befores            then "Before"
-                when before_validations then "Before Validation"
-                when after_validations  then "After Validation"
-                when afters             then "After"
-                else                         "Other"
-                end
-
-              opts = {
-                category: "app.grape.filters",
-                title: "#{type} Filters"
+              payload = {
+                endpoint: self,
+                filters: filters,
+                type: type
               }
 
-              Skylight.instrument(opts) do
+              ActiveSupport::Notifications.instrument('endpoint_run_filters.grape', payload) do
                 run_filters_without_sk(filters)
               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 and action_view are on by default
-    #   Also available: excon, redis
-    config.skylight.probes = ['net_http', 'action_view']
+    #   net_http, action_view, and grape are on by default
+    #   Also available: excon, redis, sinatra, tilt, sequel
+    config.skylight.probes = ['net_http', '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

@@ -40,10 +40,20 @@ module Skylight
       return if @instrumenter.disabled?
       return unless trace = @instrumenter.current_trace
 
-      cat, title, desc, annot = normalize(trace, name, payload)
+      result = normalize(trace, name, payload)
+
+      unless result == :skip
+        case result.size
+        when 4
+          error "old style normalizer; name=#{name.inspect}; normalizer=#{@normalizers.normalizer_for(name).class}"
+          cat, title, desc, _ = result
+        when 3
+          cat, title, desc = result
+        else
+          raise "Invalid normalizer result: #{result.inspect}"
+        end
 
-      unless cat == :skip
-        span = trace.instrument(cat, title, desc, annot)
+        span = trace.instrument(cat, title, desc)
       end
 
       trace.notifications << Notification.new(name, span)
@@ -53,7 +63,6 @@ module Skylight
       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
-      debug "out: annot=%s", annot.inspect
       t { e.backtrace.join("\n") }
       nil
     end

data/lib/skylight/trace.rb

@@ -6,9 +6,9 @@ module Skylight
 
     attr_reader :endpoint, :notifications
 
-    def self.new(instrumenter, endpoint, start, cat, title = nil, desc = nil, annot = nil)
+    def self.new(instrumenter, endpoint, start, cat, title = nil, desc = nil)
       inst = native_new(normalize_time(start), "TODO", endpoint)
-      inst.send(:initialize, instrumenter, cat, title, desc, annot)
+      inst.send(:initialize, instrumenter, cat, title, desc)
       inst.endpoint = endpoint
       inst
     end
@@ -20,7 +20,7 @@ module Skylight
       (time.to_i / 100_000).to_i
     end
 
-    def initialize(instrumenter, cat, title, desc, annot)
+    def initialize(instrumenter, cat, title, desc)
       raise ArgumentError, 'instrumenter is required' unless instrumenter
 
       @instrumenter = instrumenter
@@ -29,14 +29,6 @@ module Skylight
 
       @notifications = []
 
-      if Hash === title
-        annot = title
-        title = desc = nil
-      elsif Hash === desc
-        annot = desc
-        desc = nil
-      end
-
       # create the root node
       @root = native_start_span(native_get_started_at, cat)
       native_span_set_title(@root, title) if title
@@ -55,16 +47,8 @@ module Skylight
       @instrumenter.config
     end
 
-    def record(cat, title=nil, desc=nil, annot=nil)
-      @return if @broken
-
-      if Hash === title
-        annot = title
-        title = desc = nil
-      elsif Hash === desc
-        annot = desc
-        desc = nil
-      end
+    def record(cat, title=nil, desc=nil)
+      return if @broken
 
       title.freeze if title.is_a?(String)
       desc.freeze  if desc.is_a?(String)
@@ -82,18 +66,10 @@ module Skylight
       nil
     end
 
-    def instrument(cat, title=nil, desc=nil, annot=nil)
+    def instrument(cat, title=nil, desc=nil)
       return if @broken
       t { "instrument: #{cat}, #{title}" }
 
-      if Hash === title
-        annot = title
-        title = desc = nil
-      elsif Hash === desc
-        annot = desc
-        desc = nil
-      end
-
       title.freeze if title.is_a?(String)
       desc.freeze  if desc.is_a?(String)
 
@@ -104,10 +80,10 @@ module Skylight
       if desc == Instrumenter::TOO_MANY_UNIQUES
         debug "[SKYLIGHT] [#{Skylight::VERSION}] A payload description produced <too many uniques>"
         debug "original desc=%s", original_desc
-        debug "cat=%s, title=%s, desc=%s, annot=%s", cat, title, desc, annot.inspect
+        debug "cat=%s, title=%s, desc=%s", cat, title, desc
       end
 
-      start(now - gc_time, cat, title, desc, annot)
+      start(now - gc_time, cat, title, desc)
     rescue => e
       error "failed to instrument span; msg=%s", e.message
       @broken = true
@@ -135,7 +111,7 @@ module Skylight
 
       if time > 0
         t { fmt "tracking GC time; duration=%d", time }
-        stop(start(now - time, GC_CAT, nil, nil, {}), now)
+        stop(start(now - time, GC_CAT, nil, nil), now)
       end
 
       stop(@root, now)
@@ -164,8 +140,11 @@ module Skylight
 
   private
 
-    def start(time, cat, title, desc, annot=nil)
-      span(self.class.normalize_time(time), cat, title, desc, annot)
+    def start(time, cat, title, desc)
+      sp = native_start_span(self.class.normalize_time(time), cat.to_s)
+      native_span_set_title(sp, title.to_s) if title
+      native_span_set_description(sp, desc.to_s) if desc
+      sp
     end
 
     def stop(span, time)
@@ -173,13 +152,6 @@ module Skylight
       nil
     end
 
-    def span(time, cat, title=nil, desc=nil, annot=nil)
-      sp = native_start_span(time, cat.to_s)
-      native_span_set_title(sp, title.to_s) if title
-      native_span_set_description(sp, desc.to_s) if desc
-      sp
-    end
-
     def gc_time
       return 0 unless @gc
       @gc.update

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.8.0-beta.1'
+  VERSION = '0.8.0-beta.3'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta.1
+  version: 0.8.0.beta.3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,7 +53,6 @@ files:
 - lib/skylight/data/cacert.pem
 - lib/skylight/formatters/http.rb
 - lib/skylight/gc.rb
-- lib/skylight/grape.rb
 - lib/skylight/helpers.rb
 - lib/skylight/instrumenter.rb
 - lib/skylight/middleware.rb
@@ -77,6 +76,10 @@ files:
 - lib/skylight/normalizers/active_support/cache_read_multi.rb
 - lib/skylight/normalizers/active_support/cache_write.rb
 - lib/skylight/normalizers/default.rb
+- lib/skylight/normalizers/grape/endpoint.rb
+- lib/skylight/normalizers/grape/endpoint_render.rb
+- lib/skylight/normalizers/grape/endpoint_run.rb
+- lib/skylight/normalizers/grape/endpoint_run_filters.rb
 - lib/skylight/normalizers/moped/query.rb
 - lib/skylight/probes.rb
 - lib/skylight/probes/action_view.rb

data/lib/skylight/grape.rb

@@ -1,2 +0,0 @@
-require 'skylight'
-require 'skylight/probes/grape'