errplane 0.5.10 → 0.5.11

data/lib/errplane/max_queue.rb

@@ -1,14 +1,7 @@
 module Errplane
-  class MaxQueue < Queue
-    attr_accessor :max_depth
-
-    def initialize(max_depth = 10_000)
-      @max_depth = max_depth
-      super()
-    end
-
-    def push_or_discard(data)
-      push(data) if size < @max_depth
+  class MaxQueue < SizedQueue
+    def push(obj)
+      super if @que.length < @max
     end
   end
 end

data/lib/errplane/rails/instrumentation.rb

@@ -1,6 +1,13 @@
 module Errplane
   module Rails
     module Instrumentation
+      def benchmark_for_instrumentation
+        start = Time.now
+        yield
+        elapsed = ((Time.now - start) * 1000).ceil
+        Errplane.report("instrumentation/#{controller_name}##{action_name}", :value => elapsed)
+      end
+
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -8,19 +15,7 @@ module Errplane
       module ClassMethods
         def instrument(methods = [])
           methods = [methods] unless methods.is_a?(Array)
-          methods.each do |method|
-            ::Rails.logger.debug "OVERRIDING METHOD: #{method}"
-
-            class_eval <<-EVAL_METHOD
-              def #{method}_with_instrumentation
-                Errplane.report(\"instrumentation/#{self.class}##{method}\")
-                #{method}_without_instrumentation
-              end
-            EVAL_METHOD
-
-            alias_method "#{method}_without_instrumentation", method
-            alias_method method, "#{method}_with_instrumentation"
-          end
+          around_filter :benchmark_for_instrumentation, :only => methods
         end
       end
     end

data/lib/errplane/rails.rb

@@ -3,6 +3,7 @@ require 'errplane'
 require 'errplane/rails/middleware/hijack_rescue_action_everywhere'
 require 'errplane/rails/air_traffic_controller'
 require 'errplane/rails/benchmarking'
+require 'errplane/rails/instrumentation'
 
 module Errplane
   module Rails
@@ -10,6 +11,7 @@ module Errplane
       ActionController::Base.send(:include, Errplane::Rails::AirTrafficController)
       ActionController::Base.send(:include, Errplane::Rails::Middleware::HijackRescueActionEverywhere)
       ActionController::Base.send(:include, Errplane::Rails::Benchmarking)
+      ActionController::Base.send(:include, Errplane::Rails::Instrumentation)
 
       ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe', Errplane::Rack
 

data/lib/errplane/railtie.rb

@@ -90,6 +90,8 @@ module Errplane
       ActiveSupport.on_load(:action_controller) do
         require 'errplane/rails/air_traffic_controller'
         include Errplane::Rails::AirTrafficController
+        require 'errplane/rails/instrumentation'
+        include Errplane::Rails::Instrumentation
       end
 
       if defined?(::ActionDispatch::DebugExceptions)
@@ -101,7 +103,7 @@ module Errplane
       end
 
       if defined?(ActiveSupport::Notifications)
-        ActiveSupport::Notifications.subscribe do |name, start, finish, id, payload|
+        ActiveSupport::Notifications.subscribe "process_action.action_controller" do |name, start, finish, id, payload|
           if Errplane.configuration.instrumentation_enabled?
             h = { :name => name,
                   :start => start,
@@ -109,7 +111,7 @@ module Errplane
                   :nid => id,
                   :payload => payload,
                   :source => "active_support"}
-            Errplane.queue.push_or_discard(h)
+            Errplane.queue.push(h)
           end
         end
       end

data/lib/errplane/transmitter.rb

@@ -24,7 +24,7 @@ module Errplane
                     :url => url,
                     :source => "exception" }
 
-      Errplane.queue.push_or_discard(exception)
+      Errplane.queue.push(exception)
     end
 
     def deliver(data, url)

data/lib/errplane/version.rb

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

data/lib/errplane/worker.rb

@@ -5,6 +5,9 @@ require "base64"
 
 module Errplane
   class Worker
+    MAX_POST_LINES = 200
+    POST_RETRIES = 5
+
     class << self
       include Errplane::Logger
 
@@ -20,7 +23,7 @@ module Errplane
           url = "/api/v2/time_series/applications/#{Errplane.configuration.application_id}/environments/#{Errplane.configuration.rails_environment}?api_key=#{Errplane.configuration.api_key}"
           log :debug, "Posting to: #{url}"
 
-          retry_count = 5
+          retry_count = POST_RETRIES
           begin
             http = Net::HTTP.new("api.errplane.com", "80")
             response = http.post(url, data)
