skylight 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c2808cf85e0a48a911372e657dcfe99a191bf6e
-  data.tar.gz: bda10993e74865cc28f05f5db97a244ddf1af972
+  metadata.gz: ba7ee3852dc0f4d87a9d974aeade1100cde21613
+  data.tar.gz: 4101c8d467fbbd2c5fccb0124a02b2cf0634232d
 SHA512:
-  metadata.gz: c247a8b0b9cde850ff0aa98cfb4a867fc73ef05539ab5f7fbdfc478e820a160bf0f4a8b22e94a94d2de731cf715fcefc623fc2dba64f1979738ffdb08c0620a0
-  data.tar.gz: 7f7893da15b537872e33abe3b670c69ce2ae5b0c62806300dafbed5242fea08edcea068514ed390c4bce5f39da1bdb85641556f115fce7ffcdb39d6e7633fc8c
+  metadata.gz: df39f86e95a05dc50973fc6a0ceda455eec6ffb9ca77bc19a3a8726e9099349303905eb282e845886aa220ff88da413d516754215234cb5194b274b60a4f5bb9
+  data.tar.gz: c54def8443d4ebc20d576ad38891acf1b58252fd62d34534e3c905385474bd1b759794f4fc55097c60be47e5b8397fb319808618d7ad091014a7aeea0a10a1bf

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.3.11 (April 11, 2014)
+
+* Improved error handling and internal metrics
+* Improved missing native agent message
+* Improved install logging
+* Added initial inline docs
+* Respects HTTP_PROXY env var during installation
+* Don't overwrite sockfile_path if set explicitly
+
 ## 0.3.10 (April 8, 2014)
 
 * Don't raise on missing native agent path

data/README.md

@@ -2,3 +2,5 @@
 
 Instrument your ruby application and send the data to the Skylight
 servers.
+
+{render:Skylight}

data/ext/extconf.rb

@@ -2,7 +2,27 @@ require 'mkmf'
 require 'yaml'
 require 'logger'
 
-LOG = Logger.new(STDOUT)
+# Must require 'rubygems/platform' vs. just requiring 'rubygems' to avoid a
+# stack overflow bug on ruby 1.9.2.
+require 'rubygems/platform'
+
+class MultiIO
+  def initialize(*targets)
+     @targets = targets
+  end
+
+  def write(*args)
+    @targets.each {|t| t.write(*args)}
+  end
+
+  def close
+    @targets.each(&:close)
+  end
+end
+
+log_file = File.open(File.expand_path("../install.log", __FILE__), "a")
+LOG = Logger.new(MultiIO.new(STDOUT, log_file))
+
 SKYLIGHT_REQUIRED = ENV.key?("SKYLIGHT_REQUIRED") && ENV['SKYLIGHT_REQUIRED'] !~ /^false$/i
 
 require_relative '../lib/skylight/version'
@@ -14,8 +34,8 @@ include Skylight::Util
 # want to break our customer's deploy, but extconf.rb requires a Makefile to be
 # present upon a successful exit. To satisfy this requirement, we create a
 # dummy Makefile.
-def fail(msg)
-  LOG.error msg
+def fail(msg, type=:error)
+  LOG.send type, msg
 
   if SKYLIGHT_REQUIRED
     exit 1
@@ -50,11 +70,21 @@ unless File.exist?(libskylight_a)
     fail "libskylight checksums missing from `#{libskylight_yml}`"
   end
 
+  platform = Gem::Platform.local
+  arch = "#{platform.os}-#{platform.cpu}"
+
+  unless checksum = checksums[arch]
+    fail "no checksum entry for requested architecture -- " \
+             "this probably means the requested architecture is not supported; " \
+             "arch=#{arch}; available=#{checksums.keys}", :info
+  end
+
   begin
     res = NativeExtFetcher.fetch(
       version: version,
       target: libskylight_a,
-      checksums: checksums,
+      checksum: checksum,
+      arch: arch,
       required: SKYLIGHT_REQUIRED,
       logger: LOG)
 

data/lib/skylight.rb

@@ -3,10 +3,16 @@ require 'socket'
 require 'skylight/version'
 
 module Skylight
+  # @api private
   TRACE_ENV_KEY      = 'SKYLIGHT_ENABLE_TRACE_LOGS'.freeze
+
+  # @api private
   STANDALONE_ENV_KEY = 'SKYLIGHT_STANDALONE'.freeze
+
+  # @api private
   STANDALONE_ENV_VAL = 'server'.freeze
 
+  # @api private
   # Whether or not the native extension is present
   @@has_native_ext = false
 
@@ -29,39 +35,41 @@ module Skylight
     raise if ENV.key?("SKYLIGHT_REQUIRED")
   end
 
-  autoload :Api,          'skylight/api'
-  autoload :CLI,          'skylight/cli'
-  autoload :Config,       'skylight/config'
-  autoload :Helpers,      'skylight/helpers'
-
-  module Util
-    autoload :Logging,       'skylight/util/logging'
-    autoload :HTTP,          'skylight/util/http'
+  if defined?(Rails)
+    require 'skylight/railtie'
   end
 
-  # ==== Exceptions ====
-  class IpcProtoError    < RuntimeError; end
-  class WorkerStateError < RuntimeError; end
-  class ConfigError      < RuntimeError; end
-  class TraceError       < RuntimeError; end
-  class SerializeError   < RuntimeError; end
+  # @api private
+  def self.check_install_errors
+    # Note: An unsupported arch doesn't count as an error.
+    install_log = File.expand_path("../../ext/install.log", __FILE__)
 
-  if defined?(Rails)
-    require 'skylight/railtie'
+    if File.exist?(install_log) && File.read(install_log) =~ /ERROR/
+      puts "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension failed to install. " \
+              "Please check #{install_log} and notify support@skylight.io." \
+              "The missing extension will not affect the functioning of your application."
+    end
   end
 
+  # @api private
   def self.warn_skylight_native_missing
     # TODO: Dumping the error messages this way is pretty hacky
     is_rails = defined?(Rails)
     env_name = is_rails ? Rails.env : "development"
 
     if env_name == "development" || env_name == "test"
-      puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in #{env_name} mode. No data will be reported until you deploy your app."
+      puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in #{env_name} mode. " \
+              "No data will be reported until you deploy your app."
     else
-      puts "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension for your platform wasn't found. We currently support monitoring in 32- and 64-bit Linux only. If you are on a supported platform, please contact support at support@skylight.io. The missing extension will not affect the functioning of your application."
+      puts "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension for your platform wasn't found. " \
+              "The monitoring portion of Skylight is only supported on production servers running 32- or " \
+              "64-bit Linux. The missing extension will not affect the functioning of your application " \
+              "and you can continue local development without data being reported. If you are on a " \
+              "supported platform, please contact support at support@skylight.io."
     end
   end
 
+  # @api private
   def self.daemon?
     ENV[STANDALONE_ENV_KEY] == STANDALONE_ENV_VAL
   end
@@ -74,38 +82,41 @@ module Skylight
     require 'skylight/vm/gc'
   end
 
+  autoload :Api,          'skylight/api'
+  autoload :CLI,          'skylight/cli'
+  autoload :Config,       'skylight/config'
+  autoload :Helpers,      'skylight/helpers'
+  autoload :Formatters,   'skylight/formatters'
   autoload :GC,           'skylight/gc'
   autoload :Instrumenter, 'skylight/instrumenter'
   autoload :Messages,     'skylight/messages'
+  autoload :Metrics,      'skylight/metrics'
   autoload :Middleware,   'skylight/middleware'
   autoload :Normalizers,  'skylight/normalizers'
   autoload :Subscriber,   'skylight/subscriber'
   autoload :Worker,       'skylight/worker'
 
-  module Metrics
-    autoload :Meter,           'skylight/metrics/meter'
-    autoload :EWMA,            'skylight/metrics/ewma'
-    autoload :ProcessMemGauge, 'skylight/metrics/process_mem_gauge'
-    autoload :ProcessCpuGauge, 'skylight/metrics/process_cpu_gauge'
-  end
+  # Skylight::Util is defined by the native ext so we can't autoload
+  require 'skylight/util'
 
-  module Util
-    require 'skylight/util/clock'
-
-    autoload :Conversions,   'skylight/util/conversions'
-    autoload :Gzip,          'skylight/util/gzip'
-    autoload :HTTP,          'skylight/util/http'
-    autoload :Inflector,     'skylight/util/inflector'
-    autoload :Logging,       'skylight/util/logging'
-    autoload :Queue,         'skylight/util/queue'
-    autoload :Task,          'skylight/util/task'
-    autoload :UniformSample, 'skylight/util/uniform_sample'
-  end
+  # ==== Exceptions ====
 
-  module Formatters
-    autoload :HTTP, 'skylight/formatters/http'
-  end
+  # @api private
+  class IpcProtoError    < RuntimeError; end
+
+  # @api private
+  class WorkerStateError < RuntimeError; end
+
+  # @api private
+  class ConfigError      < RuntimeError; end
+
+  # @api private
+  class TraceError       < RuntimeError; end
+
+  # @api private
+  class SerializeError   < RuntimeError; end
 
+  # @api private
   TIERS = %w(
     api
     app
@@ -114,25 +125,29 @@ module Skylight
     noise
     other)
 
+  # @api private
   TIER_REGEX = /^(?:#{TIERS.join('|')})(?:\.|$)/u
+
+  # @api private
   CATEGORY_REGEX = /^[a-z0-9_-]+(?:\.[a-z0-9_-]+)*$/iu
+
+  # @api private
   DEFAULT_CATEGORY = "app.block".freeze
-  DEFAULT_OPTIONS = { category: DEFAULT_CATEGORY }
 
-  #
-  #
-  # ===== Public API =====
-  #
-  #
+  # @api private
+  DEFAULT_OPTIONS = { category: DEFAULT_CATEGORY }
 
+  # Start instrumenting
   def self.start!(*args)
     Instrumenter.start!(*args)
   end
 
+  # Stop instrumenting
   def self.stop!(*args)
     Instrumenter.stop!(*args)
   end
 
+  # Start a trace
   def self.trace(endpoint=nil, cat=nil, title=nil)
     unless inst = Instrumenter.instance
       return yield if block_given?
@@ -146,11 +161,13 @@ module Skylight
     end
   end
 
+  # End a trace
   def self.done(span)
     return unless inst = Instrumenter.instance
     inst.done(span)
   end
 
+  # Instrument
   def self.instrument(opts = DEFAULT_OPTIONS)
     unless inst = Instrumenter.instance
       return yield if block_given?
@@ -176,6 +193,7 @@ module Skylight
     end
   end
 
+  # Temporarily disable
   def self.disable
     unless inst = Instrumenter.instance
       return yield if block_given?
@@ -185,6 +203,7 @@ module Skylight
     inst.disable { yield }
   end
 
+  # @api private
   RUBYBIN = File.join(
     RbConfig::CONFIG['bindir'],
     "#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}")
@@ -194,3 +213,7 @@ module Skylight
 
   require 'skylight/probes'
 end
+
+# Warn as soon as possible if there was an error installing Skylight.
+# We do this here since we can't report these issues via Gem install without stopping install entirely.
+Skylight.check_install_errors

data/lib/skylight/api.rb

@@ -1,4 +1,5 @@
 module Skylight
+  # @api private
   class Api
     attr_reader :config, :http
 

data/lib/skylight/cli.rb

@@ -7,6 +7,7 @@ require 'highline'
 require 'active_support/inflector'
 
 module Skylight
+  # @api private
   class CLI < Thor
 
     desc "setup", "Sets up a new app"

data/lib/skylight/compat.rb

@@ -34,6 +34,7 @@ end
 
 if defined?(ActiveSupport::Notifications::Fanout::Subscribers::Evented)
   # Handle early RCs of rails 4.0
+  # @api private
   class ActiveSupport::Notifications::Fanout::Subscribers::Evented
     unless method_defined?(:publish)
       def publish(name, *args)

data/lib/skylight/config.rb

@@ -6,6 +6,7 @@ require 'socket'
 
 module Skylight
   class Config
+    # @api private
     MUTEX = Mutex.new
 
     def self.default_hostname
@@ -102,6 +103,7 @@ module Skylight
       self.load(nil, nil, env)
     end
 
+    # @api private
     def self.remap_env(env)
       ret = {}
 
@@ -125,8 +127,10 @@ module Skylight
       ret
     end
 
+    # @api private
     attr_reader :environment
 
+    # @api private
     def initialize(*args)
       attrs = {}
 
@@ -155,10 +159,12 @@ module Skylight
       end
     end
 
+    # @api private
     def skip_validation?
       !!get(:skip_validation)
     end
 
+    # @api private
     def validate!
       return true if skip_validation?
 
@@ -171,6 +177,7 @@ module Skylight
       true
     end
 
+    # @api private
     def validate_token
       return :ok if skip_validation?
 
@@ -255,12 +262,6 @@ module Skylight
       ret
     end
 
-    #
-    #
-    # ===== Writing =====
-    #
-    #
-
     def write(path)
       FileUtils.mkdir_p(File.dirname(path))
 
@@ -282,18 +283,22 @@ authentication: #{self[:authentication]}
     #
     #
 
+    # @api private
     def worker
       Worker::Builder.new(self)
     end
 
+    # @api private
     def gc
       @gc ||= GC.new(self, get('gc.profiler', VM::GC.new))
     end
 
+    # @api private
     def constant_flush?
       get('test.constant_flush')
     end
 
+    # @api private
     def ignore_token?
       get('test.ignore_token')
     end

data/lib/skylight/formatters.rb

@@ -0,0 +1,6 @@
+module Skylight
+  # @api private
+  module Formatters
+    autoload :HTTP, 'skylight/formatters/http'
+  end
+end

data/lib/skylight/gc.rb

@@ -1,6 +1,7 @@
 require 'thread'
 
 module Skylight
+  # @api private
   class GC
     METHODS   = [ :enable, :total_time ]
     TH_KEY    = :SK_GC_CURR_WINDOW

data/lib/skylight/helpers.rb

@@ -1,6 +1,15 @@
 module Skylight
+  # Instrumenting a specific method will cause an event to be created every time that method is called.
+  # The event will be inserted at the appropriate place in the Skylight trace.
+  #
+  # To instrument a method, the first thing to do is include {Skylight::Helpers Skylight::Helpers}
+  # into the class that you will be instrumenting. Then, annotate each method that
+  # you wish to instrument with {Skylight::Helpers::ClassMethods#instrument_method instrument_method}.
   module Helpers
+
+    # @see Skylight::Helpers
     module ClassMethods
+      # @api private
       def method_added(name)
         super
 
@@ -11,6 +20,7 @@ module Skylight
         end
       end
 
+      # @api private
       def singleton_method_added(name)
         super
 
@@ -21,6 +31,55 @@ module Skylight
         end
       end
 
+      # @overload instrument_method
+      #   Instruments the following method
+      #
+      #   @example
+      #     class MyClass
+      #       include Skylight::Helpers
+      #
+      #       instrument_method
+      #       def my_method
+      #         do_expensive_stuff
+      #       end
+      #
+      #     end
+      #
+      # @overload instrument_method([name], opts={})
+      #   @param [Symbol|String] [name]
+      #   @param [Hash] opts
+      #   @option opts [String] :category ('app.method')
+      #   @option opts [String] :title (ClassName#method_name)
+      #   @option opts [String] :description
+      #
+      #   You may also declare the methods to instrument at any time by passing the name
+      #   of the method as the first argument to `instrument_method`.
+      #
+      #   @example With name
+      #     class MyClass
+      #       include Skylight::Helpers
+      #
+      #       def my_method
+      #         do_expensive_stuff
+      #       end
+      #
+      #       instrument_method :my_method
+      #
+      #     end
+      #
+      #   By default, the event will be titled using the name of the class and the
+      #   method. For example, in our previous example, the event name will be:
+      #   +MyClass#my_method+. You can customize this by passing using the *:title* option.
+      #
+      #   @example Without name
+      #     class MyClass
+      #       include Skylight::Helpers
+      #
+      #       instrument_method title: 'Expensive work'
+      #       def my_method
+      #         do_expensive_stuff
+      #       end
+      #     end
       def instrument_method(*args)
         opts = args.pop if Hash === args.last
 
@@ -66,6 +125,7 @@ module Skylight
       end
     end
 
+    # @api private
     def self.included(base)
       base.class_eval do
         @__sk_instrument_next_method = nil

data/lib/skylight/instrumenter.rb

@@ -4,6 +4,7 @@ require 'base64'
 require 'strscan'
 
 module Skylight
+  # @api private
   class Instrumenter
     KEY  = :__skylight_current_trace
     LOCK = Mutex.new
@@ -27,6 +28,8 @@ module Skylight
       @instance
     end
 
+    # Do start
+    # @param [Config] config The config
     def self.start!(config = Config.new)
       return @instance if @instance
 

data/lib/skylight/messages.rb

@@ -1,4 +1,5 @@
 module Skylight
+  # @api private
   module Messages
     require 'skylight/messages/trace'
     require 'skylight/messages/hello'

data/lib/skylight/messages/hello.rb

@@ -1,4 +1,5 @@
 module Skylight
+  # @api private
   module Messages
     class Hello
       def self.build(version, cmd=[])

data/lib/skylight/metrics.rb

@@ -0,0 +1,9 @@
+module Skylight
+  # @api private
+  module Metrics
+    autoload :Meter,           'skylight/metrics/meter'
+    autoload :EWMA,            'skylight/metrics/ewma'
+    autoload :ProcessMemGauge, 'skylight/metrics/process_mem_gauge'
+    autoload :ProcessCpuGauge, 'skylight/metrics/process_cpu_gauge'
+  end
+end

data/lib/skylight/middleware.rb

@@ -1,4 +1,5 @@
 module Skylight
+  # @api private
   class Middleware
 
     class BodyProxy

data/lib/skylight/native.rb

@@ -1,6 +1,8 @@
 module Skylight
 
   if native?
+
+    # @api private
     class Hello
       DIGITS = /^\s*\d+\s*$/
 
@@ -57,6 +59,7 @@ module Skylight
 
     end
 
+    # @api private
     class Error
       alias serialize native_serialize
       alias type native_get_group
@@ -68,12 +71,20 @@ module Skylight
       end
     end
 
+    # @api private
     class Trace
       alias serialize native_serialize
     end
 
+    # @api private
     class Batch
       alias serialize native_serialize
     end
   end
+
+  # @api private
+  # We have to declare this again due to a YARD bug
+  # https://github.com/lsegal/yard/issues/761
+  class Hello; end
+
 end

data/lib/skylight/normalizers.rb

@@ -1,7 +1,7 @@
 require 'skylight/normalizers/default'
-require 'skylight/util/allocation_free'
 
 module Skylight
+  # @api private
   # Convert AS::N events to Skylight events
   module Normalizers
 
@@ -41,7 +41,7 @@ module Skylight
     end
 
     class RenderNormalizer < Normalizer
-      include AllocationFree
+      include Util::AllocationFree
 
       def setup
         @paths = config['normalizers.render.view_paths'] || []

data/lib/skylight/probes.rb

@@ -1,6 +1,6 @@
 module Skylight
+  # @api private
   module Probes
-
     class ProbeRegistration
       attr_reader :klass_name, :require_paths, :probe
 
@@ -73,6 +73,7 @@ module Skylight
 end
 
 # Allow hooking require
+# @api private
 module ::Kernel
   alias require_without_sk require
 

data/lib/skylight/railtie.rb

@@ -2,6 +2,7 @@ require 'skylight'
 require 'rails'
 
 module Skylight
+  # @api private
   class Railtie < Rails::Railtie
     config.skylight = ActiveSupport::OrderedOptions.new
 
@@ -51,7 +52,7 @@ module Skylight
 
       configure_logging(config, app)
 
-      config['agent.sockfile_path'] = tmp
+      config['agent.sockfile_path'] ||= tmp
       config['normalizers.render.view_paths'] = existent_paths(app.config.paths["app/views"]) + [Rails.root.to_s]
       config.validate!
       config

data/lib/skylight/subscriber.rb

@@ -1,4 +1,5 @@
 module Skylight
+  # @api private
   class Subscriber
     include Util::Logging
 

data/lib/skylight/util.rb

@@ -0,0 +1,18 @@
+module Skylight
+  # @api private
+  module Util
+    # Already defined by the native extension so we can't autoload
+    require 'skylight/util/clock'
+
+    autoload :AllocationFree, 'skylight/util/allocation_free'
+    autoload :Conversions,    'skylight/util/conversions'
+    autoload :Gzip,           'skylight/util/gzip'
+    autoload :HTTP,           'skylight/util/http'
+    autoload :Inflector,      'skylight/util/inflector'
+    autoload :Logging,        'skylight/util/logging'
+    autoload :Queue,          'skylight/util/queue'
+    autoload :Task,           'skylight/util/task'
+    autoload :UniformSample,  'skylight/util/uniform_sample'
+    autoload :NativeExtFetcher, 'skylight/util/native_ext_fetcher'
+  end
+end

data/lib/skylight/util/allocation_free.rb

@@ -1,15 +1,17 @@
 module Skylight
-  module AllocationFree
-    def array_find(array)
-      i = 0
+  module Util
+    module AllocationFree
+      def array_find(array)
+        i = 0
 
-      while i < array.size
-        item = array[i]
-        return item if yield item
-        i += 1
-      end
+        while i < array.size
+          item = array[i]
+          return item if yield item
+          i += 1
+        end
 
-      nil
+        nil
+      end
     end
   end
 end

data/lib/skylight/util/http.rb

@@ -22,6 +22,9 @@ module Skylight
       attr_accessor :authentication, :config
       attr_reader :host, :port
 
+      class StartError < StandardError; end
+      class ReadResponseError < StandardError; end
+
       def initialize(config, service = :report)
         @config = config
         @ssl  = config["#{service}.ssl"]
@@ -83,6 +86,25 @@ module Skylight
         type.new(endpoint, headers)
       end
 
+      def start(http)
+        begin
+          client = http.start
+        rescue => e
+          # TODO: Retry here
+          raise StartError, e.inspect
+        end
+
+        yield client
+      ensure
+        client.finish if client
+      end
+
+      def read_code_and_body(res)
+        code, body = res.code, res.body
+      rescue Net::ReadTimeout, Timeout::Error, EOFError => e
+        raise ReadResponseError, e.inspect
+      end
+
       def execute(req, body=nil)
         t { fmt "executing HTTP request; host=%s; port=%s; path=%s, body=%s",
               @host, @port, req.path, body && body.bytesize }
@@ -104,15 +126,16 @@ module Skylight
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
         end
 
-        http.start do |client|
+        start(http) do |client|
           res = client.request(req)
+          code, body = read_code_and_body(res)
 
-          unless res.code =~ /2\d\d/
-            debug "server responded with #{res.code}"
-            t { fmt "body=%s", res.body }
+          unless code =~ /2\d\d/
+            debug "server responded with #{code}"
+            t { fmt "body=%s", body }
           end
 
-          Response.new(res.code.to_i, res, res.body)
+          Response.new(code.to_i, res, body)
         end
       rescue Exception => e
         error "http %s %s failed; error=%s; msg=%s", req.method, req.path, e.class, e.message

data/lib/skylight/util/native_ext_fetcher.rb

@@ -18,45 +18,33 @@ module Skylight
       class FetchError < StandardError; end
 
       def self.fetch(opts = {})
-        platform = Gem::Platform.local
-
         fetcher = new(
           BASE_URL,
           opts[:target],
           opts[:version],
-          opts[:checksums],
-          opts[:cpu] || platform.cpu,
-          opts[:os] || platform.os,
+          opts[:checksum],
+          opts[:arch],
           opts[:required],
           opts[:logger] || Logger.new(STDOUT))
 
         fetcher.fetch
       end
 
-      def initialize(source, target, version, checksums, cpu, os, required, log)
+      def initialize(source, target, version, checksum, arch, required, log)
         raise "source required" unless source
-        raise "checksums required" unless checksums
-        raise "cpu required" unless cpu
-        raise "os required" unless os
+        raise "checksum required" unless checksum
+        raise "arch required" unless arch
 
         @source = source
         @target = target
         @version = version
-        @checksums = checksums
+        @checksum = checksum
         @required = required
-        @arch = "#{os}-#{cpu}"
+        @arch = arch
         @log = log
       end
 
       def fetch
-        # Ensure that the requested arch is valid
-        unless @checksums[@arch]
-          maybe_raise "no checksum entry for requested architecture -- " \
-            "this probably means the requested architecture is not supported; " \
-            "arch=#{@arch}; available=#{@checksums.keys}"
-          return
-        end
-
         log "fetching native ext; curr-platform=#{Gem::Platform.local.to_s}; " \
           "requested-arch=#{@arch}; version=#{@version}"
 
@@ -81,8 +69,15 @@ module Skylight
         archive
       end
 
-      def self.http_get(host, port, use_ssl, path)
-        Net::HTTP.start(host, port, use_ssl: use_ssl) do |http|
+      def http_get(host, port, use_ssl, path)
+        if http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
+          log "connecting with proxy: #{http_proxy}"
+          uri = URI.parse(http_proxy)
+          p_host, p_port = uri.host, uri.port
+          p_user, p_pass = uri.userinfo.split(/:/) if uri.userinfo
+        end
+
+        Net::HTTP.start(host, port, p_host, p_port, p_user, p_pass, use_ssl: use_ssl) do |http|
           case response = http.get(path)
           when Net::HTTPSuccess
             return [ :success, response.body ]
@@ -107,7 +102,7 @@ module Skylight
           begin
             host, port, use_ssl, path = deconstruct_uri(uri)
 
-            status, body = NativeExtFetcher.http_get(host, port, use_ssl, path)
+            status, body = http_get(host, port, use_ssl, path)
 
             case status
             when :success
@@ -130,7 +125,7 @@ module Skylight
           rescue => e
             remaining_attempts -= 1
 
-            log "failed to fetch native extension; uri=#{uri}; msg=#{e.message}; remaining-attempts=#{remaining_attempts}", e
+            error "failed to fetch native extension; uri=#{uri}; msg=#{e.message}; remaining-attempts=#{remaining_attempts}", e
 
             if remaining_attempts > 0
               sleep 2
@@ -146,11 +141,7 @@ module Skylight
       end
 
       def verify_checksum(archive)
-        unless expected = @checksums[@arch]
-          log "no checksum provided; arch=#{@arch}"
-          return false
-        end
-
+        expected = @checksum
         actual = Digest::SHA2.hexdigest(archive)
 
         unless expected == actual
@@ -178,18 +169,23 @@ module Skylight
       end
 
       def maybe_raise(err)
-        log err
+        error err
 
         if @required
           raise err
         end
       end
 
-      def log(msg, e = nil)
+      def log(msg)
         msg = "[SKYLIGHT] #{msg}"
-        msg << "\n#{e.backtrace.join("\n")}" if e
         @log.info msg
       end
+
+      def error(msg, e=nil)
+        msg = "[SKYLIGHT] #{msg}"
+        msg << "\n#{e.backtrace.join("\n")}" if e
+        @log.error msg
+      end
     end
   end
 end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 end
 

data/lib/skylight/vm/gc.rb

@@ -1,5 +1,6 @@
 
 module Skylight
+  # @api private
   module VM
     if defined?(JRUBY_VERSION)
 

data/lib/skylight/worker.rb

@@ -1,4 +1,5 @@
 module Skylight
+  # @api private
   module Worker
 
     # === Constants

data/lib/skylight/worker/metrics_reporter.rb

@@ -52,7 +52,7 @@ module Skylight
         report = {
           "hostname"           => config[:'hostname'],
           "host.info"          => RbConfig::CONFIG['arch'],
-          "ruby.version"       => RUBY_VERSION,
+          "ruby.version"       => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
           "ruby.engine"        => RUBY_ENGINE,
           "skylight.version"   => Skylight::VERSION
         }

data/lib/skylight/worker/server.rb

@@ -204,7 +204,8 @@ module Skylight
               sanity_check
             end
 
-            if @process_mem_gauge.call > max_memory
+            memory_usage = @process_mem_gauge.call
+            if memory_usage > max_memory
               raise WorkerStateError, "Memory limit exceeded: #{memory_usage} (max: #{max_memory})"
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -47,6 +47,7 @@ files:
 - lib/skylight/compat.rb
 - lib/skylight/config.rb
 - lib/skylight/data/cacert.pem
+- lib/skylight/formatters.rb
 - lib/skylight/formatters/http.rb
 - lib/skylight/gc.rb
 - lib/skylight/helpers.rb
@@ -56,6 +57,7 @@ files:
 - lib/skylight/messages/hello.rb
 - lib/skylight/messages/trace.rb
 - lib/skylight/messages/trace_envelope.rb
+- lib/skylight/metrics.rb
 - lib/skylight/metrics/ewma.rb
 - lib/skylight/metrics/meter.rb
 - lib/skylight/metrics/process_cpu_gauge.rb
@@ -77,6 +79,7 @@ files:
 - lib/skylight/probes/net_http.rb
 - lib/skylight/railtie.rb
 - lib/skylight/subscriber.rb
+- lib/skylight/util.rb
 - lib/skylight/util/allocation_free.rb
 - lib/skylight/util/clock.rb
 - lib/skylight/util/conversions.rb
@@ -167,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Skylight is a ruby application monitoring tool. Currently in closed beta.