honeybadger 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f85bcb71a37c3f43c8926267d0451df2ce4eb8
-  data.tar.gz: e3ae25a5a9e56ce88518b3422776196c9e09ac3b
+  metadata.gz: edcae24e99958fe34acc363817dc30becf37ea99
+  data.tar.gz: 968da8e9f0c5a90d4f7e9d86a5c7525d427e6f28
 SHA512:
-  metadata.gz: fa4789fdccd66511ca94abd6593ba1adc23da050f455663e4f7b8a0126b8771d4299247b59e56b92b0633b193ceab5751ae08ceb5352cbe19c6f9cf867d6fda4
-  data.tar.gz: fc9dc62c29c7b3bf8289bdd4276f3a48cc510c0cd55cfbe55e22b6495bf0cc7691cc897ae22b91e4fdee1d162f993c6aa984e0149d6ad3290fede9cffa2e95db
+  metadata.gz: 718d30cb3969e876ca456a42bcbfaf4c739123e9cb905851f7eb06836974d6914b45a44f22e3344ccd07ddf65c45a9901d0736899411ca91f1a15e045e1ec47a
+  data.tar.gz: 53dc3063a6336f45986a894c96f1a86175110cf6d482ab560ebb2cb0919cc0f08813fce48f743fbe8a28d3e26e04d44d6f1b8dad707a8012632b842e444d6ae5

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## Honeybadger 1.10.3 ##
+
+* Fixed bug with missing stddev stats
+
+  *Ben Curtis*
+
+* Fix concurrency race condition when modifying metrics hash
+
+  *Joshua Wood*
+
+* Fix a JRuby memory leak
+
+  *Kevin Menard*
+
+## Honeybadger 1.10.2 ##
+
+* Explictly cast division to float.
+
+  If you include mathn, a Rational is returned from #/, so we need
+  to explictly cast to a float.
+
+  *Austen Ito*
+
 ## Honeybadger 1.10.1 ##
 
 * Stop sending ENV with rake exceptions

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/gemfiles/rack.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/gemfiles/rails2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/gemfiles/rails3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/gemfiles/rails3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/gemfiles/rails4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/gemfiles/rake.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/gemfiles/sinatra.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.10.2)
+    honeybadger (1.10.3)
       json
 
 GEM

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.10.2'
-  s.date              = '2014-01-22'
+  s.version           = '1.10.3'
+  s.date              = '2014-02-05'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'

data/lib/honeybadger.rb

@@ -16,7 +16,7 @@ require 'honeybadger/user_feedback'
 require 'honeybadger/railtie' if defined?(Rails::Railtie)
 
 module Honeybadger
-  VERSION = '1.10.2'
+  VERSION = '1.10.3'
   LOG_PREFIX = "** [Honeybadger] "
 
   HEADERS = {

data/lib/honeybadger/monitor/worker.rb

@@ -5,19 +5,33 @@ module Honeybadger
     class Worker
       include Singleton
 
+      # Sub-class thread so we have a named thread (useful for debugging in Thread.list).
+      class MetricsThread < Thread
+      end
+
       def initialize
         init_metrics
         @delay = 60
         @per_request = 100
         @sender = Monitor::Sender.new(Honeybadger.configuration)
-        @thread = Thread.new do
-          while true do
+        @lock = Mutex.new
+        start
+        at_exit { stop }
+      end
+
+      def start
+        @thread = MetricsThread.new do
+          until Thread.current[:should_exit] do
             send_metrics
             sleep @delay
           end
         end
       end
 
+      def stop
+        @thread[:should_exit] = true if @thread
+      end
+
       def timing(name, value)
         add_metric(name, value, :timing)
       end
@@ -32,10 +46,17 @@ module Honeybadger
           @metrics = { :timing => {}, :counter => {} }
         end
 
+        def collect_metrics
+          @lock.synchronize do
+            metrics = @metrics
+            init_metrics
+            metrics
+          end
+        end
+
         def send_metrics
-          metrics = @metrics.dup
+          metrics = collect_metrics
           return unless metrics[:timing].any? || metrics[:counter].any?
-          init_metrics
           [].tap do |m|
             metrics[:counter].each do |metric, values|
               m << "#{metric} #{values.sum}"
@@ -51,7 +72,7 @@ module Honeybadger
             end
           end.each_slice(@per_request) do |mm|
             begin
-              @sender.send_metrics({ :metrics => mm, :environment => Honeybadger.configuration.environment_name, :hostname => Honeybadger.configuration.hostname })
+              @sender.send_metrics({ :metrics => mm.compact, :environment => Honeybadger.configuration.environment_name, :hostname => Honeybadger.configuration.hostname })
             rescue Exception => e
               log(:error, "[Honeybadger::Monitor::Worker#send_metrics] Failed to send #{mm.count} metrics: #{e.class} - #{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}")
             end
@@ -59,7 +80,9 @@ module Honeybadger
         end
 
         def add_metric(name, value, kind)
-          (@metrics[kind][name] ||= Honeybadger::Array.new) << value
+          @lock.synchronize do
+            (@metrics[kind][name] ||= Honeybadger::Array.new) << value
+          end
         end
 
         def log(level, message)

data/spec/honeybadger/monitor/worker_spec.rb

@@ -7,12 +7,13 @@ describe Honeybadger::Monitor::Worker do
 
   before(:each) do
     Thread.stub(:new)
+
     # Create an attr_reader for @metrics and @sender
     instance.stub(:metrics) { instance.instance_variable_get(:@metrics) }
     instance.stub(:sender) { instance.instance_variable_get(:@sender) }
   end
 
-  context 'initializing' do
+  describe '#initialize' do
     describe '@metrics' do
       subject { instance.instance_variable_get(:@metrics) }
 
@@ -49,6 +50,16 @@ describe Honeybadger::Monitor::Worker do
         Honeybadger::Monitor::Worker.send(:new)
       end
     end
+
+    it 'starts the worker loop'
+  end
+
+  describe '#start' do
+    it 'creates a new Thread'
+  end
+
+  describe '#stop' do
+    it 'asks current thread to exit gracefully'
   end
 
   describe '#timing' do
@@ -88,7 +99,9 @@ describe Honeybadger::Monitor::Worker do
 
     it 're-inits metrics' do
       instance.increment(:test, 60)
+      previous_metrics = instance.metrics
       expect { subject }.to change(instance, :metrics).to({ :timing => {}, :counter => {} })
+      expect(instance.metrics).not_to be(previous_metrics)
     end
 
     it 'returns nil when there are no metrics to send' do
@@ -105,9 +118,8 @@ describe Honeybadger::Monitor::Worker do
       expect(subject).to be_nil
     end
 
-    context 'when constructingtiming metrics' do
+    context 'when constructing timing metrics' do
       before(:each) { 10.times { |i| instance.timing(:test, i) } }
-      after(:each) { subject }
 
       it 'includes the mean value' do
         instance.sender.should_receive(:send_metrics).with(hash_including(:metrics => array_including(['test:mean 4.5'])))
@@ -136,6 +148,8 @@ describe Honeybadger::Monitor::Worker do
       it 'includes a count of total metrics' do
         instance.sender.should_receive(:send_metrics).with(hash_including(:metrics => array_including(['test 10'])))
       end
+
+      after(:each) { subject }
     end
 
     context 'when constructing counter metrics' do
@@ -148,7 +162,6 @@ describe Honeybadger::Monitor::Worker do
 
     context 'when sending metrics' do
       before(:each) { instance.increment(:test, 1) }
-      after(:each) { subject }
 
       it 'executes batches of 100' do
         199.times { |i| instance.increment(:"test_#{i}", 1) }
@@ -168,6 +181,8 @@ describe Honeybadger::Monitor::Worker do
         end
         instance.sender.should_receive(:send_metrics).with(hash_including(:hostname => 'zxcv'))
       end
+
+      after(:each) { subject }
     end
 
     context 'when an exception occurrs' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Joshua Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json