skylight 1.7.2 → 2.0.0.beta1

data/lib/skylight/probes/sinatra.rb

@@ -1,76 +0,0 @@
-module Skylight
-  module Probes
-    module Sinatra
-      class Probe
-        def install
-          class << ::Sinatra::Base
-            alias build_without_sk build
-            alias compile_without_sk! compile!
-
-            def compile!(verb, path, *args, &block)
-              compile_without_sk!(verb, path, *args, &block).tap do |_, _, keys_or_wrapper, wrapper|
-                wrapper ||= keys_or_wrapper
-
-                # Deal with the situation where the path is a regex, and the default behavior
-                # of Ruby stringification produces an unreadable mess
-                if path.is_a?(Regexp)
-                  human_readable = "<sk-regex>%r{#{path.source}}</sk-regex>"
-                  wrapper.instance_variable_set(:@route_name, "#{verb} #{human_readable}")
-                else
-                  wrapper.instance_variable_set(:@route_name, "#{verb} #{path}")
-                end
-
-                # Newer versions of Sinatra populate env['sinatra.route']. Polyfill older
-                # versions in a targeted but hackish way.
-                if ::Sinatra::VERSION < '1.4.0'
-                  def wrapper.[](app, args)
-                    app.env['sinatra.route'] = @route_name
-                    super
-                  end
-                end
-              end
-            end
-
-            def build(*args, &block)
-              self.use Skylight::Middleware
-              build_without_sk(*args, &block)
-            end
-          end
-
-          ::Sinatra::Base.class_eval do
-            alias dispatch_without_sk! dispatch!
-            alias compile_template_without_sk compile_template
-
-            def dispatch!(*args, &block)
-              dispatch_without_sk!(*args, &block).tap do
-                instrumenter = Skylight::Instrumenter.instance
-                next unless instrumenter
-                trace = instrumenter.current_trace
-                next unless trace
-
-                # Set the endpoint name to the route name
-                route = env['sinatra.route']
-                trace.endpoint = route if route
-              end
-            end
-
-            def compile_template(engine, data, options, *args, &block)
-              # Pass along a useful "virtual path" to Tilt. The Tilt probe will handle
-              # instrumenting correctly.
-              case data
-              when Symbol
-                options[:sky_virtual_path] = data.to_s
-              else
-                options[:sky_virtual_path] = "Inline template (#{engine})"
-              end
-
-              compile_template_without_sk(engine, data, options, *args, &block)
-            end
-          end
-        end
-      end
-    end
-
-    register(:sinatra, "Sinatra::Base", "sinatra/base", Sinatra::Probe.new)
-  end
-end

data/lib/skylight/probes/tilt.rb

@@ -1,31 +0,0 @@
-# Supports 0.2+, though Sinatra doesn't support 2.0, and Rails doesn't work with older versions
-module Skylight
-  module Probes
-    module Tilt
-      class Probe
-        def install
-          if Gem::Version.new(::Tilt::VERSION) < Gem::Version.new('1.4.1')
-            Skylight::DEPRECATOR.deprecation_warning("Support for Tilt versions before 1.4.1")
-          end
-
-          ::Tilt::Template.class_eval do
-            alias render_without_sk render
-
-            def render(*args, &block)
-              opts = {
-                category: "view.render.template",
-                title: options[:sky_virtual_path] || "Unknown template name"
-              }
-
-              Skylight.instrument(opts) do
-                render_without_sk(*args, &block)
-              end
-            end
-          end
-        end
-      end
-    end
-
-    register(:tilt, "Tilt::Template", "tilt/template", Tilt::Probe.new)
-  end
-end

data/lib/skylight/subscriber.rb

@@ -1,122 +0,0 @@
-module Skylight
-  # @api private
-  class Subscriber
-    include Util::Logging
-
-    attr_reader :config
-
-    def initialize(config, instrumenter)
-      @config       = config
-      @subscriber   = nil
-      @normalizers  = Normalizers.build(config)
-      @instrumenter = instrumenter
-    end
-
-    def register!
-      unregister! if @subscriber
-      pattern = ArrayPattern.new(@normalizers.keys)
-      @subscriber = ActiveSupport::Notifications.subscribe pattern, self
-    end
-
-    def unregister!
-      ActiveSupport::Notifications.unsubscribe @subscriber
-      @subscriber = nil
-    end
-
-    class ArrayPattern
-
-      def initialize(keys)
-        @keys = Set.new keys
-      end
-
-      def ===(item)
-        @keys.include?(item)
-      end
-
-    end
-
-    #
-    #
-    # ===== ActiveSupport::Notifications API
-    #
-    #
-
-    class Notification
-      attr_reader :name, :span
-
-      def initialize(name, span)
-        @name, @span = name, span
-      end
-    end
-
-    def start(name, id, payload)
-      return if @instrumenter.disabled?
-      return unless trace = @instrumenter.current_trace
-
-      result = normalize(trace, name, payload)
-
-      unless result == :skip
-        case result.size
-        when 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
-
-        span = trace.instrument(cat, title, desc)
-      end
-
-      trace.notifications << Notification.new(name, span)
-    rescue Exception => e
-      error "Subscriber#start error; msg=%s", e.message
-      debug "trace=%s", trace.inspect
-      debug "in:  name=%s", name.inspect
-      debug "in:  payload=%s", payload.inspect
-      debug "out: cat=%s, title=%s, desc=%s", cat.inspect, name.inspect, desc.inspect
-      t { e.backtrace.join("\n") }
-      nil
-    end
-
-    def finish(name, id, payload)
-      return if @instrumenter.disabled?
-      return unless trace = @instrumenter.current_trace
-
-      while curr = trace.notifications.pop
-        if curr.name == name
-          begin
-            normalize_after(trace, curr.span, name, payload)
-          ensure
-            trace.done(curr.span) if curr.span
-          end
-          return
-        end
-      end
-
-    rescue Exception => e
-      error "Subscriber#finish error; msg=%s", e.message
-      debug "trace=%s", trace.inspect
-      debug "in:  name=%s", name.inspect
-      debug "in:  payload=%s", payload.inspect
-      t { e.backtrace.join("\n") }
-      nil
-    end
-
-    def publish(name, *args)
-      # Ignored for now because nothing in rails uses it
-    end
-
-  private
-
-    def normalize(*args)
-      @normalizers.normalize(*args)
-    end
-
-    def normalize_after(*args)
-      @normalizers.normalize_after(*args)
-    end
-
-  end
-end

data/lib/skylight/user_config.rb

@@ -1,60 +0,0 @@
-require 'yaml'
-
-module Skylight
-  class UserConfig
-
-    attr_accessor :disable_dev_warning, :disable_env_warning
-
-    def initialize(config)
-      @config = config
-      reload
-    end
-
-    def file_path
-      return @file_path if @file_path
-
-      config_path = @config[:user_config_path] || begin
-        require "etc"
-        home_dir = ENV['HOME'] || Etc.getpwuid.dir || (ENV["USER"] && File.expand_path("~#{ENV['USER']}"))
-        if home_dir
-          File.join(home_dir, ".skylight")
-        else
-          raise ConfigError, "The Skylight `user_config_path` must be defined since the home directory cannot be inferred"
-        end
-      end
-
-      @file_path = File.expand_path(config_path)
-    end
-
-    def disable_dev_warning?
-      disable_dev_warning
-    end
-
-    def disable_env_warning?
-      disable_env_warning
-    end
-
-    def reload
-      config = File.exist?(file_path) ? YAML.load_file(file_path) : false
-      return unless config
-
-      self.disable_dev_warning = !!config['disable_dev_warning']
-      self.disable_env_warning = !!config['disable_env_warning']
-    end
-
-    def save
-      FileUtils.mkdir_p(File.dirname(file_path))
-      File.open(file_path, 'w') do |f|
-        f.puts YAML.dump(to_hash)
-      end
-    end
-
-    def to_hash
-      {
-        'disable_dev_warning' => disable_dev_warning,
-        'disable_env_warning' => disable_env_warning
-      }
-    end
-
-  end
-end

data/lib/skylight/util.rb

@@ -1,17 +0,0 @@
-module Skylight
-  # @api private
-  module Util
-    # Used from the main lib
-    require 'skylight/util/allocation_free'
-    require 'skylight/util/clock'
-    require 'skylight/util/deploy'
-    require 'skylight/util/hostname'
-    require 'skylight/util/logging'
-    require 'skylight/util/ssl'
-    require 'skylight/util/http'
-
-    # Used from the CLI
-    autoload :Gzip,      'skylight/util/gzip'
-    autoload :Inflector, 'skylight/util/inflector'
-  end
-end

data/lib/skylight/util/allocation_free.rb

@@ -1,26 +0,0 @@
-module Skylight
-  module Util
-    # Helpers to reduce memory allocation
-    module AllocationFree
-
-      # Find an item in an array without allocation.
-      #
-      # @param array [Array] the array to search
-      # @yield a block called against each item until a match is found
-      # @yieldparam item an item from the array
-      # @yieldreturn [Boolean] whether `item` matches the criteria
-      # return the found item or nil, if nothing found
-      def array_find(array)
-        i = 0
-
-        while i < array.size
-          item = array[i]
-          return item if yield item
-          i += 1
-        end
-
-        nil
-      end
-    end
-  end
-end

data/lib/skylight/util/clock.rb

@@ -1,54 +0,0 @@
-module Skylight
-  module Util
-    # A more precise clock
-    class Clock
-
-      if Skylight.native?
-        def tick
-          native_hrtime
-        end
-      else
-        def tick
-          now = Time.now
-          now.to_i * 1_000_000_000 + now.usec * 1_000
-        end
-      end
-
-      # TODO: rename to secs
-      def absolute_secs
-        Time.now.to_i
-      end
-
-      # TODO: remove
-      def nanos
-        tick
-      end
-
-      # TODO: remove
-      def secs
-        nanos / 1_000_000_000
-      end
-
-      def self.absolute_secs
-        default.absolute_secs
-      end
-
-      def self.nanos
-        default.nanos
-      end
-
-      def self.secs
-        default.secs
-      end
-
-      def self.default
-        @clock ||= Clock.new
-      end
-
-      def self.default=(clock)
-        @clock = clock
-      end
-
-    end
-  end
-end

data/lib/skylight/util/deploy.rb

@@ -1,132 +0,0 @@
-require 'json'
-require 'uri'
-require 'skylight/util/logging'
-
-module Skylight
-  module Util
-
-    module Deploy
-
-      def self.build(config)
-        DEPLOY_TYPES.each do |type|
-          deploy = type.new(config)
-          return deploy if deploy.id
-        end
-        nil
-      end
-
-      class EmptyDeploy
-
-        attr_reader :config
-        attr_reader :timestamp
-
-        def initialize(config)
-          @config = config
-          @timestamp = Time.now.to_i
-        end
-
-        def id
-          git_sha
-        end
-
-        def git_sha
-          nil
-        end
-
-        def description
-          nil
-        end
-
-        def to_query_string
-          URI.encode_www_form(
-            timestamp:   timestamp,
-            deploy_id:   id.to_s[0..100], # Keep this sane
-            git_sha:     git_sha ? git_sha[0..40] : nil, # A valid SHA will never exceed 40
-            description: description ? description[0..255] : nil) # Avoid massive descriptions
-        end
-
-      end
-
-      class DefaultDeploy < EmptyDeploy
-        include Logging
-
-        def initialize(*)
-          super
-          if description && !id
-            warn "The configured deploy will be ignored as an id or git_sha must be provided."
-          end
-        end
-
-        def id
-          config.get(:'deploy.id') || git_sha
-        end
-
-        def git_sha
-          config.get(:'deploy.git_sha')
-        end
-
-        def description
-          config.get(:'deploy.description')
-        end
-
-      end
-
-      class HerokuDeploy < EmptyDeploy
-
-        def initialize(*)
-          super
-          @info = get_info
-        end
-
-        def id
-          @info ? @info['id'] : nil
-        end
-
-        def git_sha
-          @info ? @info['commit'] : nil
-        end
-
-        def description
-          @info ? @info['description'] : nil
-        end
-
-        private
-
-          def get_info
-            info_path = config[:'heroku.dyno_info_path']
-
-            if File.exist?(info_path)
-              if info = JSON.parse(File.read(info_path))
-                info['release']
-              end
-            end
-          end
-
-      end
-
-      class GitDeploy < EmptyDeploy
-
-        attr_reader :git_sha, :description
-
-        def initialize(*)
-          super
-          @git_sha, @description = get_info
-        end
-
-        private
-
-          def get_info
-            Dir.chdir(config.root) do
-              info = `git log -1 --pretty="%H %s" 2>&1`
-              info.split(" ", 2).map(&:strip) if $?.success?
-            end
-          end
-
-      end
-
-      DEPLOY_TYPES = [DefaultDeploy, HerokuDeploy, GitDeploy]
-
-    end
-
-  end
-end