honeybadger 1.15.2 → 1.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 309a76fdbd5d01c3af0c928f74e0bf985f004d86
-  data.tar.gz: 301301ac6dfdf741c54903026c84635d4a74b781
+  metadata.gz: 9cfe3439d58b7af28a565d2de4933b569739de24
+  data.tar.gz: bbce3f75341c717bb1509ef572e13d5383b7e156
 SHA512:
-  metadata.gz: 1316f55be220bdbe64b32093d4687fe15b15fd907886d59bfda72805306010c7a7fcf448a240c211a1e94335a9508152c34134f127cdc31410cd2a57d1c28565
-  data.tar.gz: 3e3042b01a08ed472b1e20687d66bf683bd2ea4e44979b1c94880828cf7732b07bfd2b0e1ea12f22f3875196d5c1b7fe4979f503483a7d23150bae2a0a20eb2b
+  metadata.gz: 4e26c85da0f200e09d0d89a19cef8d49d01bab91ef6a430257c4b39987636b29b927cdda9a1d15d880507383309b62b1b1ad01fa8a391620273db44542fb3a6b
+  data.tar.gz: 43a4170cc003e0c4f1191255734bb3437c632ce30c708b12b8031fcf323927d1fcdd6825d26bf49001acc5cc41a02545a52a3fc6313567e844fa55bd46cb0e3c

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-## Honeybadger 1.15.1 ##
+## Honeybadger 1.15.3 ##
+
+* Send User-Agent header
+
+  *Joshua Wood*
+
+* Fix a bug where metrics were not reported for Passenger processes.
+
+  *Joshua Wood*
+
+## Honeybadger 1.15.2 ##
 
 * Fix bug where honeybadger/monitor wasn't included in non-Rails apps, even
   though certain other integrations depend on it.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeybadger (1.15.2)
+    honeybadger (1.15.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.15.2'
-  s.date              = '2014-06-20'
+  s.version           = '1.15.3'
+  s.date              = '2014-06-21'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'
@@ -100,6 +100,7 @@ Gem::Specification.new do |s|
     lib/honeybadger/integrations/delayed_job.rb
     lib/honeybadger/integrations/delayed_job/plugin.rb
     lib/honeybadger/integrations/net_http.rb
+    lib/honeybadger/integrations/passenger.rb
     lib/honeybadger/integrations/sidekiq.rb
     lib/honeybadger/integrations/thor.rb
     lib/honeybadger/monitor.rb
@@ -140,6 +141,7 @@ Gem::Specification.new do |s|
     spec/honeybadger/exception_extensions_spec.rb
     spec/honeybadger/integrations/delayed_job_spec.rb
     spec/honeybadger/integrations/net_http_spec.rb
+    spec/honeybadger/integrations/passenger_spec.rb
     spec/honeybadger/integrations/sidekiq_spec.rb
     spec/honeybadger/integrations/thor_spec.rb
     spec/honeybadger/logger_spec.rb

data/lib/honeybadger.rb

@@ -20,13 +20,14 @@ require 'honeybadger/railtie' if defined?(Rails::Railtie)
 require 'honeybadger/monitor'
 
 module Honeybadger
-  VERSION = '1.15.2'
-  LOG_PREFIX = "** [Honeybadger] "
+  VERSION = '1.15.3'.freeze
+  LOG_PREFIX = "** [Honeybadger] ".freeze
 
   HEADERS = {
     'Content-type' => 'application/json',
-    'Accept'       => 'text/json, application/json'
-  }
+    'Accept'       => 'text/json, application/json',
+    'User-Agent'   => "HB-Ruby #{VERSION}; #{RUBY_VERSION}; #{RUBY_PLATFORM}"
+  }.freeze
 
   class << self
     # The sender object is responsible for delivering formatted data to the

data/lib/honeybadger/integrations.rb

@@ -4,3 +4,4 @@ require 'honeybadger/integrations/delayed_job'
 require 'honeybadger/integrations/sidekiq'
 require 'honeybadger/integrations/thor'
 require 'honeybadger/integrations/net_http'
+require 'honeybadger/integrations/passenger'

data/lib/honeybadger/integrations/delayed_job/plugin.rb

@@ -5,7 +5,11 @@ module Honeybadger
         callbacks do |lifecycle|
           lifecycle.around(:invoke_job) do |job, &block|
             begin
-              Honeybadger::Monitor::Trace.instrument("#{job.payload_object.class}#perform", { :source => 'delayed_job', :jid => job.id, :class => job.payload_object.class.name }) do
+              if defined?(::Honeybadger::Monitor)
+                ::Honeybadger::Monitor::Trace.instrument("#{job.payload_object.class}#perform", { :source => 'delayed_job', :jid => job.id, :class => job.payload_object.class.name }) do
+                  block.call(job)
+                end
+              else
                 block.call(job)
               end
             rescue Exception => error

data/lib/honeybadger/integrations/passenger.rb

@@ -0,0 +1,18 @@
+module Honeybadger
+  Dependency.register do
+    requirement { defined?(::PhusionPassenger) }
+    requirement { defined?(::Honeybadger::Monitor) }
+
+    injection do
+      ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
+        Honeybadger.write_verbose_log('Starting passenger worker process')
+        Honeybadger::Monitor.worker.fork if forked
+      end
+
+      ::PhusionPassenger.on_event(:stopping_worker_process) do
+        Honeybadger.write_verbose_log('Stopping passenger worker process')
+        Honeybadger::Monitor.worker.stop
+      end
+    end
+  end
+end

data/lib/honeybadger/integrations/sidekiq.rb

@@ -14,6 +14,7 @@ module Honeybadger
 
   Dependency.register do
     requirement { defined?(::Sidekiq) }
+    requirement { defined?(::Honeybadger::Monitor) }
 
     injection do
       ::Sidekiq.configure_server do |config|

data/lib/honeybadger/monitor/worker.rb

@@ -21,6 +21,8 @@ module Honeybadger
       end
 
       def start
+        Honeybadger.write_verbose_log('Starting worker')
+
         @thread = MetricsThread.new do
           begin
             until Thread.current[:should_exit] do
@@ -36,9 +38,24 @@ module Honeybadger
       end
 
       def stop
+        Honeybadger.write_verbose_log('Stopping worker')
         @thread[:should_exit] = true if @thread
       end
 
+      def fork
+        Honeybadger.write_verbose_log('Forking worker')
+
+        stop
+
+        @lock.unlock if @lock.locked?
+        @lock.synchronize do
+          init_metrics
+          init_traces
+        end
+
+        start
+      end
+
       def timing(name, value)
         add_metric(name, value, :timing)
       end
@@ -94,6 +111,9 @@ module Honeybadger
         def send_metrics
           metrics = collect_metrics
           return unless metrics[:timing].any? || metrics[:counter].any?
+
+          Honeybadger.write_verbose_log('Sending metrics')
+
           [].tap do |m|
             metrics[:counter].each do |metric, values|
               m << "#{metric} #{values.sum}"
@@ -117,7 +137,12 @@ module Honeybadger
         end
 
         def send_traces
-          collect_traces.each_slice(@per_request) do |t|
+          traces = collect_traces
+          return unless traces.any?
+
+          Honeybadger.write_verbose_log('Sending traces')
+
+          traces.each_slice(@per_request) do |t|
             begin
               @sender.send_traces({ :traces => t.compact.map(&:to_h), :environment => Honeybadger.configuration.environment_name, :hostname => Honeybadger.configuration.hostname })
             rescue Exception => e

data/spec/honeybadger/integrations/passenger_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe "Passenger integration" do
+  before do
+    Honeybadger::Dependency.reset!
+  end
+
+  context "when passenger is not installed" do
+    it "fails quietly" do
+      expect { Honeybadger::Dependency.inject! }.not_to raise_error
+    end
+  end
+
+  context "when passenger is installed" do
+    let(:shim) { double('PhusionPassenger') }
+
+    before do
+      Object.const_set(:PhusionPassenger, shim)
+    end
+    after { Object.send(:remove_const, :PhusionPassenger) }
+
+    it "installs passenger hooks" do
+      shim.should_receive(:on_event).with(:starting_worker_process)
+      shim.should_receive(:on_event).with(:stopping_worker_process)
+      Honeybadger::Dependency.inject!
+    end
+  end
+end
+

data/spec/honeybadger/monitor/worker_spec.rb

@@ -12,6 +12,31 @@ describe Honeybadger::Monitor::Worker do
     instance.stub(:metrics) { instance.instance_variable_get(:@metrics) }
     instance.stub(:traces) { instance.instance_variable_get(:@traces) }
     instance.stub(:sender) { instance.instance_variable_get(:@sender) }
+    instance.stub(:thread) { instance.instance_variable_get(:@thread) }
+    instance.stub(:lock) { instance.instance_variable_get(:@lock) }
+  end
+
+  describe "#fork" do
+    before { Thread.unstub(:new) }
+    before { Honeybadger.stub(:write_verbose_log) }
+    before { subject.start }
+    after { subject.stop }
+
+    it "logs debug information" do
+      Honeybadger.should_receive(:write_verbose_log).with(/forking/i)
+      subject.fork
+    end
+
+    it "restarts the worker thread" do
+      old_thread = instance.thread
+      subject.fork
+      expect(instance.thread).not_to be old_thread
+    end
+
+    it "unlocks the mutex first" do
+      instance.lock.lock
+      expect { subject.fork }.not_to raise_error
+    end
   end
 
   describe '#initialize' do

data/spec/honeybadger/sender_spec.rb

@@ -9,6 +9,12 @@ describe Honeybadger::Sender do
     Honeybadger.notify(RuntimeError.new('oops!'))
   end
 
+  it "sends a user agent with version number" do
+    http  = stub_http
+    http.should_receive(:post).with(kind_of(String), kind_of(String), hash_including({'User-Agent' => "HB-Ruby #{Honeybadger::VERSION}; #{RUBY_VERSION}; #{RUBY_PLATFORM}"}))
+    send_exception
+  end
+
   it "posts to Honeybadger when using an HTTP proxy" do
     http  = stub_http
     proxy = double(:new => http)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.15.3
 platform: ruby
 authors:
 - Joshua Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -261,6 +261,7 @@ files:
 - lib/honeybadger/integrations/delayed_job.rb
 - lib/honeybadger/integrations/delayed_job/plugin.rb
 - lib/honeybadger/integrations/net_http.rb
+- lib/honeybadger/integrations/passenger.rb
 - lib/honeybadger/integrations/sidekiq.rb
 - lib/honeybadger/integrations/thor.rb
 - lib/honeybadger/monitor.rb
@@ -301,6 +302,7 @@ files:
 - spec/honeybadger/exception_extensions_spec.rb
 - spec/honeybadger/integrations/delayed_job_spec.rb
 - spec/honeybadger/integrations/net_http_spec.rb
+- spec/honeybadger/integrations/passenger_spec.rb
 - spec/honeybadger/integrations/sidekiq_spec.rb
 - spec/honeybadger/integrations/thor_spec.rb
 - spec/honeybadger/logger_spec.rb