remnant 0.3.3 → 0.4.0

data/lib/remnant.rb

@@ -4,6 +4,12 @@ require 'remnant/base'
 require 'remnant/configuration'
 require 'remnant/discover'
 
+require 'remnant/gc'
+require 'remnant/gc/base'
+require 'remnant/gc/ree'
+
+require 'remnant/filters'
+
 require 'remnant/template'
 require 'remnant/template/trace'
 require 'remnant/template/rendering'

data/lib/remnant/base.rb

@@ -41,9 +41,8 @@ class Remnant
             Remnant.handler.timing("#{key_prefix}.#{remnant_key}", ms.to_i)
           end
 
-          if Remnant::Database.enabled?
-            Remnant.handler.timing("#{key_prefix}.db", Remnant::Database.total_time.to_i)
-          end
+          Remnant.handler.timing("#{key_prefix}.gc", Remnant::GC.ms.to_i)
+          Remnant.handler.timing("#{key_prefix}.db", Remnant::Database.total_time.to_i)
 
           @sample_counter = 0
         else
@@ -61,7 +60,16 @@ class Remnant
 
           Rails.logger.info "#{Remnant.color}#{ms.to_i}ms#{Remnant.color(true)}\t#{key}"
         end
+        Rails.logger.info "#{Remnant.color}#{Remnant::GC.time.to_i}ms (#{Remnant::GC.collections} collections)#{Remnant.color(true)}\tGC"
+
+        # filters
+        Rails.logger.info ""
+        Rails.logger.info("#{color(false, true)}----- Filters (%.2fms) -----#{color(true)}" % Remnant::Filters.total_time)
+        Remnant::Filters.filters.map do |filter|
+          Rails.logger.info("#{color}%.2fms#{color(true)}\t#{filter[:name]} (#{filter[:type]})" % filter[:ms])
+        end
 
+        # template captures
         if Remnant::Template.enabled?
           Rails.logger.info ""
           Rails.logger.info "#{color(false, true)}----- Templates -----#{color(true)}"
@@ -70,15 +78,14 @@ class Remnant
           end
         end
 
-        if Remnant::Database.enabled?
-          Rails.logger.info ""
-          Rails.logger.info("#{color(false, true)}---- Database (%.2fms) -----#{color(true)}" % Remnant::Database.total_time)
-          if Remnant::Database.suppress?
-            Rails.logger.info "queries suppressed in development mode"
-          else
-            Remnant::Database.queries.map do |query|
-              Rails.logger.info("#{color}%.2fms#{color(true)}\t#{query.sql}" % (query.time * 1000))
-            end
+        # sql captures
+        Rails.logger.info ""
+        Rails.logger.info("#{color(false, true)}---- Database (%.2fms) -----#{color(true)}" % Remnant::Database.total_time)
+        if Remnant::Database.suppress?
+          Rails.logger.info "queries suppressed in development mode"
+        else
+          Remnant::Database.queries.map do |query|
+            Rails.logger.info("#{color}%.2fms#{color(true)}\t#{query.sql}" % (query.time * 1000))
           end
         end
 
@@ -92,6 +99,7 @@ class Remnant
 
       Remnant::Database.reset
       Remnant::Template.reset
+      Remnant::Filters.reset
       Remnant::Discover.results.clear
     end
   end

data/lib/remnant/filters.rb

@@ -0,0 +1,28 @@
+class Remnant
+  class Filters
+    module ClassMethods
+      def record(filter_type, filter_name, &block)
+        start_time = Time.now
+        result = block.call
+        time = Time.now - start_time
+        filters << {:type => filter_type, :name => filter_name, :time => time, :ms => time * 1000}
+
+        return result
+      end
+
+      def reset
+        @total_time = nil
+        Thread.current['remnant.filters.set'] = []
+      end
+
+      def filters
+        Thread.current['remnant.filters.set'] ||= []
+      end
+
+      def total_time
+        @total_time ||= filters.map {|filter| filter[:ms]}.sum
+      end
+    end
+    extend ClassMethods
+  end
+end

data/lib/remnant/gc.rb

