skylight 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7ee3852dc0f4d87a9d974aeade1100cde21613
-  data.tar.gz: 4101c8d467fbbd2c5fccb0124a02b2cf0634232d
+  metadata.gz: 50dca195fb184ee57a9d9b29ba2a9473daa64bc5
+  data.tar.gz: dea9d586b2cadeb1be320d5975e26c04bed90f9e
 SHA512:
-  metadata.gz: df39f86e95a05dc50973fc6a0ceda455eec6ffb9ca77bc19a3a8726e9099349303905eb282e845886aa220ff88da413d516754215234cb5194b274b60a4f5bb9
-  data.tar.gz: c54def8443d4ebc20d576ad38891acf1b58252fd62d34534e3c905385474bd1b759794f4fc55097c60be47e5b8397fb319808618d7ad091014a7aeea0a10a1bf
+  metadata.gz: be4c0252b7a8219326bba924ef9b51ae1c799ed438f56d5f21953904f64d1a88cc304f318a0326995781367c037f9bea605c428f1c2b9643e0e473b9e3c9b6a0
+  data.tar.gz: 6e22e9b8839fd0c717676b342aa405ca678378ae365576a7a84d8eb8a3df7bce89e3caac577dfc05884bf6e3b09ac33c6c97fd944051f70a11c1cf7cca365bf3

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.3.12 (April 17, 2014)
+
+* Include more information in type check errors
+* Use stdlib SecureRandom instead of ActiveSupport::SecureRandom - Fixes Rails 3.1
+* Instrumenter#start! should fail if worker not spawned
+* Configurable timeouts for Util::HTTP
+* Improve proxy handling for Util::HTTP
+* Improve HTTP error handling
+* Refactor sql_parse errors
+
 ## 0.3.11 (April 11, 2014)
 
 * Improved error handling and internal metrics

data/README.md

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

data/ext/skylight_native.c

@@ -9,27 +9,28 @@
  * Ruby helpers
  */
 
+#define TO_S(VAL) \
+  RSTRING_PTR(rb_funcall(VAL, rb_intern("to_s"), 0))
+
 #define CHECK_TYPE(VAL, T)                        \
   do {                                            \
     if (TYPE(VAL) != T) {                         \
-      rb_raise(rb_eArgError, #VAL " is not " #T); \
+      rb_raise(rb_eArgError, "expected " #VAL " to be " #T " but was '%s' (%s [%i])", \
+                TO_S(VAL), rb_obj_classname(VAL), TYPE(VAL)); \
       return Qnil;                                \
     }                                             \
   } while(0)                                      \
 
-#define CHECK(EXPR, string)                       \
+#define CHECK_NUMERIC(VAL)                        \
   do {                                            \
-    if (!({ EXPR; })) {                           \
-      rb_raise(rb_eArgError, string);             \
+    if (TYPE(VAL) != T_BIGNUM &&                  \
+        TYPE(VAL) != T_FIXNUM) {                  \
+      rb_raise(rb_eArgError, "expected " #VAL " to be numeric but was '%s' (%s [%i])", \
+                TO_S(VAL), rb_obj_classname(VAL), TYPE(VAL)); \
       return Qnil;                                \
     }                                             \
   } while(0)                                      \
 
-#define CHECK_NUMERIC(VAL)                        \
-  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);              \
 

data/lib/skylight/cli.rb

@@ -31,7 +31,7 @@ module Skylight
       say "Congratulations. Your application is on Skylight! http://www.skylight.io", :green
       say <<-OUT
 
-The application was registered for you and we generated an config file
+The application was registered for you and we generated a config file
 containing your API token at:
 
   #{relative_config_path}

data/lib/skylight/config.rb

@@ -37,10 +37,18 @@ module Skylight
       'REPORT_PORT'             => :'report.port',
       'REPORT_SSL'              => :'report.ssl',
       'REPORT_DEFLATE'          => :'report.deflate',
+      'REPORT_PROXY_ADDR'       => :'report.proxy_addr',
+      'REPORT_PROXY_PORT'       => :'report.proxy_port',
+      'REPORT_PROXY_USER'       => :'report.proxy_user',
+      'REPORT_PROXY_PASS'       => :'report.proxy_user',
       'ACCOUNTS_HOST'           => :'accounts.host',
       'ACCOUNTS_PORT'           => :'accounts.port',
       'ACCOUNTS_SSL'            => :'accounts.ssl',
       'ACCOUNTS_DEFLATE'        => :'accounts.deflate',
+      'ACCOUNTS_PROXY_ADDR'     => :'accounts.proxy_addr',
+      'ACCOUNTS_PROXY_PORT'     => :'accounts.proxy_port',
+      'ACCOUNTS_PROXY_USER'     => :'accounts.proxy_user',
+      'ACCOUNTS_PROXY_PASS'     => :'accounts.proxy_user',
       'ME_AUTHENTICATION'       => :'me.authentication',
       'ME_CREDENTIALS_PATH'     => :'me.credentials_path',
       'METRICS_REPORT_INTERVAL' => :'metrics.report_interval',
@@ -181,7 +189,7 @@ module Skylight
     def validate_token
       return :ok if skip_validation?
 
-      http_auth = Util::HTTP.new(self, :accounts)
+      http_auth = Util::HTTP.new(self, :accounts, timeout: 5)
 
       res = http_auth.get("/agent/authenticate?hostname=#{URI.escape(self[:'hostname'])}")
 
@@ -285,7 +293,7 @@ authentication: #{self[:authentication]}
 
     # @api private
     def worker
-      Worker::Builder.new(self)
+      @worker ||= Worker::Builder.new(self)
     end
 
     # @api private

data/lib/skylight/instrumenter.rb

@@ -92,7 +92,12 @@ module Skylight
       end
 
       @config.gc.enable
-      @worker.spawn
+
+      unless @worker.spawn
+        log_error "failed to spawn worker"
+        return nil
+      end
+
       @subscriber.register!
 
       self

data/lib/skylight/normalizers/sql.rb

@@ -44,8 +44,14 @@ module Skylight
       def extract_binds(payload, precalculated)
         title, sql, binds = SqlLexer::Lexer.bindify(payload[:sql], precalculated)
         [ title, sql, binds, nil ]
-      rescue
-        error = ["sql_parse", encode(payload[:sql]), encode(payload: payload, precalculated: precalculated)]
+      rescue => e
+        group = "sql_parse"
+        description = e.inspect
+        details = encode(backtrace: e.backtrace,
+                          payload: payload,
+                          precalculated: precalculated)
+
+        error = [group, description, details]
         [ nil, nil, nil, error ]
       end
 

data/lib/skylight/util/http.rb

@@ -19,21 +19,33 @@ module Skylight
 
       include Logging
 
-      attr_accessor :authentication, :config
+      attr_accessor :authentication
       attr_reader :host, :port
 
       class StartError < StandardError; end
       class ReadResponseError < StandardError; end
 
-      def initialize(config, service = :report)
+      def initialize(config, service = :report, opts = {})
         @config = config
         @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"]
+
+        @timeout = opts[:timeout] || 15
+
+        unless @proxy_addr
+          if http_proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
+            uri = URI.parse(http_proxy)
+            @proxy_addr, @proxy_port = uri.host, uri.port
+            @proxy_user, @proxy_pass = (uri.userinfo || '').split(/:/)
+          end
+        end
+
         @deflate = config["#{service}.deflate"]
         @authentication = config[:'authentication']
       end
@@ -86,7 +98,7 @@ module Skylight
         type.new(endpoint, headers)
       end
 
-      def start(http)
+      def do_request(http, req)
         begin
           client = http.start
         rescue => e
@@ -94,17 +106,17 @@ module Skylight
           raise StartError, e.inspect
         end
 
-        yield client
+        begin
+          res = client.request(req)
+        rescue Net::ReadTimeout, Timeout::Error, EOFError => e
+          raise ReadResponseError, e.inspect
+        end
+
+        yield res
       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 }
@@ -116,9 +128,8 @@ module Skylight
 
         http = Net::HTTP.new(@host, @port, @proxy_addr, @proxy_port, @proxy_user, @proxy_pass)
 
-        # Default is 60, but we don't want to wait that long.
-        # This path is also used on app boot and Heroku will timeout at 60
-        http.read_timeout = 15
+        http.open_timeout = @timeout
+        http.read_timeout = @timeout
 
         if @ssl
           http.use_ssl = true
@@ -126,16 +137,13 @@ module Skylight
           http.verify_mode = OpenSSL::SSL::VERIFY_PEER
         end
 
-        start(http) do |client|
-          res = client.request(req)
-          code, body = read_code_and_body(res)
-
-          unless code =~ /2\d\d/
-            debug "server responded with #{code}"
-            t { fmt "body=%s", body }
+        do_request(http, req) do |res|
+          unless res.code =~ /2\d\d/
+            debug "server responded with #{res.code}"
+            t { fmt "body=%s", res.body }
           end
 
-          Response.new(code.to_i, res, body)
+          Response.new(res.code.to_i, res, 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/vendor/active_support/notifications/instrumenter.rb

@@ -39,7 +39,7 @@ module ActiveSupport
       private
 
       def unique_id
-        SecureRandom.hex(10)
+        ::SecureRandom.hex(10)
       end
     end
 

data/lib/skylight/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport