honeybadger 1.14.0 → 1.15.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Honeybadger 1.15.0 ##
+
+* Send traces for slow requests.
+
+  *Benjamin Curtis*
+
 ## Honeybadger 1.14.0 ##
 
 * Catch exceptions in Thor tasks.

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    honeybadger (1.14.0)
+    honeybadger (1.15.0)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
     appraisal (0.5.1)
       bundler
       rake
@@ -25,8 +24,6 @@ GEM
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
     coderay (1.1.0)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
     cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -98,7 +95,6 @@ GEM
     rspec-instafail (0.2.4)
     rspec-mocks (2.14.3)
     ruby-progressbar (1.2.0)
-    safe_yaml (0.9.7)
     sham_rack (1.3.4)
       rack
     sinatra (1.0)
@@ -107,9 +103,6 @@ GEM
     spoon (0.0.4)
       ffi
     thor (0.18.1)
-    webmock (1.15.2)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
 
 PLATFORMS
   java
@@ -129,4 +122,3 @@ DEPENDENCIES
   rspec (~> 2.14.0)
   sham_rack (~> 1.3.0)
   sinatra
-  webmock

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.14.0'
-  s.date              = '2014-05-28'
+  s.version           = '1.15.0'
+  s.date              = '2014-06-11'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'
@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('appraisal')
   s.add_development_dependency('fuubar')
   s.add_development_dependency('growl')
-  s.add_development_dependency('webmock')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -100,11 +99,13 @@ Gem::Specification.new do |s|
     lib/honeybadger/integrations.rb
     lib/honeybadger/integrations/delayed_job.rb
     lib/honeybadger/integrations/delayed_job/plugin.rb
+    lib/honeybadger/integrations/net_http.rb
     lib/honeybadger/integrations/sidekiq.rb
     lib/honeybadger/integrations/thor.rb
     lib/honeybadger/monitor.rb
     lib/honeybadger/monitor/railtie.rb
     lib/honeybadger/monitor/sender.rb
+    lib/honeybadger/monitor/trace.rb
     lib/honeybadger/monitor/worker.rb
     lib/honeybadger/notice.rb
     lib/honeybadger/payload.rb
@@ -138,9 +139,11 @@ Gem::Specification.new do |s|
     spec/honeybadger/dependency_spec.rb
     spec/honeybadger/exception_extensions_spec.rb
     spec/honeybadger/integrations/delayed_job_spec.rb
+    spec/honeybadger/integrations/net_http_spec.rb
     spec/honeybadger/integrations/sidekiq_spec.rb
     spec/honeybadger/integrations/thor_spec.rb
     spec/honeybadger/logger_spec.rb
+    spec/honeybadger/monitor/trace_spec.rb
     spec/honeybadger/monitor/worker_spec.rb
     spec/honeybadger/notice_spec.rb
     spec/honeybadger/notifier_spec.rb

data/lib/honeybadger.rb

@@ -19,7 +19,7 @@ require 'honeybadger/exception_extensions'
 require 'honeybadger/railtie' if defined?(Rails::Railtie)
 
 module Honeybadger
-  VERSION = '1.14.0'
+  VERSION = '1.15.0'
   LOG_PREFIX = "** [Honeybadger] "
 
   HEADERS = {
@@ -105,10 +105,15 @@ module Honeybadger
             configuration.features = features
 
             unless features['metrics']
-              write_verbose_log("The optional metrics feature is not enabled for your account.  Try restarting your app or contacting support@honeybadger.io if your subscription includes this feature.", :error)
+              write_verbose_log("The optional metrics feature is not enabled for your account.  Try restarting your app or contacting support@honeybadger.io if your subscription includes this feature.", :warn)
               configuration.metrics = false
             end
 
+            unless features['traces']
+              write_verbose_log("The optional traces feature is not enabled for your account.  Try restarting your app or contacting support@honeybadger.io if your subscription includes this feature.", :warn)
+              configuration.traces = false
+            end
+
             features
           end
         end

data/lib/honeybadger/configuration.rb

@@ -9,7 +9,7 @@ module Honeybadger
                :proxy_port, :proxy_user, :secure, :use_system_ssl_cert_chain, :framework,
                :user_information, :feedback, :rescue_rake_exceptions, :source_extract_radius,
                :send_request_session, :debug, :fingerprint, :hostname, :features, :metrics,
-               :log_exception_on_send_failure, :send_local_variables].freeze
+               :log_exception_on_send_failure, :send_local_variables, :traces, :trace_threshold].freeze
 
     # The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -61,6 +61,9 @@ module Honeybadger
     # A list of user agents that are being ignored. The array can be appended to.
     attr_reader :ignore_user_agent
 
+    # Traces must have a duration greater than this (in ms) to be recorded
+    attr_reader :trace_threshold
+
     # A list of environments in which notifications should not be sent.
     attr_accessor :development_environments
 
@@ -122,6 +125,9 @@ module Honeybadger
     # Send metrics?
     attr_accessor :metrics
 
+    # Send traces?
+    attr_accessor :traces
+
     # Which features the API says we have
     attr_accessor :features
 
@@ -185,8 +191,10 @@ module Honeybadger
       @hostname                      = Socket.gethostname
       @metrics                       = true
       @features                      = {'notices' => true, 'local_variables' => true}
+      @traces                        = true
       @limit                         = nil
       @feedback                      = true
+      @trace_threshold               = 2000
     end
 
     # Public: Takes a block and adds it to the list of backtrace filters. When
@@ -242,6 +250,10 @@ module Honeybadger
       @ignore_user_agent = [names].flatten
     end
 
+    def trace_threshold=(threshold)
+      @trace_threshold = [threshold, 1000].max
+    end
+
     # Public: Allows config options to be read like a hash
     #
     # option - Key for a given attribute
@@ -282,6 +294,12 @@ module Honeybadger
       public? && @metrics
     end
 
+    # Public: Determines whether to send traces
+    #
+    def traces?
+      public? && @traces
+    end
+
     # Public: Configure async delivery
     #
     # block - An optional block containing an async handler

data/lib/honeybadger/integrations.rb

@@ -3,3 +3,4 @@ module Honeybadger::Integrations; end
 require 'honeybadger/integrations/delayed_job'
 require 'honeybadger/integrations/sidekiq'
 require 'honeybadger/integrations/thor'
+require 'honeybadger/integrations/net_http'

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

@@ -5,7 +5,9 @@ module Honeybadger
         callbacks do |lifecycle|
           lifecycle.around(:invoke_job) do |job, &block|
             begin
-              block.call(job)
+              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
             rescue Exception => error
               ::Honeybadger.notify_or_ignore(
                 :error_class   => error.class.name,

data/lib/honeybadger/integrations/net_http.rb

@@ -0,0 +1,33 @@
+module Honeybadger
+  module Integrations
+    module NetHttp
+      module Instrumentation
+        def self.included(base)
+          base.send(:alias_method, :request_without_honeybadger, :request)
+          base.send(:alias_method, :request, :request_with_honeybadger)
+        end
+
+        def request_with_honeybadger(*args, &block)
+          request = args[0]
+          uri = request.path.match(%r{https?://}) ? URI(request.path) : URI("http#{use_ssl? ? 's' : ''}://#{address}:#{port}#{request.path}")
+
+          if uri.host.match("honeybadger.io")
+            return request_without_honeybadger(*args, &block)
+          end
+
+          ActiveSupport::Notifications.instrument("net_http.request", { :uri => uri, :method => request.method }) do
+            request_without_honeybadger(*args, &block)
+          end
+        end
+      end
+    end
+  end
+
+  Dependency.register do
+    requirement { defined?(::ActiveSupport::Notifications) }
+    requirement { defined?(::Net::HTTP) }
+    requirement { Honeybadger.configuration.traces? }
+
+    injection { ::Net::HTTP.send(:include, Integrations::NetHttp::Instrumentation) }
+  end
+end

data/lib/honeybadger/integrations/sidekiq.rb

@@ -4,7 +4,9 @@ module Honeybadger
       class Middleware
         def call(worker, msg, queue)
           Honeybadger.context.clear!
-          yield
+          Honeybadger::Monitor::Trace.instrument("#{msg['class']}#perform", { :source => 'sidekiq', :jid => msg['jid'], :class => msg['class'] }) do
+            yield
+          end
         end
       end
     end

data/lib/honeybadger/monitor.rb

@@ -1,6 +1,7 @@
 require "honeybadger/array"
 require "honeybadger/monitor/sender"
 require "honeybadger/monitor/worker"
+require "honeybadger/monitor/trace"
 require "honeybadger/monitor/railtie" if defined?(Rails)
 
 module Honeybadger

data/lib/honeybadger/monitor/railtie.rb

@@ -3,8 +3,35 @@ module Honeybadger
     class Railtie < ::Rails::Railtie
 
       config.after_initialize do
-        if Honeybadger.configuration.metrics?
+        if Honeybadger.configuration.traces?
+          ActiveSupport::Notifications.subscribe('start_processing.action_controller') do |name, started, finished, id, data|
+            Trace.create(id)
+          end
+
+          ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
+            event = ActiveSupport::Notifications::Event.new(*args)
+            Monitor.worker.trace.add(event) if Monitor.worker.trace and event.name != 'SCHEMA'
+          end
+
+          ActiveSupport::Notifications.subscribe(/^render_(template|action|collection)\.action_view/) do |*args|
+            event = ActiveSupport::Notifications::Event.new(*args)
+            Monitor.worker.trace.add(event) if Monitor.worker.trace
+          end
+
+          ActiveSupport::Notifications.subscribe('net_http.request') do |*args|
+            event = ActiveSupport::Notifications::Event.new(*args)
+            Monitor.worker.trace.add(event) if Monitor.worker.trace
+          end
 
+          ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
+            event = ActiveSupport::Notifications::Event.new(*args)
+            if event.payload[:controller] && event.payload[:action] && Monitor.worker.trace
+              Monitor.worker.trace.complete(event)
+            end
+          end
+        end
+
+        if Honeybadger.configuration.metrics?
           ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
             event = ActiveSupport::Notifications::Event.new(*args)
             status = event.payload[:exception] ? 500 : event.payload[:status]
@@ -18,7 +45,6 @@ module Honeybadger
               Monitor.worker.timing("app.controller.#{controller}.#{action}.db", event.payload[:db_runtime]) if event.payload[:db_runtime]
             end
           end
-
         end
       end
 

data/lib/honeybadger/monitor/sender.rb

@@ -10,6 +10,7 @@ module Honeybadger
         end
 
         if Net::HTTPSuccess === response
+          log(:info, "Metrics Success: #{response.class}", response, data) if Honeybadger.configuration.debug
           true
         else
           Honeybadger.configuration.features['metrics'] = false if Net::HTTPForbidden === response
@@ -21,6 +22,27 @@ module Honeybadger
         true
       end
 
+      def send_traces(data)
+        return unless Honeybadger.configuration.traces?
+        return unless Honeybadger.configuration.features['traces']
+
+        response = rescue_http_errors do
+          http_connection.post('/v1/traces', data.to_json, http_headers)
+        end
+
+        if Net::HTTPSuccess === response
+          log(:info, "Traces Success: #{response.class}", response, data) if Honeybadger.configuration.debug
+          true
+        else
+          Honeybadger.configuration.features['traces'] = false if Net::HTTPForbidden === response
+          log(:error, "Traces Failure: #{response.class}", response, data)
+          false
+        end
+      rescue => e
+        log(:error, "[Honeybadger::Monitor::Sender#send_traces] Error: #{e.class} - #{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}")
+        true
+      end
+
     end
   end
 end

data/lib/honeybadger/monitor/trace.rb

@@ -0,0 +1,170 @@
+require 'securerandom'
+
+module Honeybadger
+  module Monitor
+    class Trace
+      UUIDS_ENABLED = SecureRandom.respond_to?(:uuid).freeze
+
+      attr_reader :id, :duration, :key
+
+      def self.create(id)
+        Thread.current[:hb_trace_id] = id
+        Monitor.worker.pending_traces[id] = new(id)
+      end
+
+      def self.instrument(key, payload = {}, &block)
+        create(generate_secure_id).instrument(key, payload, &block)
+      end
+
+      def self.generate_secure_id
+        UUIDS_ENABLED ? SecureRandom.uuid : SecureRandom.hex
+      end
+
+      def initialize(id)
+        @id = id
+        @events = []
+        @meta = {}
+        @duration = 0
+      end
+
+      def add(event)
+        ce = clean_event(event)
+        @events << ce.to_a if ce.render?
+      end
+
+      def complete(event)
+        @meta = clean_event(event).to_h
+        @duration = event.duration
+        @key = "#{event.payload[:controller]}##{event.payload[:action]}"
+        Monitor.worker.queue_trace
+      end
+
+      def instrument(key, payload)
+        @key = key
+        @meta = payload
+        started = Time.now
+        yield
+      rescue Exception => e
+        @meta[:exception] = [e.class.name, e.message]
+        raise e
+      ensure
+        @meta.merge!(:duration => @duration = 1000.0 * (Time.now - started))
+        Monitor.worker.queue_trace
+      end
+
+      def to_h
+        @meta.merge({ :events => @events, :key => @key })
+      end
+
+      protected
+
+        def clean_event(event)
+          TraceCleaner.create(event)
+        end
+
+    end
+
+    module TraceCleaner
+
+      def self.create(event)
+        Classes[event.name].new(event)
+      end
+
+      class Base
+        attr_reader :event
+
+        def initialize(event)
+          @event = event
+        end
+
+        def render?
+          true
+        end
+
+        def payload
+          event.payload
+        end
+
+        def to_s
+          payload[:path] || payload[:key] || payload.inspect
+        end
+
+        def to_h
+          { :name => event.name, :desc => to_s, :duration => event.duration }
+        end
+
+        def to_a
+          [ event.name, event.duration, to_s ]
+        end
+
+      end
+
+      class NetHttpRequest < Base
+        Replacement = "..."
+        def to_s
+          uri = payload[:uri]
+          uri.user = Replacement if uri.user
+          uri.password = Replacement if uri.password
+          uri.query = Replacement if uri.query
+          "#{payload[:method]} #{uri}"
+        end
+      end
+
+      class ActiveRecord < Base
+        Schema = "SCHEMA".freeze
+        SchemaMigrations = /schema_migrations/.freeze
+        EscapedQuotes = /(\\"|\\')/.freeze
+        SQuotedData = /'(?:[^']|'')*'/.freeze
+        DQuotedData = /"(?:[^"]|"")*"/.freeze
+        NumericData = /\b\d+\b/.freeze
+        Newline = /\n/.freeze
+        Replacement = "?".freeze
+        EmptyReplacement = "".freeze
+        DoubleQuoters = /(postgres|sqlite|postgis)/.freeze
+
+        def render?
+          event.payload[:name] != Schema && !event.payload[:sql].match(SchemaMigrations)
+        end
+
+        def to_s
+          return "Super long query" if event.payload[:sql].length > 1024
+          sql = event.payload[:sql]
+          sql = sql.gsub(EscapedQuotes, EmptyReplacement).gsub(SQuotedData, Replacement)
+          sql = sql.gsub(DQuotedData, Replacement) unless ::ActiveRecord::Base.connection_config[:adapter] =~ DoubleQuoters
+          sql.gsub(NumericData, Replacement).gsub(Newline, EmptyReplacement).squeeze(' ')
+        end
+      end
+
+      class ActionView < Base
+        EmptyReplacement = "".freeze
+
+        def to_s
+          event.payload[:identifier].to_s.gsub(::Rails.root.to_s + '/', EmptyReplacement)
+        end
+      end
+
+      class ActionController < Base
+        def payload
+          event.payload.reject {|k, v| k == :params }
+        end
+
+        def to_s
+          payload.inspect
+        end
+
+        def to_h
+          payload.merge({ :duration => event.duration })
+        end
+      end
+
+      Classes = Hash.new(Base).merge({
+        'sql.active_record' => ActiveRecord,
+        'render_template.action_view' => ActionView,
+        'render_partial.action_view' => ActionView,
+        'render_collection.action_view' => ActionView,
+        'process_action.action_controller' => ActionController,
+        'net_http.request' => NetHttpRequest
+      })
+    end
+  end
+end

data/lib/honeybadger/monitor/worker.rb

@@ -11,7 +11,8 @@ module Honeybadger
 
       def initialize
         init_metrics
-        @delay = 60
+        init_traces
+        @delay = defined?(::Rails) && ::Rails.env.development? ? 10 : 60
         @per_request = 100
         @sender = Monitor::Sender.new(Honeybadger.configuration)
         @lock = Mutex.new
@@ -21,9 +22,15 @@ module Honeybadger
 
       def start
         @thread = MetricsThread.new do
-          until Thread.current[:should_exit] do
-            send_metrics
-            sleep @delay
+          begin
+            until Thread.current[:should_exit] do
+              send_metrics
+              send_traces
+              sleep @delay
+            end
+          rescue Exception => e
+            Honeybadger.write_verbose_log("Error in MetricsThread (shutting down): #{e.class} - #{e.message}\n#{e.backtrace.join("\n\t")}", :error)
+            raise e
           end
         end
       end
@@ -40,12 +47,34 @@ module Honeybadger
         add_metric(name, value, :counter)
       end
 
+      def pending_traces
+        @pending_traces ||= {}
+      end
+
+      def trace
+        Thread.current[:hb_trace_id] ? @pending_traces[Thread.current[:hb_trace_id]] : nil
+      end
+
+      def queue_trace
+        @lock.synchronize do
+          if trace.duration > Honeybadger.configuration.trace_threshold && (!@traces[trace.key] || @traces[trace.key].duration < trace.duration)
+            @traces[trace.key] = trace
+          end
+          @pending_traces[Thread.current[:hb_trace_id]] = nil
+          Thread.current[:hb_trace_id] = nil
+        end
+      end
+
       protected
 
         def init_metrics
           @metrics = { :timing => {}, :counter => {} }
         end
 
+        def init_traces
+          @traces = {}
+        end
+
         def collect_metrics
           @lock.synchronize do
             metrics = @metrics
@@ -54,6 +83,14 @@ module Honeybadger
           end
         end
 
+        def collect_traces
+          @lock.synchronize do
+            traces = @traces.values
+            init_traces
+            traces
+          end
+        end
+
         def send_metrics
           metrics = collect_metrics
           return unless metrics[:timing].any? || metrics[:counter].any?
@@ -79,6 +116,16 @@ module Honeybadger
           end
         end
 
+        def send_traces
+          collect_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
+              log(:error, "[Honeybadger::Monitor::Worker#send_traces] Failed to send #{t.count} metrics: #{e.class} - #{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}")
+            end
+          end
+        end
+
         def add_metric(name, value, kind)
           @lock.synchronize do
             (@metrics[kind][name] ||= Honeybadger::Array.new) << value

data/lib/honeybadger/railtie.rb

@@ -1,5 +1,4 @@
 require 'honeybadger'
-require 'honeybadger/monitor'
 require 'rails'
 
 module Honeybadger
@@ -44,8 +43,12 @@ module Honeybadger
         ::ActionDispatch::ShowExceptions.send(:include,Honeybadger::Rails::Middleware::ExceptionsCatcher)
       end
 
-      Honeybadger::Dependency.inject!
       Honeybadger.ping(Honeybadger.configuration)
+
+      # Inject last, in case we're depending on configuration from ping.
+      Honeybadger::Dependency.inject!
     end
   end
 end
+
+require 'honeybadger/monitor'

data/spec/honeybadger/configuration_spec.rb

@@ -252,6 +252,24 @@ describe Honeybadger::Configuration do
     expect(Honeybadger.configuration).to be_a Honeybadger::Configuration
   end
 
+  describe '#trace_threshold=' do
+    let(:config) { Honeybadger::Configuration.new }
+
+    subject { config.trace_threshold = value; config.trace_threshold }
+
+    context "value is above 1000" do
+      let(:value) { 2000 }
+
+      it { should eq 2000 }
+    end
+
+    context "value is below 1000" do
+      let(:value) { 100 }
+
+      it { should eq 1000 }
+    end
+  end
+
   def assert_config_default(option, default_value, config = nil)
     config ||= Honeybadger::Configuration.new
     expect(config.send(option)).to eq default_value

data/spec/honeybadger/integrations/net_http_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+begin
+  require 'active_support/notifications'
+rescue LoadError
+  nil
+end
+
+describe "Net::HTTP Dependency" do
+  before do
+    Honeybadger::Dependency.reset!
+  end
+
+  if defined?(ActiveSupport::Notifications)
+    context "when active support notifications are installed" do
+      it "installs instrumentation" do
+        Honeybadger::Dependency.inject!
+        expect(Net::HTTP.instance_method(:request)).to eq Net::HTTP.instance_method(:request_with_honeybadger)
+      end
+    end
+  else
+    context "when active support notifications are not installed" do
+      it "does not install instrumentation" do
+        Honeybadger::Dependency.inject!
+        expect(Net::HTTP.instance_methods).not_to include(:request_with_honeybadger)
+      end
+    end
+  end
+end

data/spec/honeybadger/logger_spec.rb

@@ -55,20 +55,22 @@ describe Honeybadger do
   context "429 error response" do
     let(:failure_class) do
       if RUBY_VERSION !~ /^1/
-        'Net::HTTPTooManyRequests'
+        Net::HTTPTooManyRequests
       else
-        'Net::HTTPClientError'
+        Net::HTTPClientError
       end
     end
 
+    let(:http) { stub_http(:response => failure_class.new('1.2', '429', 'Peace out'), :body => '{"error":"something went wrong"}') }
+
     before do
       reset_config
       stub_verbose_log
-      stub_request(:post, /api\.honeybadger\.io\/v1\/notices/).to_return(:status => 429, :body => '{"error":"something went wrong"}')
     end
 
     it "logs the response" do
-      Honeybadger.should_receive(:write_verbose_log).with(/Failure: #{failure_class}/, :error)
+      http.should_receive(:post).with(Honeybadger::Sender::NOTICES_URI, kind_of(String), kind_of(Hash))
+      Honeybadger.should_receive(:write_verbose_log).with(/Failure: #{failure_class.name}/, :error)
       Honeybadger.should_receive(:write_verbose_log).with(/Environment Info:/)
       Honeybadger.should_receive(:write_verbose_log).with(/something went wrong/)
       Honeybadger.notify(RuntimeError.new('oops!'))

data/spec/honeybadger/monitor/trace_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'honeybadger/monitor'
+
+describe Honeybadger::Monitor::Trace do
+  describe "::instrument" do
+    it "creates a new trace" do
+      Honeybadger::Monitor::Trace.should_receive(:new).and_call_original
+      described_class.instrument('testing', {}){}
+    end
+  end
+end

data/spec/honeybadger/monitor/worker_spec.rb

@@ -8,8 +8,9 @@ describe Honeybadger::Monitor::Worker do
   before(:each) do
     Thread.stub(:new)
 
-    # Create an attr_reader for @metrics and @sender
+    # Create attr_readers for testing values
     instance.stub(:metrics) { instance.instance_variable_get(:@metrics) }
+    instance.stub(:traces) { instance.instance_variable_get(:@traces) }
     instance.stub(:sender) { instance.instance_variable_get(:@sender) }
   end
 
@@ -29,6 +30,12 @@ describe Honeybadger::Monitor::Worker do
       end
     end
 
+    describe '@traces' do
+      subject { instance.traces }
+
+      it { should be_empty }
+    end
+
     describe '@delay' do
       subject { instance.instance_variable_get(:@delay) }
       it { should eq 60 }

data/spec/honeybadger/notifier_spec.rb

@@ -48,6 +48,7 @@ describe 'Honeybadger' do
 
       context "result is truthy" do
         before { sender.should_receive(:ping).and_return(result) }
+        before { Honeybadger.stub(:write_verbose_log) }
 
         context "result does not contain features" do
           let(:result) { {} }
@@ -66,7 +67,17 @@ describe 'Honeybadger' do
           specify { expect { invoke_subject }.to change(config, :metrics).to(false) }
 
           it "logs that metrics are disabled" do
-            Honeybadger.should_receive(:write_verbose_log).with(/metrics feature is not enabled/, :error)
+            Honeybadger.should_receive(:write_verbose_log).with(/metrics feature is not enabled/, :warn)
+            invoke_subject
+          end
+        end
+
+        context "traces are disabled by service" do
+          let(:result) { {'features' => {'traces' => false}} }
+          specify { expect { invoke_subject }.to change(config, :traces).to(false) }
+
+          it "logs that traces are disabled" do
+            Honeybadger.should_receive(:write_verbose_log).with(/traces feature is not enabled/, :warn)
             invoke_subject
           end
         end

data/spec/honeybadger/sender_spec.rb

@@ -2,14 +2,11 @@ require 'spec_helper'
 
 describe Honeybadger::Sender do
   before { reset_config }
-
-  before do
-    stub_request(:post, /api\.honeybadger\.io\/v1\/notices/).to_return(:body => '{"id":"123"}')
-  end
+  let(:http) { stub_http }
 
   it "makes a single request when sending notices" do
+    http.should_receive(:post).with(Honeybadger::Sender::NOTICES_URI, kind_of(String), kind_of(Hash))
     Honeybadger.notify(RuntimeError.new('oops!'))
-    assert_requested :post, 'https://api.honeybadger.io/v1/notices/', :times => 1
   end
 
   it "posts to Honeybadger when using an HTTP proxy" do
@@ -49,16 +46,16 @@ describe Honeybadger::Sender do
     context 'notice is a hash' do
       it 'uses api_key from hash when present' do
         sender = build_sender(:api_key => 'asdf')
+        http.should_receive(:post).with(Honeybadger::Sender::NOTICES_URI, kind_of(String), hash_including('X-API-Key' => 'zxcv'))
         send_exception(:sender => sender, :notice => { 'api_key' => 'zxcv' })
-        assert_requested :post, 'https://api.honeybadger.io/v1/notices/', :times => 1, :headers => { 'x-api-key' => 'zxcv' }
       end
     end
 
     context 'notice is a Honeybadger::Notice' do
       it 'uses api_key from notice when present' do
         sender = build_sender(:api_key => 'asdf')
+        http.should_receive(:post).with(Honeybadger::Sender::NOTICES_URI, kind_of(String), hash_including('X-API-Key' => 'zxcv'))
         send_exception(:sender => sender, :notice => Honeybadger::Notice.new(:api_key => 'zxcv'))
-        assert_requested :post, 'https://api.honeybadger.io/v1/notices/', :times => 1, :headers => { 'x-api-key' => 'zxcv' }
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'rspec'
 require 'honeybadger'
-require 'webmock/rspec'
 
 # Require files in spec/support/ and its subdirectories.
 Dir[File.expand_path('../../spec/support/**/*.rb', __FILE__)].each {|f| require f}

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
+  prerelease: 
 platform: ruby
 authors:
 - Joshua Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,113 +110,113 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Make managing application errors a more pleasant experience.
@@ -274,11 +287,13 @@ files:
 - lib/honeybadger/integrations.rb
 - lib/honeybadger/integrations/delayed_job.rb
 - lib/honeybadger/integrations/delayed_job/plugin.rb
+- lib/honeybadger/integrations/net_http.rb
 - lib/honeybadger/integrations/sidekiq.rb
 - lib/honeybadger/integrations/thor.rb
 - lib/honeybadger/monitor.rb
 - lib/honeybadger/monitor/railtie.rb
 - lib/honeybadger/monitor/sender.rb
+- lib/honeybadger/monitor/trace.rb
 - lib/honeybadger/monitor/worker.rb
 - lib/honeybadger/notice.rb
 - lib/honeybadger/payload.rb
@@ -312,9 +327,11 @@ files:
 - spec/honeybadger/dependency_spec.rb
 - spec/honeybadger/exception_extensions_spec.rb
 - spec/honeybadger/integrations/delayed_job_spec.rb
+- spec/honeybadger/integrations/net_http_spec.rb
 - spec/honeybadger/integrations/sidekiq_spec.rb
 - spec/honeybadger/integrations/thor_spec.rb
 - spec/honeybadger/logger_spec.rb
+- spec/honeybadger/monitor/trace_spec.rb
 - spec/honeybadger/monitor/worker_spec.rb
 - spec/honeybadger/notice_spec.rb
 - spec/honeybadger/notifier_spec.rb
@@ -335,7 +352,6 @@ files:
 - spec/support/helpers.rb
 homepage: http://www.honeybadger.io
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -343,18 +359,23 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4388463689066388096
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: Error reports you can be happy about.

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 75f654d44aa6fb5226d1a12be042c7265bd3d26b
-  data.tar.gz: 8bdea660c9780b0bab2369852d40e4f2ad50238f
-SHA512:
-  metadata.gz: b6d6e31805c4ced6597e3f37fac9525163709fc4dbf1c247a8723940261b0154160dbe9e0afcda23e97cca07e657bea76ac1635e0a61a06b3b6e69f3593298b2
-  data.tar.gz: ebd6fdc8f7ee8245f859ee288751c8289a34aa40cbcbd9b5e286cf7d909748788a5970235d5f6b7db72b6e48467037d5af98390e4ddc031e41edd03461a8045b