skylight 0.3.14 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5620862e4260060cc2887d5fa2e902eeb96af51a
-  data.tar.gz: 8e664fcdf47316d921921b96286c8b336f6c0892
+  metadata.gz: 0fe30001ff54231d9fc09691d32cfbe734b6511e
+  data.tar.gz: ba257edb4e82c556e5b86a4e93023d19e9d1fa9f
 SHA512:
-  metadata.gz: 0ad66490a91813115f262f0c1640a0a50839bd82f0a81fb32952cd03fede4a742ed220db5d14491b1fda95b0217a5ff3ec48e3ddff6d77a9f4674f4dbf45bae1
-  data.tar.gz: 122849003b5c4d135c8244d37e65ca1505a8cb421ff874c7d6e1af180e8fe122026155c734645ccf10a7527ad1182fe19cf64d9bab3ad2f0b13a1aa44b103c5b
+  metadata.gz: 4862132100ec976e3c8a9a0ba48df3df9323f0b70c4bad5816fb89f6a955c831b2ba07db354437410f00091d53b90d1f1fd517ff5944a7c5b4e14f6a79c692f3
+  data.tar.gz: e4a853e6647f09e4f717909e747ccce70b609f08748c1ff268f87aa5eceea4ebc8cfb04cb39ede0d8000de07ca0792c81f37735973f2bf9cbb5ae4bb79db0a2b

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.3.17 (July 1, 2014)
+
+* Fix warning for Cache.instrument overwrite
+
+## 0.3.16 (July 1, 2014) [YANKED]
+
+* Fixed ActiveSupport::Cache monkeypatch
+
+## 0.3.15 (June 30, 2014) [YANKED]
+
+* Basic instrumentation for ActiveSupport::Cache
+* Fix incompatibility with old version of rack-mini-profiler
+* Better error messages when config/skylight.yml is invalid
+* Better error messages for non-writeable lock/sockfile path
+
 ## 0.3.14 (June 3, 2014)
 
 * Do not build C extension if dependencies (libraries/headers) are

data/lib/skylight/config.rb

@@ -29,6 +29,7 @@ module Skylight
       'SKIP_VALIDATION'         => :'skip_validation',
       'AGENT_INTERVAL'          => :'agent.interval',
       'AGENT_KEEPALIVE'         => :'agent.keepalive',
+      'AGENT_LOCKFILE'          => :'agent.lockfile',
       'AGENT_SAMPLE_SIZE'       => :'agent.sample',
       'AGENT_SOCKFILE_PATH'     => :'agent.sockfile_path',
       'AGENT_STRATEGY'          => :'agent.strategy',
@@ -91,12 +92,17 @@ module Skylight
       version = nil
 
       if path
+        error = nil
         begin
           attrs = YAML.load_file(path)
+          error = "empty file" unless attrs
+          error = "invalid format" if attrs && !attrs.is_a?(Hash)
         rescue Exception => e
-          raise ConfigError, "could not load config file; msg=#{e.message}"
+          error = e.message
         end
 
+        raise ConfigError, "could not load config file; msg=#{error}" if error
+
         version = File.mtime(path).to_i
       end
 

data/lib/skylight/messages/trace.rb

@@ -9,7 +9,7 @@ module Skylight
         attr_reader   :endpoint, :spans, :notifications
 
         def endpoint=(value)
-          @endpoint = value.freeze
+          @endpoint = value.is_a?(String) ? value.freeze : value
           @native_builder.native_set_name(value)
         end
 
@@ -22,7 +22,7 @@ module Skylight
           @native_builder.native_set_name(endpoint)
 
           @instrumenter  = instrumenter
-          @endpoint      = endpoint.freeze
+          @endpoint      = endpoint
           @submitted     = false
           @start         = start
 
@@ -63,8 +63,8 @@ module Skylight
             desc = nil
           end
 
-          title.freeze
-          desc.freeze
+          title.freeze if title.is_a?(String)
+          desc.freeze  if desc.is_a?(String)
 
           desc = @instrumenter.limited_description(desc)
 
@@ -86,8 +86,8 @@ module Skylight
             desc = nil
           end
 
-          title.freeze
-          desc.freeze
+          title.freeze if title.is_a?(String)
+          desc.freeze  if desc.is_a?(String)
 
           original_desc = desc
           now           = Util::Clock.nanos

data/lib/skylight/normalizers.rb

@@ -120,13 +120,14 @@ module Skylight
       end
     end
 
-    %w( moped
-        process_action
-        render_collection
-        render_partial
-        render_template
-        send_file
-        sql).each do |file|
+    %w( action_controller/process_action
+        action_controller/send_file
+        action_view/render_collection
+        action_view/render_partial
+        action_view/render_template
+        active_record/sql
+        active_support/cache
+        moped/query).each do |file|
       require "skylight/normalizers/#{file}"
     end
   end

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

@@ -0,0 +1,35 @@
+module Skylight
+  module Normalizers
+    module ActionController
+      class ProcessAction < Normalizer
+        register "process_action.action_controller"
+
+        CAT = "app.controller.request".freeze
+        PAYLOAD_KEYS = %w[ controller action params format method path ].map(&:to_sym).freeze
+
+        def normalize(trace, name, payload)
+          trace.endpoint = controller_action(payload)
+          [ CAT, trace.endpoint, nil, normalize_payload(payload) ]
+        end
+
+      private
+
+        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
+end

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

