errplane 0.5.9 → 0.5.10

data/lib/errplane/rails.rb

@@ -2,12 +2,14 @@ require 'action_controller'
 require 'errplane'
 require 'errplane/rails/middleware/hijack_rescue_action_everywhere'
 require 'errplane/rails/air_traffic_controller'
+require 'errplane/rails/benchmarking'
 
 module Errplane
   module Rails
     def self.initialize
       ActionController::Base.send(:include, Errplane::Rails::AirTrafficController)
       ActionController::Base.send(:include, Errplane::Rails::Middleware::HijackRescueActionEverywhere)
+      ActionController::Base.send(:include, Errplane::Rails::Benchmarking)
 
       ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe', Errplane::Rack
 
@@ -21,20 +23,6 @@ module Errplane
         config.framework_version       = ::Rails.version
       end
 
-      if defined?(ActiveSupport::Notifications)
-        ActiveSupport::Notifications.subscribe do |name, start, finish, id, payload|
-          if Errplane.configuration.instrumentation_enabled?
-            h = { :name => name,
-                  :start => start,
-                  :finish => finish,
-                  :nid => id,
-                  :payload => payload,
-                  :source => "active_support"}
-            Errplane.queue.push_or_discard(h)
-          end
-        end
-      end
-
       if defined?(PhusionPassenger)
         PhusionPassenger.on_event(:starting_worker_process) do |forked|
           Errplane::Worker.spawn_threads() if forked

data/lib/errplane/rails/benchmarking.rb

@@ -0,0 +1,31 @@
+require 'benchmark'
+
+module Errplane
+  module Rails
+    module Benchmarking
+      def self.included(base)
+        base.send(:alias_method_chain, :perform_action, :instrumentation)
+        base.send(:alias_method_chain, :view_runtime, :instrumentation)
+        base.send(:alias_method_chain, :active_record_runtime, :instrumentation)
+      end
+
+      private
+      def perform_action_with_instrumentation
+        ms = Benchmark.ms { perform_action_without_instrumentation }
+        Errplane.report "controllers/#{params[:controller]}/#{params[:action]}", :value => ms.ceil
+      end
+
+      def view_runtime_with_instrumentation
+        runtime = view_runtime_without_instrumentation
+        Errplane.report "views", :value => runtime.split.last.to_f.ceil
+        runtime
+      end
+
+      def active_record_runtime_with_instrumentation
+        runtime = active_record_runtime_without_instrumentation
+        Errplane.report "db", :value => runtime.split.last.to_f.ceil
+        runtime
+      end
+    end
+  end
+end

data/lib/errplane/version.rb

@@ -1,3 +1,3 @@
 module Errplane
-  VERSION = "0.5.9"
+  VERSION = "0.5.10"
 end

data/lib/errplane/worker.rb

@@ -57,24 +57,28 @@ module Errplane
         data = []
 
         while !Errplane.queue.empty? && data.size < 200
-          log :debug, "Found data in the queue."
+          log :debug, "Found data in the queue!"
           n = Errplane.queue.pop
+          log :debug, n.inspect
 
           begin
             case n[:source]
             when "active_support"
               case n[:name].to_s
               when "process_action.action_controller"
-                timediff = n[:finish] - n[:start]
-                data << "controllers/#{n[:payload][:controller]}/#{n[:payload][:action]} #{(timediff*1000).ceil} #{n[:finish].utc.to_i}"
-                data << "views #{n[:payload][:view_runtime].ceil} #{n[:finish].utc.to_i }"
-                data << "db #{n[:payload][:db_runtime].ceil} #{n[:finish].utc.to_i }"
+                timestamp = n[:finish].utc.to_i
+                controller_runtime = ((n[:finish] - n[:start])*1000).ceil
+                view_runtime = (n[:payload][:view_runtime] || 0).ceil
+                db_runtime = (n[:payload][:db_runtime] || 0).ceil
+
+                data << "controllers/#{n[:payload][:controller]}/#{n[:payload][:action]} #{controller_runtime} #{timestamp}"
+                data << "views #{view_runtime} #{timestamp}"
+                data << "db #{db_runtime} #{timestamp}"
               end
             when "exception"
               Errplane.transmitter.deliver n[:data], n[:url]
             when "custom"
               line = "#{n[:name]} #{n[:value] || 1} #{n[:timestamp]}"
-              # adding the message in this way to ensure that the space between the timestamp and the base64 encoded part goes in.
               line = "#{line} #{Base64.encode64(n[:message]).strip}" if n[:message]
               data << line
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053349860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70210053349860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053349300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.14
+  version_requirements: *70210053349300
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053348660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.14
+  version_requirements: *70210053348660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053348120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *70210053348120
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053347360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70210053347360
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053346240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70210053346240
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053344980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70210053344980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053344140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70210053344140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053342860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70210053342860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053341860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70210053341860
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70210053340520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,12 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70210053340520
 description: This gem provides exception reporting with Errplane for Rails 3.x applications.
 email:
 - todd@errplane.com
@@ -218,6 +163,7 @@ files:
 - lib/errplane/rack.rb
 - lib/errplane/rails.rb
 - lib/errplane/rails/air_traffic_controller.rb
+- lib/errplane/rails/benchmarking.rb
 - lib/errplane/rails/instrumentation.rb
 - lib/errplane/rails/middleware/hijack_render_exception.rb
 - lib/errplane/rails/middleware/hijack_rescue_action_everywhere.rb
@@ -275,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: errplane
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Rails exception reporting for Errplane.