airbrake-ruby 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d15481adc9973cf21c5302ab3cd3dbb365d4891
-  data.tar.gz: 94b9535ca5be9f4a28a75a24548516755cf5945e
+  metadata.gz: feeb44b47c5b58cdf1f478065f84640af9102ab9
+  data.tar.gz: 2319d39125a79fb075a3a629fa3dc8c927e95dc2
 SHA512:
-  metadata.gz: 2426fc74599daab97fe712b40b1f9d8a3a899ef721cd28091e86aa88a91c8bbd16e727452ca70a564f80863b4c32d95cf428f78f4db5fc376fc389bb589fd5dc
-  data.tar.gz: f04c48e0820d3b96c61618c08403845ca4730acc08eb4e68f8668cc52ce6365b28d35d0b4ab5293a22d5290e2863c1d4f100d57bc81fe14162f9c4fce67e9458
+  metadata.gz: 78028e33ffe3b0929fc6f5e26b18933d39df58edade9cbf45bd1ca9025d2121201cbf8fa114f9c9ff5614336d2521012d44d9b05dfadb0af08d9710ee40b3bcd
+  data.tar.gz: 14e8924670cac95429572ca814d61421459797059a357a39cf23b18241bf8cb9ff084bbb5b6357441e4f85ae5e11cbff2aa18e24668ec03bc493cb45131dbe8a

data/lib/airbrake-ruby/async_sender.rb

@@ -24,6 +24,8 @@ module Airbrake
     #   library
     # @return [nil]
     def send(notice)
+      return will_not_deliver(notice) if @unsent.size >= @unsent.max
+
       @unsent << notice
       nil
     end
@@ -99,5 +101,17 @@ module Airbrake
         end
       end
     end
+
+    def will_not_deliver(notice)
+      backtrace = notice[:errors][0][:backtrace].map do |line|
+        "#{line[:file]}:#{line[:line]} in `#{line[:function]}'"
+      end
+      @config.logger.error(
+        "#{LOG_LABEL} AsyncSender has reached its capacity of "                   \
+        "#{@unsent.max} and the following notice will not be delivered "          \
+        "Error: #{notice[:errors][0][:type]} - #{notice[:errors][0][:message]}\n" \
+        "Backtrace: \n" + backtrace.join("\n"))
+      nil
+    end
   end
 end

data/lib/airbrake-ruby/config.rb

@@ -53,6 +53,10 @@ module Airbrake
     #   occurring exceptions.
     attr_accessor :ignore_environments
 
+    ##
+    # @return [Integer] The HTTP timeout in seconds.
+    attr_accessor :timeout
+
     ##
     # @param [Hash{Symbol=>Object}] user_config the hash to be used to build the
     #   config
@@ -70,6 +74,8 @@ module Airbrake
 
       self.ignore_environments = []
 
+      self.timeout = user_config[:timeout]
+
       merge(user_config)
     end
 

data/lib/airbrake-ruby/filters/keys_filter.rb

@@ -55,7 +55,13 @@ module Airbrake
 
       def filter_url_params(url)
         url.query = Hash[URI.decode_www_form(url.query)].map do |key, val|
-          should_filter?(key) ? "#{key}=[Filtered]" : "#{key}=#{val}"
+          # Ruby < 2.2 raises InvalidComponentError if the query contains
+          # invalid characters, so be sure to escape individual components.
+          if should_filter?(key)
+            "#{URI.encode_www_form_component(key)}=[Filtered]"
+          else
+            "#{URI.encode_www_form_component(key)}=#{URI.encode_www_form_component(val)}"
+          end
         end.join('&')
 
         url.to_s

data/lib/airbrake-ruby/sync_sender.rb

@@ -52,6 +52,10 @@ module Airbrake
     def build_https(uri)
       Net::HTTP.new(uri.host, uri.port, *proxy_params).tap do |https|
         https.use_ssl = uri.is_a?(URI::HTTPS)
+        if @config.timeout
+          https.open_timeout = @config.timeout
+          https.read_timeout = @config.timeout
+        end
       end
     end
 

data/lib/airbrake-ruby/version.rb

@@ -3,5 +3,5 @@
 module Airbrake
   ##
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '1.0.4'.freeze
+  AIRBRAKE_RUBY_VERSION = '1.1.0'.freeze
 end

data/spec/async_sender_spec.rb

@@ -6,20 +6,25 @@ RSpec.describe Airbrake::AsyncSender do
   end
 
   describe "#send" do
-    it "limits the size of the queue, but still sends all notices" do
+    it "limits the size of the queue" do
       stdout = StringIO.new
       notices_count = 1000
+      queue_size = 10
       config = Airbrake::Config.new(
-        logger: Logger.new(stdout), workers: 3, queue_size: 10
+        logger: Logger.new(stdout), workers: 3, queue_size: queue_size
       )
       sender = described_class.new(config)
       expect(sender).to have_workers
 
-      notices_count.times { |i| sender.send(i) }
+      notice = Airbrake::Notice.new(config, AirbrakeTestError.new)
+      notices_count.times { sender.send(notice) }
       sender.close
 
       log = stdout.string.split("\n")
-      expect(log.grep(/\*\*Airbrake: \{\}/).size).to eq(notices_count)
+      notices_sent    = log.grep(/\*\*Airbrake: \{\}/).size
+      notices_dropped = log.grep(/\*\*Airbrake:.*not.*delivered/).size
+      expect(notices_sent).to be >= queue_size
+      expect(notices_sent + notices_dropped).to eq(notices_count)
     end
   end
 
@@ -43,7 +48,8 @@ RSpec.describe Airbrake::AsyncSender do
 
     context "when there are some unsent notices" do
       before do
-        300.times { |i| @sender.send(i) }
+        notice = Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
+        300.times { @sender.send(notice) }
         expect(@sender.instance_variable_get(:@unsent).size).not_to be_zero
         @sender.close
       end
@@ -52,9 +58,12 @@ RSpec.describe Airbrake::AsyncSender do
         expect(@stderr.string).to match(/waiting to send \d+ unsent notice/)
       end
 
-      it "prints the debug message the correct number of times" do
+      it "prints the correct number of log messages" do
         log = @stderr.string.split("\n")
-        expect(log.grep(/\*\*Airbrake: \{\}/).size).to eq(300)
+        notices_sent    = log.grep(/\*\*Airbrake: \{\}/).size
+        notices_dropped = log.grep(/\*\*Airbrake:.*not.*delivered/).size
+        expect(notices_sent).to be >= @sender.instance_variable_get(:@unsent).max
+        expect(notices_sent + notices_dropped).to eq(300)
       end
 
       it "waits until the unsent notices queue is empty" do

data/spec/config_spec.rb

@@ -62,6 +62,10 @@ RSpec.describe Airbrake::Config do
       it "doesn't set default notify_environments" do
         expect(config.ignore_environments).to be_empty
       end
+
+      it "doesn't set default timeout" do
+        expect(config.timeout).to be_nil
+      end
     end
   end
 end

data/spec/notifier_spec.rb

@@ -539,13 +539,13 @@ RSpec.describe Airbrake::Notifier do
       @airbrake.blacklist_keys(%w(bish))
 
       notice = @airbrake.build_notice(ex)
-      notice[:context][:url] = 'http://localhost:3000/crash?foo=bar&baz=bongo&bish=bash'
+      notice[:context][:url] = 'http://localhost:3000/crash?foo=bar&baz=bongo&bish=bash&color=%23FFAAFF'
 
       @airbrake.notify_sync(notice)
 
       # rubocop:disable Metrics/LineLength
       expected_body =
-        %r("context":{.*"url":"http://localhost:3000/crash\?foo=bar&baz=bongo&bish=\[Filtered\]".*})
+        %r("context":{.*"url":"http://localhost:3000/crash\?foo=bar&baz=bongo&bish=\[Filtered\]&color=%23FFAAFF".*})
       # rubocop:enable Metrics/LineLength
 
       expect(

data/spec/sync_sender_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+RSpec.describe Airbrake::SyncSender do
+  describe "#build_https" do
+    it "overrides Net::HTTP's open_timeout and read_timeout if timeout is specified" do
+      config = Airbrake::Config.new(timeout: 10)
+      sender = described_class.new(config)
+      https = sender.__send__(:build_https, config.endpoint)
+      expect(https.open_timeout).to eq(10)
+      expect(https.read_timeout).to eq(10)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -122,6 +122,7 @@ files:
 - spec/notifier_spec/options_spec.rb
 - spec/payload_truncator_spec.rb
 - spec/spec_helper.rb
+- spec/sync_sender_spec.rb
 homepage: https://airbrake.io
 licenses:
 - MIT
@@ -147,15 +148,15 @@ signing_key:
 specification_version: 4
 summary: Ruby notifier for https://airbrake.io
 test_files:
-- spec/notifier_spec/options_spec.rb
-- spec/async_sender_spec.rb
-- spec/spec_helper.rb
-- spec/notifier_spec.rb
-- spec/payload_truncator_spec.rb
 - spec/airbrake_spec.rb
+- spec/async_sender_spec.rb
 - spec/backtrace_spec.rb
-- spec/nested_exception_spec.rb
-- spec/notice_spec.rb
 - spec/config_spec.rb
 - spec/filter_chain_spec.rb
-has_rdoc: 
+- spec/nested_exception_spec.rb
+- spec/notice_spec.rb
+- spec/notifier_spec/options_spec.rb
+- spec/notifier_spec.rb
+- spec/payload_truncator_spec.rb
+- spec/spec_helper.rb
+- spec/sync_sender_spec.rb