@@ -0,0 +1,38 @@
+class Remnant
+  class GC
+    module ClassMethods
+      def enable_stats
+        _gc.enable_stats
+      end
+
+      def disable_stats
+        _gc.disable_stats
+      end
+
+      def clear_stats
+        _gc.clear_stats
+      end
+
+      def time
+        _gc.time
+      end
+
+      def collections
+        _gc.collections
+      end
+
+      def _gc
+        Thread.current['remnant.gc'] ||= _gc_implementation
+      end
+
+      def _gc_implementation
+        if ::GC.respond_to?(:time) && ::GC.respond_to?(:collections)
+          Remnant::GC::Ree
+        else
+          Remnant::GC::Base
+        end
+      end
+    end
+    extend ClassMethods
+  end
+end

data/lib/remnant/gc/base.rb

@@ -0,0 +1,28 @@
+class Remnant
+  class GC
+    class Base
+      module ClassMethods
+        def time
+          0
+        end
+
+        def collections
+          0
+        end
+
+        def enable_stats
+          true
+        end
+
+        def disable_stats
+          true
+        end
+
+        def clear_stats
+          true
+        end
+      end
+      extend ClassMethods
+    end
+  end
+end

data/lib/remnant/gc/ree.rb

@@ -0,0 +1,29 @@
+class Remnant
+  class GC
+    class Ree
+      module ClassMethods
+        def time
+          # returns time in microseconds so convert to ms
+          ::GC.time / 1000
+        end
+
+        def collections
+          ::GC.collections
+        end
+
+        def enable_stats
+          ::GC.enable_stats
+        end
+
+        def disable_stats
+          ::GC.disable_stats
+        end
+
+        def clear_stats
+          ::GC.clear_stats
+        end
+      end
+      extend ClassMethods
+    end
+  end
+end

data/lib/remnant/rails.rb

@@ -33,10 +33,29 @@ class Remnant
 
         # hook remnants
         Remnant::Discover.find('request',  ActionController::Dispatcher,            :call)
-        Remnant::Discover.find('filters',  ActionController::Filters::BeforeFilter, :call)
         Remnant::Discover.find('action',   ActionController::Base,                  :perform_action)
         Remnant::Discover.find('view',     ActionController::Base,                  :render)
-        Remnant::Discover.find('filters',  ActionController::Filters::AfterFilter,  :call)
+
+        #
+        # Filter capturing
+        #
+        [
+         ActionController::Filters::BeforeFilter,
+         ActionController::Filters::AfterFilter,
+         ActionController::Filters::AroundFilter
+        ].map do |remnant_constant|
+          Remnant::Discover.find_with(remnant_constant) do
+            remnant_constant.class_eval do
+              def call_with_remnant(*args, &block)
+                ::Remnant::Filters.record(self.class.to_s, method.to_s) do
+                  call_without_remnant(*args, &block)
+                end
+              end
+
+              alias_method_chain :call, :remnant
+            end
+          end
+        end
 
         #
         # Template rendering
@@ -75,9 +94,12 @@ class Remnant
         # last hook into request cycle for sending results
         ::ActionController::Dispatcher.class_eval do
           def call_with_remnant_discovery(*args, &block) #:nodoc:
+            ::Remnant::GC.enable_stats
             call_without_remnant_discovery(*args, &block).tap do |status, headers, response|
+              ::Remnant::GC.disable_stats
               begin
                 ::Remnant.collect
+                ::Remnant::GC.clear_stats
                 ::Rails.logger.flush if ::Rails.logger.respond_to? :flush
               rescue Exception => e
                 if defined?(::Flail)

data/lib/remnant/version.rb

@@ -1,3 +1,3 @@
 class Remnant
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remnant
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
@@ -143,6 +143,10 @@ files:
 - lib/remnant/database.rb
 - lib/remnant/database/query.rb
 - lib/remnant/discover.rb
+- lib/remnant/filters.rb
+- lib/remnant/gc.rb
+- lib/remnant/gc/base.rb
+- lib/remnant/gc/ree.rb
 - lib/remnant/rails.rb
 - lib/remnant/railtie.rb
 - lib/remnant/template.rb
@@ -176,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: remnant
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails statistical discoverer