skylight 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70cfda4f0d6f3ed1a3870e7ed3929d61ee521ca9
-  data.tar.gz: f6ce5f583badc9507760a67ec1f63d230829ed2d
+  metadata.gz: f501ad269f116e66053195e765359bb141347b0d
+  data.tar.gz: 933730962fe952b6928ce50af200825b60cc11fc
 SHA512:
-  metadata.gz: 5ff9460df31d98b29318ceaa1cb9e3236859c6d74a3d043c5dcba5f3cf305b2b443938be75eb18f4c033ed26261a9cbec7da62a301bd48f1d89f876141ececf1
-  data.tar.gz: bd9c7bb73e53df7db59daa9124b8c5174a40890acd64bf6090ae6429e5ac612de1f95f1c95f7f3c333e0839e3f2ac53f16833724472782c97c7fd69673d51909
+  metadata.gz: 9d40ae02fb550a5fc409079b97d4087006610868589e2254013995df7d0d05e02f125a342258ff2e62747b58c7cdc5f6e4db1485af7bdafebee7659e446968e4
+  data.tar.gz: 6d31c629aee42b171e82c06bd5fa70cc3bc91ee09c346f9a0db91ad54df4c9ea67fe36f635f8f413789c45eee0714f95115ea08e4b0417f4d58c567257980577

data/lib/skylight/cli.rb

@@ -83,8 +83,7 @@ module Skylight
     end
 
     def credentials_path
-      return nil unless ENV['HOME']
-      File.expand_path(".skylight", ENV['HOME'])
+      File.expand_path(config[:'me.credentials_path'])
     end
 
     def api

data/lib/skylight/config.rb

@@ -22,23 +22,26 @@ module Skylight
       'SK_ACCOUNTS_HOST'       => :'accounts.host',
       'SK_ACCOUNTS_PORT'       => :'accounts.port',
       'SK_ACCOUNTS_SSL'        => :'accounts.ssl',
