airbrake-ruby 4.13.4 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da4c29476df09886ee5e0d9b1b4738cb77a93d9f415c284c57266a64334cf8be
-  data.tar.gz: c12fad300807903f28b3d3dcdc472e729d6e27e74fca597467774c9ea8ab347a
+  metadata.gz: 8a99b9f69c92aab19bd33806452b720f4e193578d5ffa22f79faa780c38d9fa0
+  data.tar.gz: 6e19717eef99f7446b8f2e50e79e2eea6787d2b283c0a291821f09ab5e227a8f
 SHA512:
-  metadata.gz: '059b5f84a0ef2c158ead7d0026ff9529c03bdcb8e67d5fb95c8a36465af0bd7510ef8426d7ab644e7d3be9d7884f569d130397ca65854ddd03d34f2c332b30f2'
-  data.tar.gz: 683a8c9d90db59353e70c2f4474825ce583cb8a8d68ff01d895794bd4d6def0daa3ae7898f2ef10398ca24a8361c5fa3d53ae21b270182653431469955b9c578
+  metadata.gz: 8ece3a704ef7a11e8994e657e53526c684da53316cc609ff8efc05e5b14cf6eca8b2536233a8ab0bfd8c6bc0997f7c97a9ef073967a8fd85b69f960db9db5757
+  data.tar.gz: 28b983d5c3b2b3e7d2a31c5429ffb72b06103569444411c5e7231c76ce308ef143140f40d215401b178aa2022f912914ef7c3f7b14ec4f01c75398342dda97c0

data/lib/airbrake-ruby.rb

@@ -570,6 +570,7 @@ module Airbrake
 
     private
 
+    # rubocop:disable Metrics/AbcSize
     def process_config_options(config)
       if config.blacklist_keys.any?
         blacklist = Airbrake::Filters::KeysBlacklist.new(config.blacklist_keys)
@@ -581,7 +582,6 @@ module Airbrake
         notice_notifier.add_filter(whitelist)
       end
 
-      return if configured?
       return unless config.root_directory
 
       [
@@ -590,9 +590,12 @@ module Airbrake
         Airbrake::Filters::GitRepositoryFilter,
         Airbrake::Filters::GitLastCheckoutFilter,
       ].each do |filter|
+        next if notice_notifier.has_filter?(filter)
+
         notice_notifier.add_filter(filter.new(config.root_directory))
       end
     end
+    # rubocop:enable Metrics/AbcSize
   end
 end
 # rubocop:enable Metrics/ModuleLength

data/lib/airbrake-ruby/filter_chain.rb

@@ -76,7 +76,7 @@ module Airbrake
 
     # @return [String] customized inspect to lessen the amount of clutter
     def inspect
-      @filters.map(&:class).to_s
+      filter_classes.to_s
     end
 
     # @return [String] {#inspect} for PrettyPrint
@@ -91,5 +91,19 @@ module Airbrake
       end
       q.text(']')
     end
+
+    # @param [Class] filter_class
+    # @return [Boolean] true if the current chain has an instance of the given
+    #   class, false otherwise
+    # @since v4.14.0
+    def includes?(filter_class)
+      filter_classes.include?(filter_class)
+    end
+
+    private
+
+    def filter_classes
+      @filters.map(&:class)
+    end
   end
 end

data/lib/airbrake-ruby/notice_notifier.rb

@@ -82,6 +82,12 @@ module Airbrake
       @context.merge!(context)
     end
 
+    # @return [Boolean]
+    # @since v4.14.0
+    def has_filter?(filter_class) # rubocop:disable Naming/PredicateName
+      @filter_chain.includes?(filter_class)
+    end
+
     private
 
     def convert_to_exception(ex)

data/lib/airbrake-ruby/thread_pool.rb

@@ -83,6 +83,7 @@ module Airbrake
 
         if @pid != Process.pid && @workers.list.empty?
           @pid = Process.pid
+          @workers = ThreadGroup.new
           spawn_workers
         end
 

data/lib/airbrake-ruby/version.rb

@@ -2,5 +2,5 @@
 # More information: http://semver.org/
 module Airbrake
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '4.13.4'.freeze
+  AIRBRAKE_RUBY_VERSION = '4.14.1'.freeze
 end

data/spec/airbrake_spec.rb

@@ -85,6 +85,18 @@ RSpec.describe Airbrake do
         expect(described_class.notice_notifier).not_to receive(:add_filter)
         10.times { described_class.configure {} }
       end
+
+      it "appends some default filters" do
+        allow(described_class.notice_notifier).to receive(:add_filter)
+        expect(described_class.notice_notifier).to receive(:add_filter).with(
+          an_instance_of(Airbrake::Filters::RootDirectoryFilter),
+        )
+
+        described_class.configure do |c|
+          c.project_id = 1
+          c.project_key = '2'
+        end
+      end
     end
 
     context "when blacklist_keys gets configured" do

data/spec/filter_chain_spec.rb

@@ -89,4 +89,31 @@ RSpec.describe Airbrake::FilterChain do
       expect(subject.inspect).to eq('[Proc]')
     end
   end
+
+  describe "#includes?" do
+    context "when a custom filter class is included in the filter chain" do
+      it "returns true" do
+        klass = Class.new {}
+
+        subject.add_filter(klass.new)
+        expect(subject.includes?(klass)).to eq(true)
+      end
+    end
+
+    context "when Proc filter class is included in the filter chain" do
+      it "returns true" do
+        subject.add_filter(proc {})
+        expect(subject.includes?(Proc)).to eq(true)
+      end
+    end
+
+    context "when filter class is NOT included in the filter chain" do
+      it "returns false" do
+        klass = Class.new {}
+
+        subject.add_filter(proc {})
+        expect(subject.includes?(klass)).to eq(false)
+      end
+    end
+  end
 end

data/spec/performance_notifier_spec.rb

@@ -389,7 +389,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
       subject.close
 
       expect(promise).to be_an(Airbrake::Promise)
-      expect(promise.value).to eq('' => nil)
+      expect(promise.value).to eq('' => '')
     end
 
     it "checks performance stat configuration" do
@@ -601,7 +601,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           body: %r|\A{"queries":\[{"method":"POST","route":"/foo"|,
         ),
       ).to have_been_made
-      expect(retval).to eq('' => nil)
+      expect(retval).to eq('' => '')
     end
   end
 

data/spec/thread_pool_spec.rb

@@ -85,11 +85,31 @@ RSpec.describe Airbrake::ThreadPool do
       expect(subject).not_to have_workers
     end
 
-    it "respawns workers on fork()", skip: %w[jruby].include?(RUBY_ENGINE) do
-      pid = fork { expect(subject).to have_workers }
-      Process.wait(pid)
-      subject.close
-      expect(subject).not_to have_workers
+    describe "forking behavior" do
+      before do
+        skip('fork() is unsupported on JRuby') if %w[jruby].include?(RUBY_ENGINE)
+        unless Process.respond_to?(:last_status)
+          skip('Process.last_status is unsupported on this Ruby')
+        end
+      end
+
+      it "respawns workers on fork()" do
+        pid = fork { expect(subject).to have_workers }
+        Process.wait(pid)
+        subject.close
+
+        expect(Process.last_status).to be_success
+        expect(subject).not_to have_workers
+      end
+
+      it "ensures that a new thread group is created per process" do
+        subject << 1
+        pid = fork { subject.has_workers? }
+        Process.wait(pid)
+        subject.close
+
+        expect(Process.last_status).to be_success
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 4.13.4
+  version: 4.14.1
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree3