remnant 0.4.10 → 0.9.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remnant (0.4.5)
+    remnant (0.3.2)
       statsd-ruby (= 1.0.0)
 
 GEM

data/lib/remnant/base.rb

@@ -1,5 +1,17 @@
 class Remnant
   module ClassMethods
+    def disable!
+      @enabled = false
+    end
+
+    def enable!
+      @enabled = true
+    end
+
+    def enabled?
+      @enabled
+    end
+
     def color(default = false, heading = false)
       return "\033[0m" if default
       return "\033[0;01;33m" if heading
@@ -28,10 +40,28 @@ class Remnant
 
       extra_remnant_key = Remnant::Discover.results.delete(:extra_remnant_key)
 
-      # process special queue times
-      ::Remnant::Queue.process!
+      if ::Rails.env.production? || ::Rails.env.staging? || ::Rails.env.demo?
+        # only log if above sample rate
+        if @sample_counter > configuration.sample_rate
+          key_prefix = [
+                        Remnant.configuration.tag,
+                        Remnant.configuration.env,
+                        extra_remnant_key
+                       ].compact.join('.')
+
+          Remnant::Discover.results.map do |remnant_key, ms|
+            Remnant.handler.timing("#{key_prefix}.#{remnant_key}", ms.to_i)
+          end
+
+          Remnant.handler.timing("#{key_prefix}.gc", Remnant::GC.time.to_i)
+          Remnant.handler.timing("#{key_prefix}.db", Remnant::Database.total_time.to_i)
+          Remnant.handler.timing("#{key_prefix}.filters", Remnant::Filters.total_time.to_i)
 
-      if ::Rails.env.development? || ::Rails.env.test?
+          @sample_counter = 0
+        else
+          @sample_counter += 1
+        end
+      else
         # always log in development mode
         Rails.logger.info "#{color(false, true)}--------------Remnants Discovered--------------#{color(true)}"
 
@@ -73,27 +103,6 @@ class Remnant
         end
 
         Rails.logger.info "#{color(false, true)}-----------------------------------------------#{color(true)}"
-      else
-        # only log if above sample rate
-        if @sample_counter > configuration.sample_rate
-          key_prefix = [
-                        Remnant.configuration.tag,
-                        Remnant.configuration.env,
-                        extra_remnant_key
-                       ].compact.join('.')
-
-          Remnant::Discover.results.map do |remnant_key, ms|
-            Remnant.handler.timing("#{key_prefix}.#{remnant_key}", ms.to_i)
-          end
-
-          Remnant.handler.timing("#{key_prefix}.gc", Remnant::GC.time.to_i)
-          Remnant.handler.timing("#{key_prefix}.db", Remnant::Database.total_time.to_i)
-          Remnant.handler.timing("#{key_prefix}.filters", Remnant::Filters.total_time.to_i)
-
-          @sample_counter = 0
-        else
-          @sample_counter += 1
-        end
       end
 
       # run hook if given

data/lib/remnant/filters.rb

@@ -2,17 +2,12 @@ class Remnant
   class Filters
     module ClassMethods
       def record(filter_type, filter_name, &block)
-        # ignore AroundFilters
-        if filter_type.to_s == 'ActionController::Filters::AroundFilter'
-          return block.call
-        else
-          start_time = Time.now
-          result = block.call
-          time = Time.now - start_time
-          filters << {:type => filter_type, :name => filter_name, :time => time, :ms => time * 1000}
+        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
+        return result
       end
 
       def reset

data/lib/remnant/gc/{mri.rb → profiler.rb}

@@ -1,18 +1,22 @@
 class Remnant
   class GC
-    class Mri
+    class Profiler
       module ClassMethods
         def enabled?
-          true
+          ::GC::Profiler.enabled?
         end
 
         def time
-          # returns time in seconds, so convert to ms
-          ::GC::Profiler.total_time * 1000
+          # returns time in seconds so convert to ms
+          @time ||= raw_data.map {|data| data[:GC_TIME]}.sum * 1000
+        end
+
+        def raw_data
+          @raw_data ||= ::GC::Profiler.raw_data || []
         end
 
         def collections
-          ::GC::Profiler.raw_data.try(:size) || 0
+          raw_data.size
         end
 
         def enable_stats
@@ -24,6 +28,7 @@ class Remnant
         end
 
         def clear_stats
+          @raw_data = nil
           ::GC::Profiler.clear
         end
       end

data/lib/remnant/gc.rb

@@ -30,14 +30,12 @@ class Remnant
       end
 
       def _gc_implementation
-        if RUBY_VERSION >= '2.1.0'
-          Remnant::GC::Mri
+        if ::GC.respond_to?(:time) && ::GC.respond_to?(:collections)
+          Remnant::GC::Ree
+        elsif defined?(::GC::Profiler)
+          Remnant::GC::Profiler
         else
-          if ::GC.respond_to?(:time) && ::GC.respond_to?(:collections)
-            Remnant::GC::Ree
-          else
-            Remnant::GC::Base
-          end
+          Remnant::GC::Base
         end
       end
     end

data/lib/remnant/rack.rb

