skylight 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50dca195fb184ee57a9d9b29ba2a9473daa64bc5
-  data.tar.gz: dea9d586b2cadeb1be320d5975e26c04bed90f9e
+  metadata.gz: 7e55c1c2dc7308e528ed6b70c50bc46ded112deb
+  data.tar.gz: b1cfa59af5c1b1b1c453c6cccefc8d3f7d83a031
 SHA512:
-  metadata.gz: be4c0252b7a8219326bba924ef9b51ae1c799ed438f56d5f21953904f64d1a88cc304f318a0326995781367c037f9bea605c428f1c2b9643e0e473b9e3c9b6a0
-  data.tar.gz: 6e22e9b8839fd0c717676b342aa405ca678378ae365576a7a84d8eb8a3df7bce89e3caac577dfc05884bf6e3b09ac33c6c97fd944051f70a11c1cf7cca365bf3
+  metadata.gz: 902ff0813ae73c280619f70728b2669cb17bb249abab8e5f7508893d81f9cd1ab25b2d6b9d4a4203080175934c63d8a48f37fe3199d8df384269d7fc7cf590ba
+  data.tar.gz: be41caa2f4ad1c66bfb779c1d0b851cc21388d63a17153b4c3c5c2ac216209d72b302b5e7d114a3df7968041592cdb392b87f2bc389083cb2115e4757921b2b2

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.3.13 (May 12, 2014)
+
+* Load probes even when agent is disabled
+* Check for Excon::Middlewares before installing the probe
+* SQL error encoder should not operate in-place
+* Fix Middleware
+* More debug logging
+* Log Rails version in MetricsReporter
+* Handle missing Net::ReadTimeout in 1.9.3
+* Include original exception information in sql_parse errors
+* Debugging for failed application creation
+* Make double sure that Trace started_at is an Integer
+
 ## 0.3.12 (April 17, 2014)
 
 * Include more information in type check errors

data/lib/skylight/api.rb

@@ -26,6 +26,7 @@ module Skylight
 
     def create_app(name)
       res = @http.post('/apps', { app: { name: name }})
+      puts "POST /apps: #{res.inspect}" if ENV['DEBUG']
       res if res.success?
     end
 

data/lib/skylight/instrumenter.rb

@@ -1,6 +1,4 @@
 require 'thread'
-require 'set'
-require 'base64'
 require 'strscan'
 
 module Skylight
@@ -42,6 +40,9 @@ module Skylight
     def self.stop!
       LOCK.synchronize do
         return unless @instance
+        # This is only really helpful for getting specs to pass.
+        @instance.current_trace = nil
+
         @instance.shutdown
         @instance = nil
       end
@@ -120,6 +121,8 @@ module Skylight
         return trace
       end
 
+      t { "starting trace" }
+
       begin
         trace = Messages::Trace::Builder.new(self, endpoint, Util::Clock.nanos, cat, title, desc, annot)
       rescue Exception => e

data/lib/skylight/messages/trace.rb

@@ -76,6 +76,8 @@ module Skylight
         end
 
         def instrument(cat, title=nil, desc=nil, annot=nil)
+          t { "instrument: #{cat}, #{title}" }
+
           if Hash === title
             annot = title
             title = desc = nil
@@ -123,7 +125,12 @@ module Skylight
         end
 
         def submit
-          return if @submitted
+          t { "submitting trace" }
+
+          if @submitted
+            t { "already submitted" }
+            return
+          end
 
           release
           @submitted = true
@@ -148,7 +155,9 @@ module Skylight
         end
 
         def normalize_time(time)
-          time.to_i / 100_000
+          # At least one customer has extensions that cause integer division to produce rationals.
+          # Since the native code expects an integer, we force it again.
+          (time.to_i / 100_000).to_i
         end
 
         def span(time, cat, title=nil, desc=nil, annot=nil)

data/lib/skylight/middleware.rb

@@ -40,20 +40,29 @@ module Skylight
       end
     end
 
-    def initialize(app)
+    include Util::Logging
+
+    # For Util::Logging
+    attr_reader :config
+
+    def initialize(app, opts={})
       @app = app
+      @config = opts[:config]
     end
 
     def call(env)
       begin
+        t { "middleware beginning trace" }
         trace = Skylight.trace "Rack", 'app.rack.request'
         resp = @app.call(env)
         resp[2] = BodyProxy.new(resp[2]) { trace.submit } if trace
         resp
       rescue Exception
+        t { "middleware exception: #{trace}"}
         trace.submit if trace
         raise
       ensure
+        t { "middleware release: #{trace}"}
         trace.release if trace
       end
     end

data/lib/skylight/normalizers/sql.rb

@@ -48,6 +48,10 @@ module Skylight
         group = "sql_parse"
         description = e.inspect
         details = encode(backtrace: e.backtrace,
+                          original_exception: {
+                            class_name: e.class.name,
+                            message: e.message
+                          },
                           payload: payload,
                           precalculated: precalculated)
 
@@ -55,11 +59,15 @@ module Skylight
         [ nil, nil, nil, error ]
       end
 
+      # While operating in place would save memory, some of these passed in items are re-used elsewhere
+      # and, as such, should not be modified.
       def encode(body)
         if body.is_a?(Hash)
-          body.each{|k,v| body[k] = encode(v) }
+          hash = {}
+          body.each{|k,v| hash[k] = encode(v) }
+          hash
         elsif body.is_a?(Array)
-          body.each_with_index{|v,i| body[i] = encode(v) }
+          body.map{|v| encode(v) }
         elsif body.respond_to?(:encoding) && (body.encoding == Encoding::BINARY || !body.valid_encoding?)
           Base64.encode64(body)
         else

data/lib/skylight/probes/excon.rb

@@ -3,13 +3,18 @@ module Skylight
     module Excon
       class Probe
         def install
-          # Don't require until installation since it depends on Excon being loaded
-          require 'skylight/probes/excon/middleware'
+          if defined?(::Excon::Middleware)
+            # Don't require until installation since it depends on Excon being loaded
+            require 'skylight/probes/excon/middleware'
 
-          idx = ::Excon.defaults[:middlewares].index(::Excon::Middleware::Instrumentor)
+            idx = ::Excon.defaults[:middlewares].index(::Excon::Middleware::Instrumentor)
 
-          # TODO: Handle possibility of idx being nil
-          ::Excon.defaults[:middlewares].insert(idx, Skylight::Probes::Excon::Middleware)
+            # TODO: Handle possibility of idx being nil
+            ::Excon.defaults[:middlewares].insert(idx, Skylight::Probes::Excon::Middleware)
+          else
+            puts "[SKYLIGHT] [#{Skylight::VERSION}] The installed version of Excon doesn't " \
+                    "support Middlewares. The Excon probe will be disabled."
+          end
         end
       end
     end

data/lib/skylight/probes/excon/middleware.rb

@@ -3,6 +3,7 @@ module Skylight
     module Excon
       class Middleware < ::Excon::Middleware::Base
 
+        # This probably won't work since config isn't defined
         include Util::Logging
 
         def initialize(*)

data/lib/skylight/railtie.rb

@@ -16,12 +16,13 @@ module Skylight
     config.skylight.probes = []
 
     initializer 'skylight.configure' do |app|
-      if activate?
-        load_probes
+      # Load probes even when agent is inactive to catch probe related bugs sooner
+      load_probes
 
+      if activate?
         if config = load_skylight_config(app)
           if Instrumenter.start!(config)
-            app.middleware.insert 0, Middleware
+            app.middleware.insert 0, Middleware, config: config
             puts "[SKYLIGHT] [#{Skylight::VERSION}] Skylight agent enabled"
           end
         end

data/lib/skylight/util/http.rb

@@ -22,6 +22,11 @@ module Skylight
       attr_accessor :authentication
       attr_reader :host, :port
 
+      READ_EXCEPTIONS = [Timeout::Error, EOFError]
+      # This doesn't exist on Ruby 1.9.3
+      READ_EXCEPTIONS << Net::ReadTimeout if defined?(Net::ReadTimeout)
+      READ_EXCEPTIONS.freeze
+
       class StartError < StandardError; end
       class ReadResponseError < StandardError; end
 
@@ -108,7 +113,7 @@ module Skylight
 
         begin
           res = client.request(req)
-        rescue Net::ReadTimeout, Timeout::Error, EOFError => e
+        rescue *READ_EXCEPTIONS => e
           raise ReadResponseError, e.inspect
         end
 

data/lib/skylight/util/task.rb

@@ -5,6 +5,7 @@ module Skylight
     class Task
       SHUTDOWN = :__SK_TASK_SHUTDOWN
 
+      # Requires the subclass to define `config`
       include Util::Logging
 
       attr_reader :queue_depth_metric

data/lib/skylight/version.rb

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

data/lib/skylight/worker/metrics_reporter.rb

@@ -54,6 +54,7 @@ module Skylight
           "host.info"          => RbConfig::CONFIG['arch'],
           "ruby.version"       => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
           "ruby.engine"        => RUBY_ENGINE,
+          "rails.version"      => defined?(Rails) ? Rails.version : nil,
           "skylight.version"   => Skylight::VERSION
         }
 

data/lib/skylight/worker/standalone.rb

@@ -90,7 +90,10 @@ module Skylight
           raise ArgumentError, "message not encodable"
         end
 
-        return unless @pid
+        unless @pid
+          t { "no pid, can't submit: #{msg.inspect}" }
+          return
+        end
 
         if @me != Process.pid
           handle_fork

metadata

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