-      'SK_ACCOUNTS_DEFLATE'    => :'accounts.deflate' }
+      'SK_ACCOUNTS_DEFLATE'    => :'accounts.deflate',
+      'SK_ME_AUTHENTICATION'   => :'me.authentication',
+      'SK_ME_CREDENTIALS_PATH' => :'me.credentials_path' }
 
     # Default values for Skylight configuration keys
     DEFAULTS = {
-      :'log'              => '-'.freeze,
-      :'log_level'        => 'INFO'.freeze,
-      :'agent.keepalive'  => 60,
-      :'agent.interval'   => 5,
-      :'agent.sample'     => 200,
-      :'report.host'      => 'agent.skylight.io'.freeze,
-      :'report.port'      => 443,
-      :'report.ssl'       => true,
-      :'report.deflate'   => true,
-      :'accounts.host'    => 'www.skylight.io'.freeze,
-      :'accounts.port'    => 443,
-      :'accounts.ssl'     => true,
-      :'accounts.deflate' => false }.freeze
+      :'log'                 => '-'.freeze,
+      :'log_level'           => 'INFO'.freeze,
+      :'agent.keepalive'     => 60,
+      :'agent.interval'      => 5,
+      :'agent.sample'        => 200,
+      :'report.host'         => 'agent.skylight.io'.freeze,
+      :'report.port'         => 443,
+      :'report.ssl'          => true,
+      :'report.deflate'      => true,
+      :'accounts.host'       => 'www.skylight.io'.freeze,
+      :'accounts.port'       => 443,
+      :'accounts.ssl'        => true,
+      :'accounts.deflate'    => false,
+      :'me.credentials_path' => '~/.skylight' }.freeze
 
     REQUIRED = {
       :'authentication' => "authentication token",
@@ -224,7 +227,7 @@ authentication: #{self[:authentication]}
     end
 
     def gc
-      GC.new(get('gc.profiler', ::GC::Profiler))
+      @gc ||= GC.new(self, get('gc.profiler', ::GC::Profiler))
     end
 
     def logger

data/lib/skylight/gc.rb

@@ -2,9 +2,11 @@ require 'thread'
 
 module Skylight
   class GC
-    METHODS = [ :enable, :total_time ]
+    METHODS = [ :enable, :total_time, :clear ]
     TH_KEY  = :SK_GC_CURR_WINDOW
 
+    include Util::Logging
+
     def self.update
       if win = Thread.current[TH_KEY]
         win.update
@@ -19,15 +21,24 @@ module Skylight
       end
     end
 
-    def initialize(profiler)
+    attr_reader :config
+
+    def initialize(config, profiler)
       @listeners = []
+      @config    = config
       @lock      = Mutex.new
 
       if METHODS.all? { |m| profiler.respond_to?(m) }
         @profiler = profiler
+      else
+        debug "disabling GC profiling"
       end
     end
 
+    def enable
+      @profiler.enable if @profiler
+    end
+
     def start_track
       return if Thread.current[TH_KEY]
 

data/lib/skylight/instrumenter.rb

@@ -45,6 +45,7 @@ module Skylight
 
         t { "starting instrumenter" }
         @config.validate!
+        @config.gc.enable
         @worker.spawn
         @subscriber.register!
 
@@ -91,7 +92,7 @@ module Skylight
         begin
           built = trace.build
 
-          if built.valid?
+          if built && built.valid?
             process(built)
           else
             debug "trace invalid -- dropping"

data/lib/skylight/messages/trace.rb

@@ -21,6 +21,7 @@ module Skylight
 
         def initialize(endpoint = "Unknown", start = Util::Clock.now, config = nil)
           @endpoint = endpoint
+          @busted   = false
           @config   = config
           @start    = start
           @spans    = []
@@ -42,15 +43,19 @@ module Skylight
             begin
               yield
             ensure
-              now = Util::Clock.now
-              gc_time = GC.time
+              unless @busted
+                now = Util::Clock.now
+
+                GC.update
+                gc_time = GC.time
+
+                if gc_time > 0
+                  start(now - gc_time, 'noise.gc')
+                  stop(now)
+                end
 
-              if gc_time > 0
-                start(now - gc_time, 'noise.gc')
                 stop(now)
               end
-
-              stop(now)
             end
           ensure
             gc.stop_track
@@ -58,6 +63,8 @@ module Skylight
         end
 
         def record(time, cat, title = nil, desc = nil, annot = {})
+          return if @busted
+
           sp = span(time, cat, title, desc, annot)
 
           return self if :skip == sp
@@ -69,6 +76,8 @@ module Skylight
         end
 
         def start(time, cat, title = nil, desc = nil, annot = {})
+          return if @busted
+
           sp = span(time, cat, title, desc, annot)
 
           push(sp)
@@ -77,6 +86,8 @@ module Skylight
         end
 
         def stop(time)
+          return if @busted
+
           sp = pop
 
           return self if :skip == sp
@@ -88,6 +99,7 @@ module Skylight
         end
 
         def build
+          return if @busted
           raise TraceError, "trace unbalanced" unless @stack.empty?
 
           Trace.new(
@@ -106,6 +118,12 @@ module Skylight
           sp.annotations   = to_annotations(annot)
           sp.started_at    = relativize(time)
           sp.absolute_time = time
+
+          if sp.started_at < 0
+            @busted = true
+            raise TraceError, "[BUG] span started_at negative; event=#{cat}"
+          end
+
           sp
         end
 
@@ -130,6 +148,7 @@ module Skylight
 
         def pop
           unless sp = @stack.pop
+            @busted = true
             raise TraceError, "trace unbalanced"
           end
 

data/lib/skylight/subscriber.rb

@@ -1,19 +1,23 @@
 module Skylight
   class Subscriber
+    include Util::Logging
 
     attr_reader :config
 
     def initialize(config)
-      @config = config
+      @config      = config
+      @subscriber  = nil
       @normalizers = Normalizers.build(config)
     end
 
     def register!
-      ActiveSupport::Notifications.subscribe nil, self
+      unregister! if @subscriber
+      @subscriber = ActiveSupport::Notifications.subscribe nil, self
     end
 
     def unregister!
-      ActiveSupport::Notifications.unsubscribe self
+      ActiveSupport::Notifications.unsubscribe @subscriber
+      @subscriber = nil
     end
 
     def start(name, id, payload)
@@ -23,11 +27,15 @@ module Skylight
       trace.start(now - gc_time, cat, title, desc, annot)
 
       trace
+    rescue Exception => e
+      error "Subscriber#start error; msg=%s", e.message
     end
 
     def finish(name, id, payload)
       return unless trace = Instrumenter.current_trace
       trace.stop(now - gc_time)
+    rescue Exception => e
+      error "Subscriber#finish error; msg=%s", e.message
     end
 
     def publish(name, *args)

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport