skylight 5.0.0.beta → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7cc16a9f8a59047a74b34d19ed0f85e696e893d0f5c1c6984604a1358df6efb
-  data.tar.gz: b50cb4b7962f3b78bbccb5b3025bc051febcf6c8cd95303439add2f3df5cb75e
+  metadata.gz: 66c646baeaeddece5a75140908f8c7d1aec447945903ff5681c1e4de58839e79
+  data.tar.gz: a3fe10a6b05963038f40f4b82d77cd545c42fa546d63cd440a21eb3839280b71
 SHA512:
-  metadata.gz: dc3445e94e0b3c5dc4936569df35f60b7ce9ac5f82492f92c247aca1cb44f9570092b11f532d28a6d795b39d2a65eae4bac16b5ca1a9c4e7b1ae2b47eb6c87ff
-  data.tar.gz: c591bb63cd56354d0954955f93720f1183afb0f71bd6c0fd2df7cfb8f32dab2a4988eaa20fe3018615cbb47531163b09dddd1c849f430989ffb589f98b03f7c5
+  metadata.gz: ca6b42cfa51a39f1cccfc8f169a9bdc1560ec9774423c1ca335ec6fc26bd70d47f40c62d9e645ea626b00626e962a9ef3dbda49c693de0a56fef10bc04ab1d76
+  data.tar.gz: ccb18fe7cc713c03544db2a0d1dc5c42d86fe5ee14c0db11e208884203b7141cd39032bdb75f5c7eaf341b1ded6e9c761e8529e1bf50d1c499b1bab85a545fcd

data/CHANGELOG.md

@@ -1,18 +1,38 @@
-## 5.0.0.beta
-* [BREAKING] Merge skylight-core into skylight. All classes previously namespaced under `Skylight::Core` have been moved to `Skylight`.
-* [BREAKING] Remove `Skylight::Util::Inflector`
-* [BREAKING] Drop support for Rails 4
-* [BREAKING] Drop support for Rails 2.3
+## 5.0.0 (March 5, 2021)
+
+* [FEATURE] Add normalizer for Shrine events (thanks @janko!)
+* [FEATURE] Source Locations detection and reporting is now enabled by default (can be disabled with `SKYLIGHT_ENABLE_SOURCE_LOCATIONS=false`)
+* [FEATURE] Configuration for the Source Locations caches via `SYLIGHT_SOURCE_LOCATION_CACHE_SIZE`
+
+* [IMPROVEMENT] Improve keyword argument handling in Skylight::Helpers (thanks @lukebooth!)
+* [IMPROVEMENT] Replace a Kernel.puts with Skylight.log (thanks @johnnyshields!)
+* [IMPROVEMENT] Various updates to the SQL lexer
+* [IMPROVEMENT] Reduce volume of log messages sent to the native logger in debug level
+* [IMPROVEMENT] Optimizations for the Source Locations extension
+* [IMPROVEMENT] Improved Delayed::Job probe
 * [IMPROVEMENT] Maintain method visibility when instrumenting with `instrument_method`
 * [IMPROVEMENT] Update probes to use `Module#prepend` where possible
 * [IMPROVEMENT] New tokio-based skylightd
 * [IMPROVEMENT] Support `render_layout` notifications in Rails 6.1
 * [IMPROVEMENT] Support `ActionMailer::MailDeliveryJob` in Rails 6.1
-* [IMPROVEMENT] Better logging config
+* [IMPROVEMENT] Better logging config. `SKYLIGHT_NATIVE_LOG_LEVEL` now defaults to `warn`.
+
+* [BREAKING] Rename `environment` keyword argument to `priority_key`. Note `env` has not changed.
+* [BREAKING] Drop support for Ruby 2.4
+* [BREAKING] Merge skylight-core into skylight. All classes previously namespaced under `Skylight::Core` have been moved to `Skylight`.
+* [BREAKING] Remove `Skylight::Util::Inflector`
+* [BREAKING] Drop support for Rails 4
+* [BREAKING] Drop support for Ruby 2.3
+
+* [BUGFIX] Fix issue with missing metadata in MongoDB probe
+* [BUGFIX] Resolve an inability to parse certain SQL queries containing arrays
 * [BUGFIX] Allow multiple probes to be registered under the same key
 * [BUGFIX] Do not refer to Redis constant until the probe is installed
 * [BUGFIX] Fix nested calls to `Normalizers::Faraday::Request.disable`
 
+## 4.3.2 (December 14, 2020)
+* [BUGFIX] Backport an ActionView fix from Skylight 5 (makes Skylight 4 compatible with Rails 6.1)
+
 ## 4.3.1 (June 24, 2020)
 * [BUGFIX] Fix an issue in which `Mime::NullType` would result in an exception
 

data/CONTRIBUTING.md

@@ -16,7 +16,7 @@ If you prefer to run tests in your own environment, you may do so as follows:
 
 ```shell
 # Select a gemfile and bundle install
-export BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.rails-5.2.x
+export BUNDLE_GEMFILE=$PWD/gemfiles/rails-5.2.x/Gemfile
 bundle install
 # Run the test suite (takes 5-10 minutes)
 bundle exec rspec

data/ext/extconf.rb

@@ -42,7 +42,7 @@ SKYLIGHT_CHECKSUM = ENV["SKYLIGHT_CHECKSUM"]
 SKYLIGHT_EXT_STRICT = ENV.key?("SKYLIGHT_EXT_STRICT") && ENV["SKYLIGHT_EXT_STRICT"] =~ /^true$/i
 
 # Setup logger
-LOG = Logger.new(MultiIO.new(STDOUT, File.open(SKYLIGHT_INSTALL_LOG, "a")))
+LOG = Logger.new(MultiIO.new($stdout, File.open(SKYLIGHT_INSTALL_LOG, "a")))
 
 # Handles terminating in the case of a failure. If we have a bug, we do not
 # want to break our customer's deploy, but extconf.rb requires a Makefile to be
@@ -69,7 +69,7 @@ end
 if Platform::OS == "darwin"
   # If the user installs Xcode-only, they have to approve the
   # license or no "xc*" tool will work.
-  if `/usr/bin/xcrun clang 2>&1` =~ /license/ && !$CHILD_STATUS.success?
+  if `/usr/bin/xcrun clang 2>&1` =~ /license/ && !$CHILD_STATUS.success? # rubocop:disable Style/SoleNestedConditional
     fail <<~MESSAGE
       You have not agreed to the Xcode license and so we are unable to build the native agent.
       To resolve this, you can agree to the license by opening Xcode.app or running:

data/ext/libskylight.yml

@@ -1,6 +1,8 @@
-version: "5.0.0-45b02dd"
+# commit: ea59cc7bdbbee0f69d1cf7e69827974a9ea67645
+---
+version: "5.0.0-488d432"
 checksums:
-  x86-linux:         "218a51683cbe3f6e7f1d31097a7e732c6bac3e3780a707312f8441dd45d8f3a6"
-  x86_64-linux:      "2426968fef8cd7fe0fd0ea582fd8098db78025ce936bac9d72b7753995bd1ea9"
-  x86_64-linux-musl: "ca07748d43fac0b4a05b38b5ce0fc4cb7e43469a183919c5d9980a8b2e0b01ab"
-  x86_64-darwin:     "8b19eb2ffd19f78ee6e547b37fcf5cad2e49aa9a8bc2b9615a791ccfc91c2552"
+  x86-linux:         "3c16b6db1508f35720258551783fbcd30fd231638bad316ea76748d659838399"
+  x86_64-linux:      "94383aa3359c3f2e9c0e3c16ee263d46c5673dd255f8842e6acadf5ec3131c06"
+  x86_64-linux-musl: "d2e2e2e61c321315f9bcaa157426f33aef8ffc2330ba46b2cdcbd9442e65f728"
+  x86_64-darwin:     "bcc925d0bcbae83a484f35dbc9729dcf262e1f3a8c29b8d387d0f58ad8f3afa3"

data/lib/skylight.rb

@@ -101,7 +101,7 @@ module Skylight
                           message: e.message, klass: e.class)]
         end
 
-      if config&.respond_to?("log_#{level}") && config&.respond_to?(:log_trace)
+      if config.respond_to?("log_#{level}") && config.respond_to?(:log_trace)
         config.send("log_#{level}", message)
         config.log_trace e.backtrace.join("\n")
       else
@@ -194,10 +194,17 @@ module Skylight
         opts        = {}
       end
 
+      # NOTE: unless we have `:internal` (indicating a built-in Skylight instrument block),
+      # or we already have a `source_file` or `source_line` (probably set by `instrument_method`),
+      # we set the caller location to the second item on the stack
+      # (immediate caller of the `instrument` method).
+      unless opts[:source_file] || opts[:source_line] || opts[:internal]
+        opts = opts.merge(sk_instrument_location: caller_locations(1..1).first)
+      end
+
       meta ||= {}
 
       instrumenter.extensions.process_instrument_options(opts, meta)
-
       instrumenter.instrument(category, title, desc, meta, &block)
     end
 

data/lib/skylight/api.rb

@@ -9,8 +9,11 @@ module Skylight
     attr_reader :config
 
     class Error < StandardError; end
+
     class Unauthorized < Error; end
+
     class Conflict < Error; end
+
     class CreateFailed < Error
       attr_reader :res
 

data/lib/skylight/cli/doctor.rb

@@ -85,20 +85,18 @@ module Skylight
         say "Checking for valid configuration"
 
         indent do
-          begin
-            config.validate!
-            say "Configuration is valid", :green
-          rescue ConfigError => e
-            encountered_error!
-
-            say "Configuration is invalid", :red
-            indent do
-              say e.message, :red
-              say "This may occur if you are configuring with ENV variables and didn't set them in this shell."
-            end
-
-            done!
+          config.validate!
+          say "Configuration is valid", :green
+        rescue ConfigError => e
+          encountered_error!
+
+          say "Configuration is invalid", :red
+          indent do
+            say e.message, :red
+            say "This may occur if you are configuring with ENV variables and didn't set them in this shell."
           end
+
+          done!
         end
 
         puts "\n"

data/lib/skylight/config.rb

@@ -44,6 +44,7 @@ module Skylight
       -"LOG_LEVEL"                    => :log_level,
       -"ALERT_LOG_FILE"               => :alert_log_file,
       -"NATIVE_LOG_FILE"              => :native_log_file,
+      -"NATIVE_LOG_LEVEL"             => :native_log_level,
       -"LOG_SQL_PARSE_ERRORS"         => :log_sql_parse_errors,
 
       # == Proxy ==
@@ -110,7 +111,8 @@ module Skylight
       -"HEROKU_DYNO_INFO_PATH"        => :'heroku.dyno_info_path',
 
       # == Source Location ==
-      -"SOURCE_LOCATION_IGNORED_GEMS" => :source_location_ignored_gems
+      -"SOURCE_LOCATION_IGNORED_GEMS" => :source_location_ignored_gems,
+      -"SOURCE_LOCATION_CACHE_SIZE"   => :source_location_cache_size
     }.freeze
 
     KEY_TO_NATIVE_ENV = {
@@ -119,9 +121,7 @@ module Skylight
       native_log_level: "LOG_LEVEL"
     }.freeze
 
-    SERVER_VALIDATE = %i[
-      enable_source_locations
-    ].freeze
+    SERVER_VALIDATE = %i[].freeze
 
     DEFAULT_IGNORED_SOURCE_LOCATION_GEMS = [
       -"skylight",
@@ -145,12 +145,13 @@ module Skylight
             log_level:                 -"INFO",
             alert_log_file:            -"-",
             log_sql_parse_errors:      true,
+            native_log_level:          -"warn",
 
             # Features
             enable_segments:           true,
             enable_sidekiq:            false,
             sinatra_route_prefixes:    false,
-            enable_source_locations:   false,
+            enable_source_locations:   true,
 
             # Deploys
             'heroku.dyno_info_path':   -"/etc/heroku/dyno",
@@ -243,7 +244,7 @@ module Skylight
     end
 
     # @api private
-    attr_reader :environment
+    attr_reader :priority_key
 
     # @api private
     def initialize(*args)
@@ -253,16 +254,16 @@ module Skylight
         attrs = args.pop.dup
       end
 
-      @values   = {}
+      @values = {}
       @priority = {}
-      @regexp   = nil
+      @priority_regexp = nil
       @alert_logger = nil
       @logger = nil
 
       p = attrs.delete(:priority)
 
-      if (@environment = args[0])
-        @regexp = /^#{Regexp.escape(@environment)}\.(.+)$/
+      if (@priority_key = args[0])
+        @priority_regexp = /^#{Regexp.escape(priority_key)}\.(.+)$/
       end
 
       attrs.each do |k, v|
@@ -277,7 +278,8 @@ module Skylight
     def self.load(opts = {}, env = ENV)
       attrs = {}
       path = opts.delete(:file)
-      environment = opts.delete(:environment)
+      priority_key = opts.delete(:priority_key)
+      priority_key ||= opts[:env] # if a priority_key is not given, use env if available
 
       if path
         error = nil
@@ -295,11 +297,14 @@ module Skylight
         raise ConfigError, "could not load config file; msg=#{error}" if error
       end
 
+      # The key-value pairs in this `priority` option are inserted into the
+      # config's @priority hash *after* anything listed under priority_key;
+      # i.e., ENV takes precendence over priority_key
       if env
         attrs[:priority] = remap_env(env)
       end
 
-      config = new(environment, attrs)
+      config = new(priority_key, attrs)
 
       opts.each do |k, v|
         config[k] = v
@@ -439,7 +444,7 @@ module Skylight
           end
         end
 
-        if @regexp && k =~ @regexp
+        if @priority_regexp && k =~ @priority_regexp
           @priority[$1.to_sym] = val
         end
 
@@ -549,23 +554,13 @@ module Skylight
           when /^warn$/i  then Logger::WARN
           when /^error$/i then Logger::ERROR
           when /^fatal$/i then Logger::FATAL
-          else Logger::ERROR
+          else Logger::ERROR # rubocop:disable Lint/DuplicateBranch
           end
         end
     end
 
     def native_log_level
-      @native_log_level ||=
-        if trace?
-          "trace"
-        else
-          case log_level
-          when Logger::DEBUG then "debug"
-          when Logger::INFO  then "info"
-          when Logger::WARN  then "warn"
-          else "error"
-          end
-        end
+      get(:native_log_level).to_s.downcase
     end
 
     def logger
@@ -586,7 +581,7 @@ module Skylight
       end
     end
 
-    attr_writer :logger
+    attr_writer :logger, :alert_logger
 
     def alert_logger
       @alert_logger ||= MUTEX.synchronize do
@@ -601,8 +596,6 @@ module Skylight
       end
     end
 
-    attr_writer :alert_logger
-
     def enable_segments?
       !!get(:enable_segments)
     end
@@ -638,13 +631,13 @@ module Skylight
 
         Logger.new(out, progname: "Skylight", level: level)
       rescue
-        Logger.new(STDOUT, progname: "Skylight", level: level)
+        Logger.new($stdout, progname: "Skylight", level: level)
       end
 
       def load_logger
         unless (l = @logger)
           out = get(:log_file)
-          out = STDOUT if out == "-"
+          out = $stdout if out == "-"
           l = create_logger(out, level: log_level)
         end
 
@@ -690,7 +683,7 @@ module Skylight
         corrected_config = res.corrected_config
 
         # Use defaults if no corrected config is available. This will happen if the request failed.
-        corrected_config ||= Hash[SERVER_VALIDATE.map { |k| [k, self.class.default_values.fetch(k)] }]
+        corrected_config ||= SERVER_VALIDATE.map { |k| [k, self.class.default_values.fetch(k)] }.to_h
 
         config_to_update = corrected_config.reject { |k, v| get(k) == v }
         unless config_to_update.empty?
@@ -700,7 +693,7 @@ module Skylight
 
             # This is a weird way to handle priorities
             # See https://github.com/tildeio/direwolf-agent/issues/275
-            k = "#{environment}.#{k}" if environment
+            k = "#{priority_key}.#{k}" if priority_key
 
             set(k, v)
           end

data/lib/skylight/deprecation.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require "active_support/deprecation"
 
 module Skylight
-  SKYLIGHT_GEM_ROOT = File.expand_path("../..", __dir__) + "/"
+  SKYLIGHT_GEM_ROOT = "#{File.expand_path('../..', __dir__)}/"
 
   class Deprecation < ActiveSupport::Deprecation
     private

data/lib/skylight/errors.rb

@@ -13,10 +13,10 @@ module Skylight
       end
 
       Skylight.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-        class #{name}Error < NativeError
-          def self.code; #{code}; end
-          def self.message; #{message.to_json}; end
-        end
+        class #{name}Error < NativeError            # class SqlLexError < NativeError
+          def self.code; #{code}; end               #   def self.code; 4; end
+          def self.message; #{message.to_json}; end #   def self.message; "Failed to lex SQL query."; end
+        end                                         # end
       RUBY
 
       klass = Skylight.const_get("#{name}Error")

data/lib/skylight/extensions.rb

@@ -32,6 +32,12 @@ module Skylight
         !!extensions.detect { |x| x.is_a?(ext_class) }
       end
 
+      def process_trace_meta(meta)
+        extensions.each do |ext|
+          ext.process_trace_meta(meta)
+        end
+      end
+
       # meta is a mutable hash that will be passed to the instrumenter.
       # This method bridges Skylight.instrument and instrumenter.instrument.
       def process_instrument_options(opts, meta)
@@ -83,6 +89,8 @@ module Skylight
         @config = config
       end
 
+      def process_trace_meta(_meta); end
+
       def process_instrument_options(_opts, _meta); end
 
       def process_normalizer_meta(_payload, _meta, **opts); end

data/lib/skylight/extensions/source_location.rb

@@ -11,24 +11,46 @@ module Skylight
       include Util::Logging
 
       META_KEYS = %i[source_location source_file source_line].freeze
+      MAX_CALLER_DEPTH = 75
 
       def initialize(*)
         super
-        @caller_cache = Util::LruCache.new(100)
-        @instance_method_source_location_cache = Util::LruCache.new(100)
+        cache_size = (config[:source_location_cache_size] || 1000).to_i
+        @caller_cache = Util::LruCache.new(cache_size)
+        @instance_method_source_location_cache = Util::LruCache.new(cache_size)
         gem_require_trie # memoize this at startup
       end
 
+      def process_trace_meta(meta)
+        unless meta[:source_location] || meta[:source_file]
+          warn "Ignoring source_line without source_file" if meta[:source_line]
+          if (location = find_caller)
+            meta[:source_file] = location.absolute_path
+            meta[:source_line] = location.lineno
+          end
+        end
+      end
+
       def process_instrument_options(opts, meta)
         source_location = opts[:source_location] || opts[:meta]&.[](:source_location)
         source_file = opts[:source_file] || opts[:meta]&.[](:source_file)
         source_line = opts[:source_line] || opts[:meta]&.[](:source_line)
+        source_name_hint, const_name, method_name = opts[:source_location_hint] ||
+                                                    opts[:meta]&.[](:source_location_hint)
+        instrument_location = opts[:sk_instrument_location]
 
         if source_location
           meta[:source_location] = source_location
+        elsif source_name_hint
+          source_location = dispatch_hinted_source_location(source_name_hint, const_name, method_name)
+          meta[:source_file], meta[:source_line] = source_location
+          meta.delete(:source_location_hint) if source_location
         elsif source_file
           meta[:source_file] = source_file
           meta[:source_line] = source_line
+        elsif instrument_location && project_path?(instrument_location.absolute_path)
+          meta[:source_file] = instrument_location.absolute_path
+          meta[:source_line] = instrument_location.lineno
         else
           warn "Ignoring source_line without source_file" if source_line
           if (location = find_caller(cache_key: opts.hash))
@@ -41,14 +63,21 @@ module Skylight
       end
 
       def process_normalizer_meta(payload, meta, **opts)
-        sl = if ((source_name, *args) = opts[:source_location])
-               dispatch_hinted_source_location(
-                 source_name,
-                 payload,
-                 meta,
-                 args: args, **opts
-               )
-             end
+        if opts[:source_location] && (opts[:source_file] || opts[:source_line])
+          warn "Found both source_location and source_file or source_line in normalizer\n" \
+              "  location=#{opts[:source_location]}; file=#{opts[:source_file]}; line=#{opts[:source_line]}"
+        end
+
+        sl =
+          if (source_name, constant_name, method_name = opts[:source_location_hint])
+            dispatch_hinted_source_location(
+              source_name,
+              constant_name,
+              method_name
+            )
+          elsif opts[:source_file]
+            [opts[:source_file], opts[:source_line]]
+          end
 
         sl ||= source_location(payload, meta, cache_key: opts[:cache_key])
 
@@ -91,86 +120,92 @@ module Skylight
 
       protected
 
-      def dispatch_hinted_source_location(source_name, payload, meta, args:, **opts)
-        const_name, method_name = args
-        return unless const_name && method_name
+        def dispatch_hinted_source_location(source_name, const_name, method_name)
+          return unless const_name && method_name
 
-        instance_method_source_location(const_name, method_name, source_name: source_name)
-      end
+          instance_method_source_location(const_name, method_name, source_name: source_name)
+        end
 
-      # from normalizers.rb
-      # Returns an array of file and line
-      def source_location(payload, meta, cache_key: nil)
-        # FIXME: what should precedence be?
-        if meta.is_a?(Hash) && meta[:source_location]
-          meta.delete(:source_location)
-        elsif payload.is_a?(Hash) && payload[:sk_source_location]
-          payload[:sk_source_location]
-        elsif (location = find_caller(cache_key: cache_key))
-          [location.absolute_path, location.lineno]
+        # from normalizers.rb
+        # Returns an array of file and line
+        def source_location(payload, meta, cache_key: nil)
+          # FIXME: what should precedence be?
+          if meta.is_a?(Hash) && meta[:source_location]
+            meta.delete(:source_location)
+          elsif payload.is_a?(Hash) && payload[:sk_source_location]
+            payload[:sk_source_location]
+          elsif (location = find_caller(cache_key: cache_key))
+            [location.absolute_path, location.lineno]
+          end
         end
-      end
 
-      def find_caller(cache_key: nil)
-        if cache_key
-          @caller_cache.fetch(cache_key) { find_caller_inner }
-        else
-          find_caller_inner
+        def find_caller(cache_key: nil)
+          # starting at 4 to skip Skylight extension processing logic
+          locations = ::Kernel.caller_locations(4..MAX_CALLER_DEPTH)
+
+          if cache_key
+            localized_cache_key = [cache_key, locations.map(&:lineno)].hash
+            @caller_cache.fetch(localized_cache_key) { find_caller_inner(locations) }
+          else
+            find_caller_inner(locations)
+          end
         end
-      end
 
-      def project_path?(path)
-        # Must be in the project root
-        return false unless path.start_with?(config.root.to_s)
-        # Must not be Bundler's vendor location
-        return false if defined?(Bundler) && path.start_with?(Bundler.bundle_path.to_s)
-        # Must not be Ruby files
-        return false if path.include?("/ruby-#{RUBY_VERSION}/lib/ruby/")
+        def project_path?(path)
+          return false unless path
 
-        # So it must be a project file
-        true
-      end
+          # Must be in the project root
+          return false unless path.start_with?(config.root.to_s)
+          # Must not be Bundler's vendor location
+          return false if defined?(Bundler) && path.start_with?(Bundler.bundle_path.to_s)
+          # Must not be Ruby files
+          return false if path.include?("/ruby-#{RUBY_VERSION}/lib/ruby/")
 
-      def instance_method_source_location(constant_name, method_name, source_name: :instance_method)
-        @instance_method_source_location_cache.fetch([constant_name, method_name, source_name]) do
-          if (constant = ::ActiveSupport::Dependencies.safe_constantize(constant_name))
-            if constant.instance_methods.include?(:"before_instrument_#{method_name}")
-              method_name = :"before_instrument_#{method_name}"
-            end
-            begin
-              unbound_method = case source_name
-                               when :instance_method
-                                 find_instance_method(constant, method_name)
-                               when :own_instance_method
-                                 find_own_instance_method(constant, method_name)
-                               when :instance_method_super
-                                 find_instance_method_super(constant, method_name)
-                               end
-
-              unbound_method&.source_location
-            rescue NameError
-              nil
+          # So it must be a project file
+          true
+        end
+
+        def instance_method_source_location(constant_name, method_name, source_name: :instance_method)
+          @instance_method_source_location_cache.fetch([constant_name, method_name, source_name]) do
+            if (constant = ::ActiveSupport::Dependencies.safe_constantize(constant_name))
+              if constant.instance_methods.include?(:"before_instrument_#{method_name}")
+                method_name = :"before_instrument_#{method_name}"
+              end
+              begin
+                unbound_method = case source_name
+                                 when :instance_method
+                                   find_instance_method(constant, method_name)
+                                 when :own_instance_method
+                                   find_own_instance_method(constant, method_name)
+                                 when :instance_method_super
+                                   find_instance_method_super(constant, method_name)
+                                 when :class_method
+                                   find_class_method(constant, method_name)
+                                 end
+
+                unbound_method&.source_location
+              rescue NameError
+                nil
+              end
             end
           end
         end
-      end
 
-      def sanitize_source_location(path, line)
-        # Do this first since gems may be vendored in the app repo. However, it might be slower.
-        # Should we cache matches?
-        if (gem_name = find_source_gem(path))
-          find_source_gem(path)
-          path = gem_name
-          line = nil
-        elsif project_path?(path)
-          # Get relative path to root
-          path = Pathname.new(path).relative_path_from(config.root).to_s
-        else
-          return
-        end
+        def sanitize_source_location(path, line)
+          # Do this first since gems may be vendored in the app repo. However, it might be slower.
+          # Should we cache matches?
+          if (gem_name = find_source_gem(path))
+            path = gem_name
+            line = nil
+          elsif project_path?(path)
+            # Get relative path to root
+            path = Pathname.new(path).relative_path_from(config.root).to_s
+          else
+            return
+          end
 
-        line ? "#{path}:#{line}" : path
-      end
+          line ? "#{path}:#{line}" : path
+        end
 
       private
 
@@ -198,21 +233,25 @@ module Skylight
         end
 
         def find_source_gem(path)
+          return nil unless path
+
           trie = gem_require_trie
 
           path.split(File::SEPARATOR).each do |segment|
             trie = trie[segment]
-            return unless trie
+            break unless trie
             return trie[:name] if trie[:name]
           end
 
           nil
         end
 
-        def find_caller_inner
+        def find_caller_inner(locations)
           # Start at file before this one
-          caller_locations(1).find do |l|
-            find_source_gem(l.absolute_path) || project_path?(l.absolute_path)
+          # NOTE: We could start farther back now to avoid more Skylight files
+          locations.find do |l|
+            absolute_path = l.absolute_path
+            find_source_gem(absolute_path) || project_path?(absolute_path)
           end
         end
 
@@ -244,6 +283,9 @@ module Skylight
           constant.instance_method(method_name)
         end
 
+        def find_class_method(constant, method_name)
+          constant.method(method_name)
+        end
     end
   end
 end