@@ -38,28 +41,27 @@ module Errplane
       end
 
       def spawn_threads()
-        Errplane.configuration.queue_worker_threads.times do
-          log :debug, "Spawning background worker thread."
+        Errplane.configuration.queue_worker_threads.times do |thread_num|
+          log :debug, "Spawning background worker thread #{thread_num}."
 
           Thread.new do
             while true
               sleep Errplane.configuration.queue_worker_polling_interval
-              check_background_queue
+              check_background_queue(thread_num)
             end
           end
 
         end
       end
 
-      def check_background_queue
-        log :debug, "Checking background queue."
+      def check_background_queue(thread_num = 0)
+        log :debug, "Checking background queue on thread #{thread_num} (#{Thread.list.count - 1} active)"
 
         data = []
 
-        while !Errplane.queue.empty? && data.size < 200
-          log :debug, "Found data in the queue!"
-          n = Errplane.queue.pop
-          log :debug, n.inspect
+        while data.size < MAX_POST_LINES && !Errplane.queue.empty?
+          n = Errplane.queue.pop(true) rescue next;
+          log :debug, "Found data in the queue! (#{n[:name]})"
 
           begin
             case n[:source]

data/lib/errplane.rb

@@ -40,7 +40,7 @@ module Errplane
     end
 
     def report(name, params = {})
-      Errplane.queue.push_or_discard({
+      Errplane.queue.push({
         :name => name,
         :source => "custom",
         :timestamp => current_timestamp

data/spec/unit/max_queue_spec.rb

@@ -1,31 +1,31 @@
 require 'spec_helper'
 
 describe Errplane::MaxQueue do
-  it "should inherit from Queue" do
-    Errplane::MaxQueue.new.should be_a(Queue)
+  it "should inherit from SizedQueue" do
+    Errplane::MaxQueue.new(1).should be_a(SizedQueue)
   end
 
   context "#new" do
     it "should allow max_depth to be set" do
       queue = Errplane::MaxQueue.new(500)
-      queue.max_depth.should == 500
+      queue.max.should == 500
     end
   end
 
-  context "#push_or_discard" do
+  context "#push" do
     it "should allow an item to be added if the queue is not full" do
       queue = Errplane::MaxQueue.new(5)
       queue.size.should be_zero
-      queue.push_or_discard(1)
+      queue.push(1)
       queue.size.should == 1
     end
 
     it "should not allow items to be added if the queue is full" do
       queue = Errplane::MaxQueue.new(5)
       queue.size.should be_zero
-      5.times { |n| queue.push_or_discard(n) }
+      5.times { |n| queue.push(n) }
       queue.size.should == 5
-      queue.push_or_discard(6)
+      queue.push(6)
       queue.size.should == 5
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: errplane
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2012-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70210053349860 !ruby/object:Gem::Requirement
+  requirement: &70188314227440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210053349860
+  version_requirements: *70188314227440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70210053349300 !ruby/object:Gem::Requirement
+  requirement: &70188314226840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70210053349300
+  version_requirements: *70188314226840
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70210053348660 !ruby/object:Gem::Requirement
+  requirement: &70188314226240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70210053348660
+  version_requirements: *70188314226240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70210053348120 !ruby/object:Gem::Requirement
+  requirement: &70188314225640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70210053348120
+  version_requirements: *70188314225640
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70210053347360 !ruby/object:Gem::Requirement
+  requirement: &70188314224760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210053347360
+  version_requirements: *70188314224760
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70210053346240 !ruby/object:Gem::Requirement
+  requirement: &70188314223540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210053346240
+  version_requirements: *70188314223540
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70210053344980 !ruby/object:Gem::Requirement
+  requirement: &70188314222400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210053344980
+  version_requirements: *70188314222400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70210053344140 !ruby/object:Gem::Requirement
+  requirement: &70188314221600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210053344140
+  version_requirements: *70188314221600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70210053342860 !ruby/object:Gem::Requirement
+  requirement: &70188314220340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210053342860
+  version_requirements: *70188314220340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70210053341860 !ruby/object:Gem::Requirement
+  requirement: &70188314219300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210053341860
+  version_requirements: *70188314219300
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70210053340520 !ruby/object:Gem::Requirement
+  requirement: &70188314218040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210053340520
+  version_requirements: *70188314218040
 description: This gem provides exception reporting with Errplane for Rails 3.x applications.
 email:
 - todd@errplane.com