Merge pull request #484 from airbrake/483-nomethoderror-fix

async_sender: return a rejected promise when capacity is maxed out

CHANGELOG.md

@@ -3,6 +3,10 @@ Airbrake Ruby Changelog
 
 ### master
 
+* Fixed `AsyncSender` returning `nil` instead of a rejected promise when it
+  reaches its capacity
+  ([#484](https://github.com/airbrake/airbrake-ruby/pull/484))
+
 ### [v4.4.0][v4.4.0] (May 9, 2019)
 
 * Added `Airbrake::Query#stash`, `Airbrake::Request#stash`,

lib/airbrake-ruby/async_sender.rb

@@ -9,6 +9,12 @@ module Airbrake
   class AsyncSender
     include Loggable
 
+    # @return [String]
+    WILL_NOT_DELIVER_MSG =
+      "%<log_label>s AsyncSender has reached its capacity of %<capacity>s " \
+      "and the following notice will not be delivered " \
+      "Error: %<type>s - %<message>s\nBacktrace: %<backtrace>s\n".freeze
+
     # @return [ThreadGroup] the list of workers
     # @note This is exposed for eaiser unit testing
     # @since v4.0.0
@@ -36,7 +42,7 @@ def initialize
     #   library
     # @return [Airbrake::Promise]
     def send(notice, promise)
-      return will_not_deliver(notice) if @unsent.size >= @unsent.max
+      return will_not_deliver(notice, promise) if @unsent.size >= @unsent.max
 
       @unsent << [notice, promise]
       promise
@@ -115,17 +121,22 @@ def spawn_worker
       end
     end
 
-    def will_not_deliver(notice)
-      backtrace = notice[:errors][0][:backtrace].map do |line|
-        "#{line[:file]}:#{line[:line]} in `#{line[:function]}'"
-      end
+    def will_not_deliver(notice, promise)
+      error = notice[:errors].first
+
       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")
+        format(
+          WILL_NOT_DELIVER_MSG,
+          log_label: LOG_LABEL,
+          capacity: @unsent.max,
+          type: error[:type],
+          message: error[:message],
+          backtrace: error[:backtrace].map do |line|
+            "#{line[:file]}:#{line[:line]} in `#{line[:function]}'"
+          end.join("\n")
+        )
       )
-      nil
+      promise.reject("AsyncSender has reached its capacity of #{@unsent.max}")
     end
   end
 end

spec/async_sender_spec.rb

@@ -49,6 +49,14 @@
         end
         subject.close
       end
+
+      it "returns a rejected promise" do
+        promise = Airbrake::Promise.new
+        200.times { subject.send(notice, promise) }
+        expect(promise.value).to eq(
+          'error' => "AsyncSender has reached its capacity of #{queue_size}"
+        )
+      end
     end
   end