skylight 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f501ad269f116e66053195e765359bb141347b0d
-  data.tar.gz: 933730962fe952b6928ce50af200825b60cc11fc
+  metadata.gz: 560f8a033762d7bf39d090b9aefed3b9c754c7dd
+  data.tar.gz: 5c1628596dcf13425d22c8a9a9ec4974f2179d00
 SHA512:
-  metadata.gz: 9d40ae02fb550a5fc409079b97d4087006610868589e2254013995df7d0d05e02f125a342258ff2e62747b58c7cdc5f6e4db1485af7bdafebee7659e446968e4
-  data.tar.gz: 6d31c629aee42b171e82c06bd5fa70cc3bc91ee09c346f9a0db91ad54df4c9ea67fe36f635f8f413789c45eee0714f95115ea08e4b0417f4d58c567257980577
+  metadata.gz: 9a2bac2b3dadfcc72088c27be115ba207f5b5e1da7b59d979c2f76b8ce1d35c978e2b1bbc457c557a93070d46d3b3d1e8a0777d94a5d621917a3fc4e006e587c
+  data.tar.gz: 5060b3d9efc2a6ea197eece768f5c28481eb6716d9f8a2230607c429d88ae8509bbb5dbcace6c183e79f227f0951a737722b331b8afdd1abe05197072b62e9fd

data/lib/skylight.rb

@@ -14,6 +14,9 @@ module Skylight
   unless daemon?
     require 'active_support/notifications'
     require 'skylight/compat' # Require after AS::N
+
+    # Require VM specific things
+    require 'skylight/vm/gc'
   end
 
   autoload :Api,          'skylight/api'

data/lib/skylight/config.rb

@@ -227,7 +227,7 @@ authentication: #{self[:authentication]}
     end
 
     def gc
-      @gc ||= GC.new(self, get('gc.profiler', ::GC::Profiler))
+      @gc ||= GC.new(self, get('gc.profiler', VM::GC.new))
     end
 
     def logger

data/lib/skylight/gc.rb

@@ -2,7 +2,7 @@ require 'thread'
 
 module Skylight
   class GC
-    METHODS = [ :enable, :total_time, :clear ]
+    METHODS = [ :enable, :total_time ]
     TH_KEY  = :SK_GC_CURR_WINDOW
 
     include Util::Logging
@@ -27,9 +27,11 @@ module Skylight
       @listeners = []
       @config    = config
       @lock      = Mutex.new
+      @time      = 0.0
 
       if METHODS.all? { |m| profiler.respond_to?(m) }
         @profiler = profiler
+        @time = @profiler.total_time
       else
         debug "disabling GC profiling"
       end
@@ -48,6 +50,7 @@ module Skylight
         win = Window.new(self)
 
         @lock.synchronize do
+          __update
           @listeners << win
         end
       end
@@ -82,19 +85,26 @@ module Skylight
 
     def update
       @lock.synchronize do
-        time = @profiler.total_time
-
-        if time > 0
-          @profiler.clear
-          @listeners.each do |l|
-            l.add(time)
-          end
-        end
+        __update
       end
 
       nil
     end
 
+  private
+
+    def __update
+      time  = @profiler.total_time
+      diff  = time - @time
+      @time = time
+
+      if diff > 0.0
+        @listeners.each do |l|
+          l.add(diff)
+        end
+      end
+    end
+
     class Window
       attr_reader :time
 

data/lib/skylight/instrumenter.rb

@@ -95,7 +95,13 @@ module Skylight
           if built && built.valid?
             process(built)
           else
-            debug "trace invalid -- dropping"
+            if built && built.spans.empty?
+              debug "trace invalid -- dropping; spans=0"
+            elsif built
+              debug "trace invalid -- dropping; spans=%d; started_at=%d", built.spans, built.spans[-1].started_at
+            else
+              debug "trace invalid -- dropping; trace=nil"
+            end
           end
         rescue Exception => e
           error e

data/lib/skylight/messages/trace.rb

@@ -121,7 +121,9 @@ module Skylight
 
           if sp.started_at < 0
             @busted = true
-            raise TraceError, "[BUG] span started_at negative; event=#{cat}"
+            raise TraceError, "[BUG] span started_at negative; event=#{cat};" \
+              " started_at=#{sp.started_at};" \
+              " duration=#{sp.duration}"
           end
 
           sp

data/lib/skylight/version.rb

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

data/lib/skylight/vm/gc.rb

@@ -0,0 +1,68 @@
+
+module Skylight
+  module VM
+    if defined?(JRUBY_VERSION)
+
+      # This doesn't quite work as we would like it. I believe that the GC
+      # statistics includes time that is not stop-the-world, this does not
+      # necessarily take time away from the application.
+      #
+      # require 'java'
+      # class GC
+      #   def initialize
+      #     @factory = Java::JavaLangManagement::ManagementFactory
+      #   end
+      #
+      #   def enable
+      #   end
+      #
+      #   def total_time
+      #     res = 0.0
+      #
+      #     @factory.garbage_collector_mx_beans.each do |mx|
+      #       res += (mx.collection_time.to_f / 1_000.0)
+      #     end
+      #
+      #     res
+      #   end
+      # end
+
+    elsif defined?(::GC::Profiler)
+
+      class GC
+        def initialize
+          @total = 0.0
+        end
+
+        def enable
+          ::GC::Profiler.enable
+        end
+
+        def total_time
+          run = ::GC::Profiler.total_time
+
+          if run > 0
+            ::GC::Profiler.clear
+          end
+
+          @total += run
+        end
+      end
+
+    end
+
+    # Fallback
+    unless defined?(VM::GC)
+
+      class GC
+        def enable
+        end
+
+        def total_time
+          0.0
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tilde, Inc.
@@ -131,6 +131,7 @@ files:
 - lib/skylight/vendor/thread_safe/non_concurrent_cache_backend.rb
 - lib/skylight/vendor/thread_safe/synchronized_cache_backend.rb
 - lib/skylight/version.rb
+- lib/skylight/vm/gc.rb
 - lib/skylight/worker.rb
 - lib/skylight/worker/builder.rb
 - lib/skylight/worker/collector.rb