airbrake-ruby 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21223403ddfa03e2f851d2cb5c4a74130e17840f
-  data.tar.gz: ab65e845c6053434813b8bbf0f23edaa80dad44d
+  metadata.gz: d64cdba9f23541f20ba15bc0d7e4428cdec2f18b
+  data.tar.gz: 6adece1384ee220679a705b3343850bd2401473e
 SHA512:
-  metadata.gz: e045ca4229249ab1cfc9be1b5d94e72bc633134f4e6fbf34a8a3f16068a042823aa5e5fd09d085220de83313ab22c48bb1ab773549b776dbb64fc6a721356bf1
-  data.tar.gz: 24117e363c96f7cc6673c63cae41ab5306de8ed61bd03c08d6e011fb52cc17d2bf13d8394a797428ef0428ca151e3188995dff733cdb71d8693a22be1de112ce
+  metadata.gz: 91de811f9e41f506ac429361f692c795f1622452b63b500770ad3910178c5fdf0e0685c37c9a035c014a653a212fadb1bdf692011bd37d17b17a6ba0ec541790
+  data.tar.gz: 93f7598aca53fc4d2d672b357bc43727ebb937624a97e55835c1dfe35134f120e9812a734e0c33f3add558ada30201c0ce0fbada1247da2c1f425be82155ec06

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

@@ -8,6 +8,16 @@ module Airbrake
       # @return [Integer]
       attr_reader :weight
 
+      ##
+      # @return [Array<Symbol>] the list of ignored fiber variables
+      IGNORED_FIBER_VARIABLES = [
+        # https://github.com/airbrake/airbrake-ruby/issues/204
+        :__recursive_key__,
+
+        # https://github.com/rails/rails/issues/28996
+        :__rspec
+      ].freeze
+
       def initialize
         @weight = 110
       end
@@ -45,7 +55,7 @@ module Airbrake
 
       def fiber_variables(th)
         th.keys.map.with_object({}) do |key, h|
-          next if key == :__recursive_key__
+          next if IGNORED_FIBER_VARIABLES.any? { |v| v == key }
           next if (value = th[key]).is_a?(IO)
           h[key] = value
         end

data/lib/airbrake-ruby/version.rb

@@ -4,5 +4,5 @@
 module Airbrake
   ##
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '2.2.1'.freeze
+  AIRBRAKE_RUBY_VERSION = '2.2.2'.freeze
 end

data/spec/filters/thread_filter_spec.rb

@@ -6,10 +6,31 @@ RSpec.describe Airbrake::Filters::ThreadFilter do
   let(:notice) { Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new) }
   let(:th) { Thread.current }
 
+  shared_examples "fiber variable ignore" do |key|
+    it "ignores the :#{key} fiber variable" do
+      th[key] = :bingo
+      subject.call(notice)
+      th[key] = nil
+
+      fiber_variables = notice[:params][:thread][:fiber_variables]
+      if RUBY_ENGINE == 'jruby'
+        expect(fiber_variables).to be_nil
+      else
+        expect(fiber_variables[key]).to be_nil
+      end
+    end
+  end
+
+  %i[__recursive_key__ __rspec].each do |key|
+    include_examples "fiber variable ignore", key
+  end
+
   it "appends thread variables" do
-    th.thread_variable_set(:bingo, :bango)
-    subject.call(notice)
-    th.thread_variable_set(:bingo, nil)
+    Thread.new do
+      th.thread_variable_set(:bingo, :bango)
+      subject.call(notice)
+      th.thread_variable_set(:bingo, nil)
+    end.join
 
     expect(notice[:params][:thread][:thread_variables][:bingo]).to eq(:bango)
   end
@@ -62,11 +83,13 @@ RSpec.describe Airbrake::Filters::ThreadFilter do
     end
 
     it "doesn't append the IO object to thread variables" do
-      th.thread_variable_set(:io, io_obj)
-      subject.call(notice)
-      th.thread_variable_set(:io, nil)
+      Thread.new do
+        th.thread_variable_set(:io, io_obj)
+        subject.call(notice)
+        th.thread_variable_set(:io, nil)
+      end.join
 
-      expect(notice[:params][:thread][:thread_variables][:io]).to be_nil
+      expect(notice[:params][:thread][:thread_variables]).to be_nil
     end
 
     it "doesn't append the IO object to thread variables" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby notifier for https://airbrake.io