@@ -0,0 +1,76 @@
+module Skylight
+  module Normalizers
+    module ActionController
+
+      # Temporary hacks
+      begin
+        require "action_dispatch/http/mime_type"
+        require "action_dispatch/http/mime_types"
+        require "rack/utils"
+
+        class SendFile < Normalizer
+          register "send_file.action_controller"
+
+          CAT = "app.controller.send_file".freeze
+          TITLE = "send file".freeze
+
+          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
+            # include the full path, but we need to make sure we have a good
+            # deduping strategy first.
+            desc = nil
+
+            [ CAT, title, desc, annotations ]
+          end
+
+        private
+
+          OCTET_STREAM = "application/octet-stream".freeze
+          ATTACHMENT = "attachment".freeze
+
+          def initialize(*)
+            super
+
+            @mimes = Mime::SET.reduce({}) do |hash, mime|
+              hash[mime.symbol] = mime.to_s.dup.freeze
+              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
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Skylight
+  module Normalizers
+    module ActionView
+      class RenderCollection < RenderNormalizer
+        register "render_collection.action_view"
+
+        CAT = "view.render.collection".freeze
+
+        def normalize(trace, name, payload)
+          normalize_render(
+            CAT,
+            payload,
+            count: payload[:count])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Skylight
+  module Normalizers
+    module ActionView
+      class RenderPartial < RenderNormalizer
+        register "render_partial.action_view"
+
+        CAT = "view.render.template".freeze
+
+        def normalize(trace, name, payload)
+          normalize_render(
+            CAT,
+            payload,
+            partial: 1)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Skylight
+  module Normalizers
+    module ActionView
+      class RenderTemplate < RenderNormalizer
+        register "render_template.action_view"
+
+        CAT = "view.render.template".freeze
+
+        def normalize(trace, name, payload)
+          normalize_render(
+            CAT,
+            payload,
+            partial: 0)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+require "sql_lexer"
+require "json"
+
+module Skylight
+  module Normalizers
+    module ActiveRecord
+      class SQL < Normalizer
+        register "sql.active_record"
+
+        CAT = "db.sql.query".freeze
+
+        def normalize(trace, name, payload)
+          case payload[:name]
+          when "SCHEMA", "CACHE"
+            return :skip
+          else
+            name  = CAT
+            title = payload[:name] || "SQL"
+          end
+
+          binds = payload[:binds]
+
+          if binds && !binds.empty?
+            binds = binds.map { |col, val| val.inspect }
+          end
+
+          extracted_title, sql, binds, error = extract_binds(payload, binds)
+          title = extracted_title if extracted_title
+
+          if sql
+            annotations = {
+              sql:   sql,
+              binds: binds,
+            }
+          else
+            annotations = {
+              skylight_error: error
+            }
+          end
+
+          [ name, title, sql, annotations ]
+        end
+
+      private
+        def extract_binds(payload, precalculated)
+          title, sql, binds = SqlLexer::Lexer.bindify(payload[:sql], precalculated)
+          [ title, sql, binds, nil ]
+        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
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      # NOTE: Instrumentation may not be turned on by default and is possibly buggy
+      # https://github.com/mperham/dalli/pull/284
+      class Cache < Normalizer
+        %w(clear
+            decrement
+            delete
+            exist
+            fetch_hit
+            generate
+            increment
+            read
+            read_multi
+            write).each do |type|
+          require "skylight/normalizers/active_support/cache_#{type}"
+        end
+      end
+    end
+  end
+end
+
+# See https://github.com/rails/rails/pull/15943
+if defined?(ActiveSupport::Cache::Store.instrument)
+  deprecated = false
+
+  # If it's deprecated, setting to false will cause a deprecation warning
+  # and the value will remain true
+  ActiveSupport::Deprecation.silence do
+    ActiveSupport::Cache::Store.instrument = false
+    deprecated = ActiveSupport::Cache::Store.instrument
+  end
+
+  unless deprecated
+    class ActiveSupport::Cache::Store
+      def self.instrument
+        true
+      end
+
+      def self.instrument=(val)
+        unless val
+          Rails.logger.warn "[WARNING] Skylight has patched ActiveSupport::Cache::Store.instrument to always be true. " \
+                            "In future versions of Rails, this method will no longer be settable. " \
+                            "See https://github.com/rails/rails/pull/15943 for more information."
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheClear < Cache
+        register "cache_clear.active_support"
+
+        CAT = "app.cache.clear".freeze
+        TITLE = "cache clear".freeze
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheDecrement < Cache
+        register "cache_decrement.active_support"
+
+        CAT = "app.cache.decrement".freeze
+        TITLE = "cache decrement"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheDelete < Cache
+        register "cache_delete.active_support"
+
+        CAT = "app.cache.delete".freeze
+        TITLE = "cache delete"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheExist < Cache
+        register "cache_exist?.active_support"
+
+        CAT = "app.cache.exist".freeze
+        TITLE = "cache exist?"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheFetchHit < Cache
+        register "cache_fetch_hit.active_support"
+
+        CAT = "app.cache.fetch_hit".freeze
+        TITLE = "cache fetch hit"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheGenerate < Cache
+        register "cache_generate.active_support"
+
+        CAT = "app.cache.generate".freeze
+        TITLE = "cache generate"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheIncrement < Cache
+        register "cache_increment.active_support"
+
+        CAT = "app.cache.increment".freeze
+        TITLE = "cache increment"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheRead < Cache
+        register "cache_read.active_support"
+
+        CAT = "app.cache.read".freeze
+        TITLE = "cache read"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheReadMulti < Cache
+        register "cache_read_multi.active_support"
+
+        CAT = "app.cache.read_multi".freeze
+        TITLE = "cache read multi"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Skylight
+  module Normalizers
+    module ActiveSupport
+      class CacheWrite < Cache
+        register "cache_write.active_support"
+
+        CAT = "app.cache.write".freeze
+        TITLE = "cache write"
+
+        def normalize(trace, name, payload)
+          [ CAT, TITLE, nil, payload ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,141 @@
+module Skylight
+  module Normalizers
+    module Moped
+      class Query < Normalizer
+        register "query.moped"
+
+        CAT = "db.mongo.query".freeze
+
+        def normalize(trace, name, payload)
+          # payload: { prefix: "  MOPED: #{address.resolved}", ops: operations }
+
+          # We can sometimes have multiple operations. However, it seems like this only happens when doing things
+          # like an insert, followed by a get last error, so we can probably ignore all but the first.
+          operation = payload[:ops] ? payload[:ops].first : nil
+          type = operation && operation.class.to_s =~ /^Moped::Protocol::(.+)$/ ? $1 : nil
+
+          case type
+          when "Query"       then normalize_query(operation)
+          when "GetMore"     then normalize_get_more(operation)
+          when "Insert"      then normalize_insert(operation)
+          when "Update"      then normalize_update(operation)
+          when "Delete"      then normalize_delete(operation)
+          else :skip
+          end
+        end
+
+      private
+
+        def normalize_query(operation)
+          title = normalize_title("QUERY", operation)
+
+          hash, binds = 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]
+        end
+
+        def normalize_get_more(operation)
+          title = normalize_title("GET_MORE", operation)
+
+          annotations = build_annotations(operation)
+          annotations[:limit] = operation.limit
+
+          [CAT, title, nil, annotations]
+        end
+
+        def normalize_insert(operation)
+          title = normalize_title("INSERT", operation)
+
+          annotations = build_annotations(operation)
+          annotations[:count] = operation.documents.count
+
+          [CAT, title, nil, annotations]
+        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)
+
+          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]
+        end
+
+        def normalize_delete(operation)
+          title = normalize_title("DELETE", operation)
+
+          hash, binds = extract_binds(operation.selector)
+          description = hash.to_json
+
+          annotations = build_annotations(operation)
+          annotations[:binds] = binds unless binds.empty?
+
+          [CAT, title, description, annotations]
+        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=[])
+          hash = hash.dup
+
+          hash.each do |k,v|
+            if v.is_a?(Hash)
+              hash[k] = extract_binds(v, binds)[0]
+            else
+              binds << stringify(hash[k])
+              hash[k] = '?'
+            end
+          end
+
+          [hash, binds]
+        end
+
+        def stringify(value)
+          value.is_a?(Regexp) ? value.inspect : value.to_s
+        end
+
+      end
+    end
+  end
+end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.3.14'
+  VERSION = '0.3.17'
 end
 

data/lib/skylight/worker/standalone.rb

@@ -380,16 +380,16 @@ module Skylight
 
         if File.exist?(lockfile)
           if !FileTest.writable?(lockfile)
-            raise WorkerStateError, "`#{lockfile}` not writable"
+            raise WorkerStateError, "`#{lockfile}` not writable. Please set agent.lockfile or agent.sockfile_path in your config to a writable path."
           end
         else
           if !FileTest.writable?(lockfile_root)
-            raise WorkerStateError, "`#{lockfile_root}` not writable"
+            raise WorkerStateError, "`#{lockfile_root}` not writable. Please set agent.lockfile or agent.sockfile_path in your config to a writable path."
           end
         end
 
         unless FileTest.writable?(sockfile_path)
-          raise WorkerStateError, "`#{sockfile_path}` not writable"
+          raise WorkerStateError, "`#{sockfile_path}` not writable. Please set agent.sockfile_path in your config to a writable path."
         end
       end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.3.17
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: 
@@ -33,6 +33,18 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- README.md
+- bin/skylight
+- ext/extconf.rb
+- ext/libskylight.yml
+- ext/rust_support/ruby.h
+- ext/skylight.h
+- ext/skylight.map
+- ext/skylight_native.c
+- ext/test/extconf.rb
+- ext/test/skylight_native_test.c
+- ext/test/skylight_test.h
 - lib/skylight.rb
 - lib/skylight/api.rb
 - lib/skylight/cli.rb
@@ -57,14 +69,25 @@ files:
 - lib/skylight/middleware.rb
 - lib/skylight/native.rb
 - lib/skylight/normalizers.rb
+- lib/skylight/normalizers/action_controller/process_action.rb
+- lib/skylight/normalizers/action_controller/send_file.rb
+- lib/skylight/normalizers/action_view/render_collection.rb
+- lib/skylight/normalizers/action_view/render_partial.rb
+- lib/skylight/normalizers/action_view/render_template.rb
+- lib/skylight/normalizers/active_record/sql.rb
+- lib/skylight/normalizers/active_support/cache.rb
+- lib/skylight/normalizers/active_support/cache_clear.rb
+- lib/skylight/normalizers/active_support/cache_decrement.rb
+- lib/skylight/normalizers/active_support/cache_delete.rb
+- lib/skylight/normalizers/active_support/cache_exist.rb
+- lib/skylight/normalizers/active_support/cache_fetch_hit.rb
+- lib/skylight/normalizers/active_support/cache_generate.rb
+- lib/skylight/normalizers/active_support/cache_increment.rb
+- lib/skylight/normalizers/active_support/cache_read.rb
+- 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/moped.rb
-- lib/skylight/normalizers/process_action.rb
-- lib/skylight/normalizers/render_collection.rb
-- lib/skylight/normalizers/render_partial.rb
-- lib/skylight/normalizers/render_template.rb
-- lib/skylight/normalizers/send_file.rb
-- lib/skylight/normalizers/sql.rb
+- lib/skylight/normalizers/moped/query.rb
 - lib/skylight/probes.rb
 - lib/skylight/probes/excon.rb
 - lib/skylight/probes/excon/middleware.rb
@@ -143,18 +166,6 @@ files:
 - lib/sql_lexer.rb
 - lib/sql_lexer/lexer.rb
 - lib/sql_lexer/version.rb
-- ext/rust_support/ruby.h
-- ext/skylight.h
-- ext/test/skylight_test.h
-- ext/skylight_native.c
-- ext/test/skylight_native_test.c
-- ext/skylight.map
-- ext/extconf.rb
-- ext/test/extconf.rb
-- ext/libskylight.yml
-- CHANGELOG.md
-- README.md
-- bin/skylight
 homepage: http://www.skylight.io
 licenses: []
 metadata: {}
@@ -164,17 +175,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Skylight is a smart profiler for Rails apps

data/lib/skylight/normalizers/moped.rb

@@ -1,139 +0,0 @@
-module Skylight
-  module Normalizers
-    class Moped < Normalizer
-      register "query.moped"
-
-      CAT = "db.mongo.query".freeze
-
-      def normalize(trace, name, payload)
-        # payload: { prefix: "  MOPED: #{address.resolved}", ops: operations }
-
-        # We can sometimes have multiple operations. However, it seems like this only happens when doing things
-        # like an insert, followed by a get last error, so we can probably ignore all but the first.
-        operation = payload[:ops] ? payload[:ops].first : nil
-        type = operation && operation.class.to_s =~ /^Moped::Protocol::(.+)$/ ? $1 : nil
-
-        case type
-        when "Query"       then normalize_query(operation)
-        when "GetMore"     then normalize_get_more(operation)
-        when "Insert"      then normalize_insert(operation)
-        when "Update"      then normalize_update(operation)
-        when "Delete"      then normalize_delete(operation)
-        else :skip
-        end
-      end
-
-    private
-
-      def normalize_query(operation)
-        title = normalize_title("QUERY", operation)
-
-        hash, binds = 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]
-      end
-
-      def normalize_get_more(operation)
-        title = normalize_title("GET_MORE", operation)
-
-        annotations = build_annotations(operation)
-        annotations[:limit] = operation.limit
-
-        [CAT, title, nil, annotations]
-      end
-
-      def normalize_insert(operation)
-        title = normalize_title("INSERT", operation)
-
-        annotations = build_annotations(operation)
-        annotations[:count] = operation.documents.count
-
-        [CAT, title, nil, annotations]
-      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)
-
-        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]
-      end
-
-      def normalize_delete(operation)
-        title = normalize_title("DELETE", operation)
-
-        hash, binds = extract_binds(operation.selector)
-        description = hash.to_json
-
-        annotations = build_annotations(operation)
-        annotations[:binds] = binds unless binds.empty?
-
-        [CAT, title, description, annotations]
-      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=[])
-        hash = hash.dup
-
-        hash.each do |k,v|
-          if v.is_a?(Hash)
-            hash[k] = extract_binds(v, binds)[0]
-          else
-            binds << stringify(hash[k])
-            hash[k] = '?'
-          end
-        end
-
-        [hash, binds]
-      end
-
-      def stringify(value)
-        value.is_a?(Regexp) ? value.inspect : value.to_s
-      end
-
-    end
-  end
-end

data/lib/skylight/normalizers/process_action.rb

@@ -1,34 +0,0 @@
-module Skylight
-  module Normalizers
-    class ProcessAction < Normalizer
-      register "process_action.action_controller"
-
-      CAT = "app.controller.request".freeze
-      PAYLOAD_KEYS = %w[ controller action params format method path ].map(&:to_sym).freeze
-
-      def normalize(trace, name, payload)
-        trace.endpoint = controller_action(payload)
-        [ CAT, trace.endpoint, nil, normalize_payload(payload) ]
-      end
-
-    private
-
-      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/render_collection.rb

@@ -1,16 +0,0 @@
-module Skylight
-  module Normalizers
-    class RenderCollection < RenderNormalizer
-      register "render_collection.action_view"
-
-      CAT = "view.render.collection".freeze
-
-      def normalize(trace, name, payload)
-        normalize_render(
-          CAT,
-          payload,
-          count: payload[:count])
-      end
-    end
-  end
-end

data/lib/skylight/normalizers/render_partial.rb

@@ -1,16 +0,0 @@
-module Skylight
-  module Normalizers
-    class RenderPartial < RenderNormalizer
-      register "render_partial.action_view"
-
-      CAT = "view.render.template".freeze
-
-      def normalize(trace, name, payload)
-        normalize_render(
-          CAT,
-          payload,
-          partial: 1)
-      end
-    end
-  end
-end

data/lib/skylight/normalizers/render_template.rb

@@ -1,16 +0,0 @@
-module Skylight
-  module Normalizers
-    class RenderTemplate < RenderNormalizer
-      register "render_template.action_view"
-
-      CAT = "view.render.template".freeze
-
-      def normalize(trace, name, payload)
-        normalize_render(
-          CAT,
-          payload,
-          partial: 0)
-      end
-    end
-  end
-end

data/lib/skylight/normalizers/send_file.rb

@@ -1,74 +0,0 @@
-module Skylight
-  module Normalizers
-
-    # Temporary hacks
-    begin
-      require "action_dispatch/http/mime_type"
-      require "action_dispatch/http/mime_types"
-      require "rack/utils"
-
-      class SendFile < Normalizer
-        register "send_file.action_controller"
-
-        CAT = "app.controller.send_file".freeze
-        TITLE = "send file".freeze
-
-        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
-          # include the full path, but we need to make sure we have a good
-          # deduping strategy first.
-          desc = nil
-
-          [ CAT, title, desc, annotations ]
-        end
-
-      private
-
-        OCTET_STREAM = "application/octet-stream".freeze
-        ATTACHMENT = "attachment".freeze
-
-        def initialize(*)
-          super
-
-          @mimes = Mime::SET.reduce({}) do |hash, mime|
-            hash[mime.symbol] = mime.to_s.dup.freeze
-            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
-    end
-
-  end
-end

data/lib/skylight/normalizers/sql.rb

@@ -1,79 +0,0 @@
-require "sql_lexer"
-require "json"
-
-module Skylight
-  module Normalizers
-    class SQL < Normalizer
-      register "sql.active_record"
-
-      CAT = "db.sql.query".freeze
-
-      def normalize(trace, name, payload)
-        case payload[:name]
-        when "SCHEMA", "CACHE"
-          return :skip
-        else
-          name  = CAT
-          title = payload[:name] || "SQL"
-        end
-
-        binds = payload[:binds]
-
-        if binds && !binds.empty?
-          binds = binds.map { |col, val| val.inspect }
-        end
-
-        extracted_title, sql, binds, error = extract_binds(payload, binds)
-        title = extracted_title if extracted_title
-
-        if sql
-          annotations = {
-            sql:   sql,
-            binds: binds,
-          }
-        else
-          annotations = {
-            skylight_error: error
-          }
-        end
-
-        [ name, title, sql, annotations ]
-      end
-
-    private
-      def extract_binds(payload, precalculated)
-        title, sql, binds = SqlLexer::Lexer.bindify(payload[:sql], precalculated)
-        [ title, sql, binds, nil ]
-      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
-      end
-    end
-  end
-end