@@ -0,0 +1,46 @@
+class Remnant
+  class Rack
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @response = [500, '', '']
+
+      if env['REQUEST_PATH'].include?('/asset')
+        @response = @app.call(env)
+      else
+
+        begin
+          # only gc capture as dev
+          if env['rack.request.cookie_hash']['developer']
+            ::Remnant::GC.enable_stats
+          end
+
+          # record request time
+          ::Remnant::Discover.measure('request') do
+            @response = @app.call(env)
+          end
+
+          # collect & clear stats for next request
+          ::Remnant.collect
+
+          # only gc capture as dev
+          if env['rack.request.cookie_hash']['developer']
+            ::Remnant::GC.clear_stats
+          end
+
+          ::Rails.logger.flush if ::Rails.logger.respond_to?(:flush)
+        rescue ::Exception => exception
+          if defined?(Flail)
+            Flail::Exception.new(env, exception).handle!
+          end
+
+          raise
+        end
+      end
+
+      @response
+    end
+  end
+end

data/lib/remnant/rails.rb

@@ -32,30 +32,13 @@ class Remnant
         #
 
         # hook remnants
-        Remnant::Discover.find('request',  ActionController::Dispatcher,            :call)
-        Remnant::Discover.find('action',   ActionController::Base,                  :perform_action)
+        Remnant::Discover.find('action',   ActionController::Base,                  :process_action)
         Remnant::Discover.find('view',     ActionController::Base,                  :render)
 
         #
         # 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
+        # TODO
 
         #
         # Template rendering
@@ -63,13 +46,13 @@ class Remnant
         if defined?(ActionView) && defined?(ActionView::Template)
           Remnant::Discover.find_with(ActionView::Template) do
             ActionView::Template.class_eval do
-              def render_template_with_remnant(*args, &block)
-                ::Remnant::Template.record(path_without_format_and_extension) do
-                  render_template_without_remnant(*args, &block)
+              def render_with_remnant(*args, &block)
+                ::Remnant::Template.record(@virtual_path) do
+                  render_without_remnant(*args, &block)
                 end
               end
 
-              alias_method_chain :render_template, :remnant
+              alias_method_chain :render, :remnant
             end
           end
         end
@@ -77,52 +60,11 @@ class Remnant
         #
         # database query time
         #
-        if ::Rails::VERSION::MAJOR == 2
-          Remnant::Discover.find_with(ActiveRecord::ConnectionAdapters::AbstractAdapter) do
-            ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-              def log_with_remnant(sql, name, &block)
-                ::Remnant::Database.record(sql, Kernel.caller) do
-                  log_without_remnant(sql, name, &block)
-                end
-              end
-
-              alias_method_chain :log, :remnant
-            end
-          end
-        end
-
-        # 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)
-                  Flail::Exception.notify(e)
-                else
-                  Rails.logger.error e.inspect
-                end
-              end
-            end
-          end
-          alias_method_chain :call, :remnant_discovery
-        end
+        ActiveSupport::Notifications.subscribe("sql.active_record") do |name, started, ended, id, payload|
+          duration = ended - started
+          trace = ::Rails.backtrace_cleaner.clean(Kernel.caller[1..-1])
 
-        # hook into perform_action for the extra remnant key
-        ::ActionController::Base.class_eval do
-          def perform_action_with_remnant_key(*args, &block) #:nodoc:
-            ::Remnant::Discover.results['lb_queue_start'] = ::Remnant::Queue.parse_frontend_timestamp(request.headers, 'lb')
-            ::Remnant::Discover.results['fe_queue_start'] = ::Remnant::Queue.parse_frontend_timestamp(request.headers, 'fe')
-            ::Remnant::Discover.results['app_queue_start'] = request.env['process.request_start'] || Time.now.to_f
-
-            perform_action_without_remnant_key(*args, &block)
-          end
-          alias_method_chain :perform_action, :remnant_key
+          ::Remnant::Database.queries << ::Remnant::Database::Query.new(payload[:sql], duration, trace)
         end
       end # setup!
     end

data/lib/remnant/railtie.rb

@@ -1,7 +1,11 @@
 class Remnant
   class Railtie < ::Rails::Railtie
+    initializer "remnant.use_rack_middleware" do |app|
+      app.config.middleware.use ::Remnant::Rack
+    end
+
     config.after_initialize do
-      Remnant::Rails.setup!
+      ::Remnant::Rails.setup!
     end
   end
 end

data/lib/remnant/version.rb

@@ -1,3 +1,3 @@
 class Remnant
-  VERSION = "0.4.10"
+  VERSION = "0.9.0"
 end

data/lib/remnant.rb

@@ -7,7 +7,7 @@ require 'remnant/discover'
 require 'remnant/gc'
 require 'remnant/gc/base'
 require 'remnant/gc/ree'
-require 'remnant/gc/mri'
+require 'remnant/gc/profiler'
 
 require 'remnant/filters'
 
@@ -18,9 +18,9 @@ require 'remnant/template/rendering'
 require 'remnant/database'
 require 'remnant/database/query'
 
-require 'remnant/queue'
-
+require 'remnant/rack'
 require 'remnant/rails'
+
 require 'remnant/version'
 
 require 'remnant/railtie' if defined?(::Rails::Railtie)

data/spec/spec_helper.rb

@@ -9,8 +9,8 @@ RSpec.configure do |config|
   config.mock_with :rr
 end
 
-require 'active_support'
 require 'action_controller'
+require 'active_support'
 
 require 'remnant'
 

metadata

@@ -1,141 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: remnant
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.9.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 10
-  version: 0.4.10
 platform: ruby
-authors: 
+authors:
 - John 'asceth' Long
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-03-23 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: statsd-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
+      - !ruby/object:Gem::Version
         version: 2.3.8
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
+      - !ruby/object:Gem::Version
         version: 2.3.8
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
+      - !ruby/object:Gem::Version
         version: 2.3.8
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: Remnant - peering into your ruby apps and discovering statistics you never knew could be so awful...
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Remnant - peering into your ruby apps and discovering statistics you
+  never knew could be so awful...
+email:
 - machinist@asceth.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .ruby-version
+files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -151,9 +146,9 @@ files:
 - lib/remnant/filters.rb
 - lib/remnant/gc.rb
 - lib/remnant/gc/base.rb
-- lib/remnant/gc/mri.rb
+- lib/remnant/gc/profiler.rb
 - lib/remnant/gc/ree.rb
-- lib/remnant/queue.rb
+- lib/remnant/rack.rb
 - lib/remnant/rails.rb
 - lib/remnant/railtie.rb
 - lib/remnant/template.rb
@@ -167,41 +162,31 @@ files:
 - spec/discover_spec.rb
 - spec/spec_helper.rb
 - spec/support/rr.rb
-has_rdoc: true
 homepage: https://github.com/asceth/remnant
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: remnant
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails statistical discoverer
-test_files: 
+test_files:
 - spec/app/some/klass.rb
 - spec/app/some/module.rb
 - spec/base_spec.rb

data/.gitignore

@@ -1,2 +0,0 @@
-vendor/
-.bundle/

data/.ruby-version

@@ -1 +0,0 @@
-1.8.7-p375

data/lib/remnant/queue.rb

@@ -1,95 +0,0 @@
-#
-# majority of this code comes from NewRelic RPM
-#
-class Remnant
-  class Queue
-    FRONTEND_START_HEADER = 'HTTP_X_FRONTEND_START'.freeze
-    LOAD_BALANCED_START_HEADER = 'HTTP_X_LOAD_BALANCER_START'.freeze
-
-    START_HEADERS = {
-      'lb' => [
-        LOAD_BALANCED_START_HEADER
-      ],
-      'fe' => [
-        FRONTEND_START_HEADER
-      ]
-    }.freeze
-
-    # any timestamps before this are thrown out and the parser
-    # will try again with a larger unit (2000/1/1 UTC)
-    EARLIEST_ACCEPTABLE_TIME = 946684800
-
-
-    class << self
-      def process!
-        lb_queue_start = ::Remnant::Discover.results.delete('lb_queue_start')
-        fe_queue_start = ::Remnant::Discover.results.delete('fe_queue_start')
-        app_queue_start = ::Remnant::Discover.results.delete('app_queue_start')
-
-        if lb_queue_start && fe_queue_start
-          secs = fe_queue_start - lb_queue_start
-
-          # if negative, clamp to 0
-          if secs < 0.0
-            secs = 0
-          end
-
-          ::Remnant::Discover.results['queue_lb'] = (secs * 1_000.0).round(2) # ms
-        end
-
-        if fe_queue_start && app_queue_start
-          secs = app_queue_start - fe_queue_start
-
-          # if negative, clamp to 0
-          if secs < 0.0
-            secs = 0
-          end
-
-          ::Remnant::Discover.results['queue_fe'] = (secs * 1_000.0).round(2) # ms
-        end
-      end
-
-      def parse_frontend_timestamp(headers, role, unit = :second, now = Time.now.to_f)
-        now = now.to_f if now.is_a?(Time)
-        earliest = nil
-
-        (START_HEADERS[role] || []).map do |header|
-          if headers[header]
-            parsed = parse_timestamp(timestamp_string_from_header_value(headers[header]), unit)
-
-            if parsed && (!earliest || parsed < earliest)
-              earliest = parsed
-            end
-          end
-        end
-
-        if earliest && earliest > now
-          earliest = now
-        end
-
-        earliest
-      end
-
-      def timestamp_string_from_header_value(value)
-        case value
-        when /^\s*([\d+\.]+)\s*$/ then $1
-        # following regexp intentionally unanchored to handle
-        # (ie ignore) leading server names
-        when /t=([\d+\.]+)/       then $1
-        end
-      end
-
-      # bring everything into a seconds with millisecond precision
-      def parse_timestamp(string, unit = :second)
-        case unit
-        when :second
-          string.to_f
-        when :millisecond
-          string.to_f / 1_000
-        when :microsecond
-          string.to_f / 1_000_000
-        end
-      end
-    end
-  end
-end