skylight 0.3.3 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79eb0c65a8c541558b3a890c8e740ee4c1356c97
-  data.tar.gz: 11dd29df096b2125fde4ef9e156f3303c1b5e52c
+  metadata.gz: 3b26b3f575af56669c5257a37d8d7ca11544aba4
+  data.tar.gz: 5fb2964195f3d146693f62b6593ff2b0bbf3944d
 SHA512:
-  metadata.gz: 2597212fd3072f84d1f7f1c71de29d16afdd99e7667c3d047b713244af23e3411bc1f60e7303566312525a1e2bd817acf4d399e3a1c7216676aa3af4e34b6ecb
-  data.tar.gz: 83fbbcf7476f2ad62886b59b403b3056522a1f5459cf8dea4841eb34dc3e522778f9ee668e996c3b577683d32e0f5da410235517e6ce434128eba760f0c23818
+  metadata.gz: 5e9759155ce35d86bd96b058788b153544dff9aa73d08cfb4f742ddd5dc2871b4c4c8bc4e4799eb006b59e3e8bb99b89920b98a67698fd601d612793b2f68ec3
+  data.tar.gz: 0009517b20943ce01703c10210b925f3d687b16e471f7b57af1066bbdeb28e88f3f91937b00a4c4942167f2d7983d89b1621d10891f16962c644965dbf573fb8

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.3.6 (March 27, 2014)
+
+* Shorter token validation timeout
+* Allow validation to be skipped
+
+## 0.3.5 (March 26, 2014)
+
+* Update Rust component
+* Return true from Task#handle to avoid sutdown
+* Fix numeric check that caused crash on some 32-bit systems
+* Improve error message for missing Skylight ext
+* Better config error messages
+* Validate authentication token before starting
+* Add proxy support
+
+## 0.3.4 (March 13, 2014)
+
+* Don't try to boot Skylight without native agent
+* Make exception classes always available
+* CLI should require railtie before loading application.rb
+
 ## 0.3.3 (March 12, 2014)
 
 * Load the railtie even without native agent

data/ext/checksums.yml

@@ -1,3 +1,3 @@
 ---
-x86_64-linux: "4f0b9ef0d700d2da590ad0994c2067304a50d7b290f70353c394e4a040cdf0a5"
-i686-linux  : "9b7beebe61ef3201f4d7ad2cf5e92dc69cedefda033b9d081384c71700927a37"
+x86_64-linux: "98b04f7d73c1894cc79621a135b4598a679c421f5ff3eecc652f84ba07258d9c"
+i686-linux  : "1d4bbd58e319237b18752607d087ce0c895fe99c58482e994abe62a9f07d41dd"

data/ext/extconf.rb

@@ -9,7 +9,7 @@ require_relative '../lib/skylight/version.rb'
 
 checksums = YAML.load_file("checksums.yml")
 
-rust_version = "dc29745"
+rust_version = "74fb9b3"
 
 arch = RbConfig::CONFIG["arch"]
 

data/ext/skylight_native.c

@@ -26,7 +26,9 @@
   } while(0)                                      \
 
 #define CHECK_NUMERIC(VAL)                        \
-  CHECK(VAL, #VAL " is not numeric")              \
+  CHECK(TYPE(VAL) == T_BIGNUM ||                  \
+      TYPE(VAL) == T_FIXNUM,                      \
+      #VAL " is not numeric")                     \
 
 #define My_Struct(name, Type, msg)                \
   Get_Struct(name, self, Type, msg);              \
@@ -109,7 +111,7 @@ bool skylight_high_res_time(uint64_t*);
 bool skylight_trace_new(uint64_t, RustSlice, RustTrace*);
 bool skylight_trace_free(RustTrace);
 bool skylight_trace_load(RustSlice, RustTrace*);
-bool skylight_trace_name_from_serialized_into_new_buffer(RustSlice, RustSlice*);
+bool skylight_trace_name_from_serialized_into_new_buffer(RustSlice, RustString*);
 bool skylight_trace_get_started_at(RustTrace, uint64_t*);
 bool skylight_trace_set_name(RustTrace, RustSlice);
 bool skylight_trace_get_name(RustTrace, RustSlice*);
@@ -344,7 +346,7 @@ static VALUE error_serialize(VALUE self) {
 static const char* freedTrace = "You can't do anything with a Trace once it's been serialized or moved into a Batch";
 
 static VALUE trace_new(VALUE self, VALUE started_at, VALUE uuid) {
-  CHECK_TYPE(started_at, T_FIXNUM);
+  CHECK_NUMERIC(started_at);
   CHECK_TYPE(uuid, T_STRING);
 
   RustTrace trace;
@@ -367,11 +369,13 @@ static VALUE trace_load(VALUE self, VALUE protobuf) {
 static VALUE trace_name_from_serialized(VALUE self, VALUE protobuf) {
   CHECK_TYPE(protobuf, T_STRING);
 
-  RustSlice trace_name;
+  RustString trace_name;
 
   CHECK_FFI(skylight_trace_name_from_serialized_into_new_buffer(STR2SLICE(protobuf), &trace_name), "Could not read name from serialized Trace");
 
-  return SLICE2STR(trace_name);
+  VALUE ret = VEC2STR(trace_name);
+  skylight_free_buf(trace_name);
+  return ret;
 }
 
 static VALUE trace_get_started_at(VALUE self) {
@@ -522,7 +526,7 @@ VALUE batch_new(VALUE klass, VALUE rb_timestamp, VALUE rb_hostname) {
   CHECK_NUMERIC(rb_timestamp);
 
   RustString hostname = NULL;
-  uint32_t timestamp = NUM2ULONG(rb_timestamp);
+  uint32_t timestamp = (uint32_t) NUM2ULONG(rb_timestamp);
 
   if (rb_hostname != Qnil) {
     CHECK_TYPE(rb_hostname, T_STRING);

data/lib/skylight.rb

@@ -9,7 +9,13 @@ begin
     has_native_ext = true
   end
 rescue LoadError
-  puts "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension wasn't found. Skylight is not running."
+  if defined?(Rails) && !Rails.env.development? && !Rails.env.test?
+    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."
+  elsif defined?(Rails)
+    puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in #{Rails.env} mode. No data will be reported until you deploy your app."
+  else
+    puts "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in development mode."
+  end
   raise if ENV.key?("SKYLIGHT_REQUIRED")
 end
 
@@ -26,6 +32,13 @@ module Skylight
     autoload :HTTP,          'skylight/util/http'
   end
 
+  # ==== Exceptions ====
+  class IpcProtoError    < RuntimeError; end
+  class WorkerStateError < RuntimeError; end
+  class ConfigError      < RuntimeError; end
+  class TraceError       < RuntimeError; end
+  class SerializeError   < RuntimeError; end
+
   if defined?(Rails)
     require 'skylight/railtie'
   end
@@ -37,6 +50,10 @@ module Skylight
   STANDALONE_ENV_KEY = 'SKYLIGHT_STANDALONE'.freeze
   STANDALONE_ENV_VAL = 'server'.freeze
 
+  def self.native?
+    true
+  end
+
   def self.daemon?
     ENV[STANDALONE_ENV_KEY] == STANDALONE_ENV_VAL
   end
@@ -73,13 +90,6 @@ module Skylight
     autoload :HTTP, 'skylight/formatters/http'
   end
 
-  # ==== Exceptions ====
-  class IpcProtoError    < RuntimeError; end
-  class WorkerStateError < RuntimeError; end
-  class ConfigError      < RuntimeError; end
-  class TraceError       < RuntimeError; end
-  class SerializeError   < RuntimeError; end
-
   TIERS = %w(
     api
     app
@@ -164,6 +174,10 @@ end
 else
 
 module Skylight
+  def self.native?
+    false
+  end
+
   def self.start!(*)
   end
 
@@ -186,4 +200,4 @@ module Skylight
   end
 end
 
-end
+end

data/lib/skylight/cli.rb

@@ -51,6 +51,14 @@ repository and deploy from there. You can learn more about the process at:
       @app_name ||=
         begin
           if File.exist?("config/application.rb")
+            # This looks like a Rails app, lets make sure we have the railtie loaded
+            # skylight.rb checks for Rails, but when running the CLI, Skylight loads before Rails does
+            begin
+              require "skylight/railtie"
+            rescue LoadError => e
+              error "Unable to load Railtie. Please notify support@skylight.io."
+            end
+
             require "./config/application"
             Rails.application.class.name.split("::").first.underscore.humanize
           else

data/lib/skylight/config.rb

@@ -25,6 +25,7 @@ module Skylight
       'APPLICATION'         => :'application',
       'AUTHENTICATION'      => :'authentication',
       'HOSTNAME'            => :'hostname',
+      'SKIP_VALIDATION'     => :'skip_validation',
       'AGENT_INTERVAL'      => :'agent.interval',
       'AGENT_KEEPALIVE'     => :'agent.keepalive',
       'AGENT_SAMPLE_SIZE'   => :'agent.sample',
@@ -70,7 +71,7 @@ module Skylight
       :'report.port'    => "skylight remote port" }
 
     VALIDATORS = {
-      :'agent.interval' => lambda { |v, c| Integer === v && v > 0 }
+      :'agent.interval' => [lambda { |v, c| Integer === v && v > 0 }, "must be an integer greater than 0"]
     }
 
     def self.load(path = nil, environment = nil, env = ENV)
@@ -151,7 +152,13 @@ module Skylight
       end
     end
 
+    def skip_validation?
+      !!get(:skip_validation)
+    end
+
     def validate!
+      return true if skip_validation?
+
       REQUIRED.each do |k, v|
         unless get(k)
           raise ConfigError, "#{v} required"
@@ -161,6 +168,23 @@ module Skylight
       true
     end
 
+    def validate_token
+      return :ok if skip_validation?
+
+      http_auth = Util::HTTP.new(self, :accounts)
+
+      res = http_auth.get("/agent/authenticate?hostname=#{URI.escape(self[:'hostname'])}")
+
+      case res.status
+      when 200...300
+        :ok
+      when 400...500
+        :invalid
+      else
+        :unknown
+      end
+    end
+
     def key?(key)
       key = key.to_sym
       @priority.key?(key) || @values.key?(key)
@@ -197,8 +221,12 @@ module Skylight
         k = key.to_sym
 
         if validator = VALIDATORS[k]
-          unless validator.call(val, self)
-            raise ConfigError, "invalid value for #{k} (#{val})"
+          blk, msg = validator
+
+          unless blk.call(val, self)
+            error_msg = "invalid value for #{k} (#{val})"
+            error_msg << ", #{msg}" if msg
+            raise ConfigError, error_msg
           end
         end
 

data/lib/skylight/instrumenter.rb

@@ -72,6 +72,16 @@ module Skylight
 
       t { "starting instrumenter" }
       @config.validate!
+
+      case @config.validate_token
+      when :ok
+        # Good to go
+      when :unknown
+        log_warn "unable to validate authentication token"
+      else
+        raise ConfigError, "authentication token is invalid"
+      end
+
       @config.gc.enable
       @worker.spawn
       @subscriber.register!

data/lib/skylight/probes.rb

@@ -1,5 +1,3 @@
-# skylight/probes.rb
-
 module Skylight
   module Probes
 

data/lib/skylight/railtie.rb

@@ -15,17 +15,19 @@ module Skylight
     config.skylight.probes = []
 
     initializer 'skylight.configure' do |app|
-      if activate?
-        load_probes
+      if Skylight.native?
+        if activate?
+          load_probes
 
-        if config = load_skylight_config(app)
-          Instrumenter.start!(config)
-          app.middleware.insert 0, Middleware
+          if config = load_skylight_config(app)
+            Instrumenter.start!(config)
+            app.middleware.insert 0, Middleware
 
-          puts "[SKYLIGHT] [#{Skylight::VERSION}] Skylight agent enabled"
+            puts "[SKYLIGHT] [#{Skylight::VERSION}] Skylight agent enabled"
+          end
+        elsif !Rails.env.test? && Rails.env.development?
+          puts "[SKYLIGHT] [#{Skylight::VERSION}] You are running in the #{Rails.env} environment but haven't added it to config.skylight.environments, so no data will be sent to skylight.io."
         end
-      elsif !Rails.env.test? && Rails.env.development?
-        puts "[SKYLIGHT] [#{Skylight::VERSION}] You are running in the #{Rails.env} environment but haven't added it to config.skylight.environments, so no data will be sent to skylight.io."
       end
     end
 

data/lib/skylight/util/http.rb

@@ -26,6 +26,10 @@ module Skylight
         @ssl  = config["#{service}.ssl"]
         @host = config["#{service}.host"]
         @port = config["#{service}.port"]
+        @proxy_addr = config["#{service}.proxy_addr"]
+        @proxy_port = config["#{service}.proxy_port"]
+        @proxy_user = config["#{service}.proxy_user"]
+        @proxy_pass = config["#{service}.proxy_pass"]
         @deflate = config["#{service}.deflate"]
         @authentication = config[:'authentication']
       end
@@ -87,7 +91,10 @@ module Skylight
           req.body = body
         end
 
-        http = Net::HTTP.new @host, @port
+        http = Net::HTTP.new(@host, @port, @proxy_addr, @proxy_port, @proxy_user, @proxy_pass)
+
+        # Default is 60, but that's also the Heroku boot timeout and we don't want to slow boot
+        http.read_timeout = 15
 
         if @ssl
           http.use_ssl = true

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.3.3'
+  VERSION = '0.3.6'
 end
 

data/lib/skylight/worker.rb

@@ -12,8 +12,5 @@ module Skylight
     autoload :Server,     'skylight/worker/server'
     autoload :Standalone, 'skylight/worker/standalone'
 
-    def self.spawn
-      Standalone.new
-    end
   end
 end

data/lib/skylight/worker/builder.rb

@@ -24,7 +24,7 @@ module Skylight
           trace "building standalone worker"
 
           unless config[:'agent.sockfile_path']
-            raise ArgumentError, 'agent.sockfile_path config required'
+            raise ConfigError, 'agent.sockfile_path required'
           end
 
           Standalone.new(
@@ -32,7 +32,8 @@ module Skylight
             lockfile,
             server)
         else
-          raise "unknown strategy: `#{s}`"
+          # We can assume that if it's unknown it's from the config
+          raise ConfigError, "unknown agent.strategy: `#{s}`"
         end
       end
 

data/lib/skylight/worker/collector.rb

@@ -40,7 +40,7 @@ module Skylight
             flush(@batch)
           else
             warn "do not have valid session token -- dropping"
-            return
+            return true
           end
 
           @batch = new_batch(now)

data/lib/skylight/worker/standalone.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'thread'
 require 'fileutils'
+require 'rbconfig'
 
 # TODO: Handle cool-off
 module Skylight
@@ -12,11 +13,29 @@ module Skylight
     class Standalone
       include Util::Logging
 
-      SUBPROCESS_CMD = [
-        RUBYBIN,
-        '-I', File.expand_path('../../..', __FILE__),
-        File.expand_path('../../../skylight.rb', __FILE__) ]
+      # Locates skylight_native so that it can be included in the standalone agent startup command
+      def self.locate_skylight_native
+        $LOADED_FEATURES.each do |feature|
+          return feature if feature =~ /skylight_native\.#{RbConfig::CONFIG['DLEXT']}/
+        end
+      end
+
+      def self.build_subprocess_cmd
+        paths = [
+          File.expand_path('../../..', __FILE__), # Ruby code root
+          File.dirname(locate_skylight_native)    # Native extension location
+        ].uniq.compact
+
+        ret = [ RUBYBIN ]
+        paths.each { |path| ret << "-I" << path }
+        ret << File.expand_path('../../../skylight.rb', __FILE__) # The agent startup script
+        ret
+      end
+
+      # Used to start the standalone agent as well as included in the hello message
+      SUBPROCESS_CMD = build_subprocess_cmd
 
+      # Used to handle starting the thread
       LOCK = Mutex.new
 
       attr_reader \
@@ -172,8 +191,10 @@ module Skylight
           trace "shuting down agent connection"
           @sock.close if @sock
           @pid = nil
+
+          return false
         elsif msg
-          handle(msg)
+          return handle(msg)
         else
           begin
             @sock.read_nonblock(1)
@@ -185,11 +206,11 @@ module Skylight
             end
           end
 
-          true
+          return true
         end
       rescue WorkerStateError => e
         error "skylight shutting down: %s", e.message
-        false
+        return false
       end
 
       def handle(msg)
@@ -299,6 +320,7 @@ module Skylight
           sf = sockfile(pid)
           File.unlink(sf) rescue nil
 
+          t { fmt "opening a new socket; %s", sf }
           srv = UNIXServer.new(sf)
 
           unless ENV[TRACE_ENV_KEY]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.6
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport