airbrake 7.3.3 → 7.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b725f58fb8bcbe584bcb48667958d69b6d624d3c
-  data.tar.gz: 51e95705e618dcdb841c8d7a2715e34add84aa64
+  metadata.gz: 8821368e7cec12e1d5c8595c65fd1b93c27027a3
+  data.tar.gz: 33a3fed7d6a7d6055ea01469213bf7adb5f3fa32
 SHA512:
-  metadata.gz: e62eb59355112c63942617ff37aad78f29b03ef28ddb734f9669432478d681b4e5ffe9694a2bb30e740055851cd3ee73c2f48a7da0d8696194efdd3125a822ed
-  data.tar.gz: cec780dee54d1fda0746110b27e45f88ce841fdb8bbc89d04b45d57e65527d92ccafe0c6cebe05257616df538cf3474ad9bec91ee703744f1d0b1f27a7e6fbda
+  metadata.gz: 0a88c69f02a34f87036df4d14ea0ac059fc1723e3528a56b3ebc2f637c1f5dd4638403f13f95e939e17c0bf5066f9d035fd3d296b2b35cbfefe96b24c73c1eeb
+  data.tar.gz: cf5144da7477e5b3312f2784551715f269e36e38af3be52b4f752927f7b4c75e096981ef4bb5ee6f600d55b0a4164ab51708ffbe95079dc3bd66294dde1cc528

data/lib/airbrake/sneakers.rb

@@ -5,12 +5,28 @@ module Airbrake
     # @see https://github.com/jondot/sneakers
     # @since v7.2.0
     class ErrorReporter
+      # @return [Array<Symbol>] ignored keys values of which raise
+      #   SystemStackError when `as_json` is called on them
+      # @see https://github.com/airbrake/airbrake/issues/850
+      IGNORED_KEYS = %i[delivery_tag consumer channel].freeze
+
       def call(exception, worker = nil, **context)
-        Airbrake.notify(exception, context) do |notice|
+        Airbrake.notify(exception, filter_context(context)) do |notice|
           notice[:context][:component] = 'sneakers'
           notice[:context][:action] = worker.class.to_s
         end
       end
+
+      private
+
+      def filter_context(context)
+        return context unless context[:delivery_info]
+        h = context.dup
+        h[:delivery_info] = context[:delivery_info].reject do |k, _v|
+          IGNORED_KEYS.include?(k)
+        end
+        h
+      end
     end
   end
 end

data/lib/airbrake/version.rb

@@ -1,5 +1,5 @@
 # We use Semantic Versioning v2.0.0
 # More information: http://semver.org/
 module Airbrake
-  AIRBRAKE_VERSION = '7.3.3'.freeze
+  AIRBRAKE_VERSION = '7.3.4'.freeze
 end

data/spec/unit/sneakers_spec.rb

@@ -22,7 +22,6 @@ RSpec.describe Airbrake::Sneakers::ErrorReporter do
   end
 
   let(:error) { StandardError.new('Something is wrong') }
-
   let(:endpoint) { 'https://airbrake.io/api/v3/projects/113743/notices' }
 
   def wait_for_a_request_with_body(body)
@@ -36,9 +35,7 @@ RSpec.describe Airbrake::Sneakers::ErrorReporter do
     Sneakers::Worker.configure_metrics
   end
 
-  after do
-    Sneakers.clear!
-  end
+  after { Sneakers.clear! }
 
   it "should send a notice" do
     handler = instance_double('handler')
@@ -46,26 +43,42 @@ RSpec.describe Airbrake::Sneakers::ErrorReporter do
     allow(worker.logger).to receive(:error)
     worker.do_work(nil, nil, "msg", handler)
 
-    wait_for_a_request_with_body(/"message":"oops\serror"/)
+    wait_for_a_request_with_body(/"message":"oops error"/)
     wait_for_a_request_with_body(/test-queue/)
     wait_for_a_request_with_body(/"component":"sneakers"/)
   end
 
   it "should support call without worker" do
-    Airbrake::Sneakers::ErrorReporter.new.call(error, message: 'my_glorious_message')
+    subject.call(error, message: 'my_glorious_messsage', delivery_info: {})
     wait_for_a_request_with_body(/"message":"Something is wrong"/)
-    wait_for_a_request_with_body(/"params":{"message":"my_glorious_message"}/)
+    wait_for_a_request_with_body(/"params":{"message":"my_glorious_messsage"/)
     # worker class is nil so action is NilClass
     wait_for_a_request_with_body(/"action":"NilClass"/)
     wait_for_a_request_with_body(/"component":"sneakers"/)
   end
 
   it "should support call with worker" do
-    Airbrake::Sneakers::ErrorReporter.new.call(error, '', message: 'my_special_message')
+    subject.call(error, '', message: 'my_special_message', delivery_info: {})
     wait_for_a_request_with_body(/"message":"Something is wrong"/)
-    wait_for_a_request_with_body(/"params":{"message":"my_special_message"}/)
+    wait_for_a_request_with_body(/"params":{"message":"my_special_message"/)
     # worker class is a String so action is String
     wait_for_a_request_with_body(/"action":"String"/)
     wait_for_a_request_with_body(/"component":"sneakers"/)
+    wait_for_a_request_with_body(
+      /"params":{"message":"my_special_message","delivery_info":{}}/
+    )
+  end
+
+  described_class::IGNORED_KEYS.each do |key|
+    context "when delivery_info/#{key} is present" do
+      it "filters out #{key}" do
+        subject.call(
+          error, '', message: 'msg', delivery_info: { key => 'a', foo: 'b' }
+        )
+        wait_for_a_request_with_body(
+          /"params":{"message":"msg","delivery_info":{"foo":"b"}}/
+        )
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 7.3.3
+  version: 7.3.4
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby