airbrake-ruby 5.2.0-java → 6.0.2-java

data/spec/performance_notifier_spec.rb

@@ -1,4 +1,6 @@
 RSpec.describe Airbrake::PerformanceNotifier do
+  subject(:perf_notifier) { described_class.new }
+
   let(:routes) { 'https://api.airbrake.io/api/v5/projects/1/routes-stats' }
   let(:queries) { 'https://api.airbrake.io/api/v5/projects/1/queries-stats' }
   let(:breakdowns) { 'https://api.airbrake.io/api/v5/projects/1/routes-breakdowns' }
@@ -22,7 +24,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
 
   describe "#notify" do
     it "sends full query" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Query.new(
           method: 'POST',
           route: '/foo',
@@ -34,7 +36,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 49, 0, 0),
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, queries).with(body: %r|
@@ -55,7 +57,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "sends full request" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'POST',
           route: '/foo',
@@ -64,7 +66,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 49, 0, 0),
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, routes).with(body: %r|
@@ -82,7 +84,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "sends full performance breakdown" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::PerformanceBreakdown.new(
           method: 'DELETE',
           route: '/routes-breakdowns',
@@ -92,7 +94,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           groups: { db: 131, view: 421 },
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, breakdowns).with(body: %r|
@@ -124,7 +126,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "sends full queue" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Queue.new(
           queue: 'emails',
           error_count: 2,
@@ -133,7 +135,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 49, 0, 0),
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, queues).with(body: /
@@ -164,7 +166,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "rounds time to the floor minute" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
@@ -173,7 +175,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 0, 20, 0),
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, routes).with(body: /"time":"2018-01-01T00:00:00\+00:00"/),
@@ -181,7 +183,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "increments routes with the same key" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
@@ -189,7 +191,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           timing: 213,
         ),
       )
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
@@ -197,7 +199,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           timing: 123,
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, routes).with(body: /"count":2/),
@@ -205,7 +207,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "groups routes by time" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
@@ -214,7 +216,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 0, 49, 0),
         ),
       )
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
@@ -223,7 +225,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 1, 49, 0),
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, routes).with(
@@ -241,7 +243,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "groups routes by route key" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
@@ -250,7 +252,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 49, 0, 0),
         ),
       )
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'POST',
           route: '/foo',
@@ -259,7 +261,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 49, 0, 0),
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, routes).with(
@@ -277,7 +279,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "groups performance breakdowns by route key" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::PerformanceBreakdown.new(
           method: 'DELETE',
           route: '/routes-breakdowns',
@@ -287,7 +289,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           groups: { db: 131, view: 421 },
         ),
       )
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::PerformanceBreakdown.new(
           method: 'DELETE',
           route: '/routes-breakdowns',
@@ -297,7 +299,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           groups: { db: 55, view: 11 },
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, breakdowns).with(body: %r|
@@ -329,7 +331,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "groups queues by queue key" do
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Queue.new(
           queue: 'emails',
           error_count: 2,
@@ -338,7 +340,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 49, 0, 0),
         ),
       )
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Queue.new(
           queue: 'emails',
           error_count: 3,
@@ -347,7 +349,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           time: Time.new(2018, 1, 1, 0, 49, 0, 0),
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, queues).with(body: /
@@ -378,7 +380,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     it "returns a promise" do
-      promise = subject.notify(
+      promise = perf_notifier.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
@@ -386,7 +388,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           timing: 123,
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(promise).to be_an(Airbrake::Promise)
       expect(promise.value).to eq('' => '')
@@ -396,16 +398,19 @@ RSpec.describe Airbrake::PerformanceNotifier do
       request = Airbrake::Request.new(
         method: 'GET', route: '/foo', status_code: 200, timing: 123,
       )
-      expect(Airbrake::Config.instance).to receive(:check_performance_options)
-        .with(request).and_return(Airbrake::Promise.new)
-      subject.notify(request)
-      subject.close
+      allow(Airbrake::Config.instance).to receive(:check_performance_options)
+        .and_return(Airbrake::Promise.new)
+      perf_notifier.notify(request)
+      perf_notifier.close
+
+      expect(Airbrake::Config.instance)
+        .to have_received(:check_performance_options).with(request)
     end
 
     it "sends environment when it's specified" do
       Airbrake::Config.instance.merge(performance_stats: true, environment: 'test')
 
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'POST',
           route: '/foo',
@@ -413,7 +418,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           timing: 123,
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(
         a_request(:put, routes).with(
@@ -426,7 +431,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
       before { Airbrake::Config.instance.merge(project_id: nil) }
 
       it "returns a rejected promise" do
-        promise = subject.notify({})
+        promise = perf_notifier.notify({})
         expect(promise).to be_rejected
       end
     end
@@ -442,7 +447,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           performance_stats_flush_period: flush_period,
         )
 
-        subject.notify(
+        perf_notifier.notify(
           Airbrake::Request.new(
             method: 'GET',
             route: '/foo',
@@ -451,7 +456,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           ),
         )
 
-        subject.notify(
+        perf_notifier.notify(
           Airbrake::Query.new(
             method: 'POST',
             route: '/foo',
@@ -468,10 +473,10 @@ RSpec.describe Airbrake::PerformanceNotifier do
     end
 
     context "when an ignore filter was defined" do
-      before { subject.add_filter(&:ignore!) }
+      before { perf_notifier.add_filter(&:ignore!) }
 
       it "doesn't notify airbrake of requests" do
-        subject.notify(
+        perf_notifier.notify(
           Airbrake::Request.new(
             method: 'GET',
             route: '/foo',
@@ -479,13 +484,13 @@ RSpec.describe Airbrake::PerformanceNotifier do
             timing: 1,
           ),
         )
-        subject.close
+        perf_notifier.close
 
         expect(a_request(:put, routes)).not_to have_been_made
       end
 
       it "doesn't notify airbrake of queries" do
-        subject.notify(
+        perf_notifier.notify(
           Airbrake::Query.new(
             method: 'POST',
             route: '/foo',
@@ -493,13 +498,13 @@ RSpec.describe Airbrake::PerformanceNotifier do
             timing: 1,
           ),
         )
-        subject.close
+        perf_notifier.close
 
         expect(a_request(:put, queries)).not_to have_been_made
       end
 
       it "returns a rejected promise" do
-        promise = subject.notify(
+        promise = perf_notifier.notify(
           Airbrake::Query.new(
             method: 'POST',
             route: '/foo',
@@ -507,7 +512,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
             timing: 1,
           ),
         )
-        subject.close
+        perf_notifier.close
 
         expect(promise.value).to eq(
           'error' => 'Airbrake::Query was ignored by a filter',
@@ -517,13 +522,13 @@ RSpec.describe Airbrake::PerformanceNotifier do
 
     context "when a filter that modifies payload was defined" do
       before do
-        subject.add_filter do |resource|
-          resource.route = '[Filtered]'
+        perf_notifier.add_filter do |metric|
+          metric.route = '[Filtered]'
         end
       end
 
       it "notifies airbrake with modified payload" do
-        subject.notify(
+        perf_notifier.notify(
           Airbrake::Query.new(
             method: 'POST',
             route: '/foo',
@@ -531,7 +536,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
             timing: 123,
           ),
         )
-        subject.close
+        perf_notifier.close
 
         expect(
           a_request(:put, queries).with(
@@ -544,16 +549,16 @@ RSpec.describe Airbrake::PerformanceNotifier do
     context "when provided :timing is zero" do
       it "doesn't notify" do
         queue = Airbrake::Queue.new(queue: 'bananas', error_count: 0, timing: 0)
-        subject.notify(queue)
-        subject.close
+        perf_notifier.notify(queue)
+        perf_notifier.close
 
         expect(a_request(:put, queues)).not_to have_been_made
       end
 
       it "returns a rejected promise" do
         queue = Airbrake::Queue.new(queue: 'bananas', error_count: 0, timing: 0)
-        promise = subject.notify(queue)
-        subject.close
+        promise = perf_notifier.notify(queue)
+        perf_notifier.close
 
         expect(promise.value).to eq('error' => ':timing cannot be zero')
       end
@@ -562,7 +567,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
 
   describe "#notify_sync" do
     it "notifies synchronously" do
-      retval = subject.notify_sync(
+      retval = perf_notifier.notify_sync(
         Airbrake::Query.new(
           method: 'POST',
           route: '/foo',
@@ -591,7 +596,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
 
     it "kills the background thread" do
       expect_any_instance_of(Thread).to receive(:kill).and_call_original
-      subject.notify(
+      perf_notifier.notify(
         Airbrake::Query.new(
           method: 'POST',
           route: '/foo',
@@ -599,30 +604,32 @@ RSpec.describe Airbrake::PerformanceNotifier do
           timing: 123,
         ),
       )
-      subject.close
+      perf_notifier.close
     end
 
     it "logs the exit message" do
       allow(Airbrake::Loggable.instance).to receive(:debug)
-      expect(Airbrake::Loggable.instance).to receive(:debug).with(
-        /performance notifier closed/,
+
+      perf_notifier.close
+
+      expect(Airbrake::Loggable.instance).to have_received(:debug).with(
+        /Airbrake::PerformanceNotifier thread pool closed/,
       )
-      subject.close
     end
   end
 
   describe "#delete_filter" do
     let(:filter) do
       Class.new do
-        def call(resource); end
+        def call(metric); end
       end
     end
 
-    before { subject.add_filter(filter.new) }
+    before { perf_notifier.add_filter(filter.new) }
 
     it "deletes a filter" do
-      subject.delete_filter(filter)
-      subject.notify(
+      perf_notifier.delete_filter(filter)
+      perf_notifier.notify(
         Airbrake::Request.new(
           method: 'POST',
           route: '/foo',
@@ -630,7 +637,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           timing: 123,
         ),
       )
-      subject.close
+      perf_notifier.close
 
       expect(a_request(:put, routes)).to have_been_made
     end

data/spec/promise_spec.rb

@@ -1,15 +1,17 @@
 RSpec.describe Airbrake::Promise do
+  subject(:promise) { described_class.new }
+
   describe ".then" do
     let(:resolved_with) { [] }
     let(:rejected_with) { [] }
 
     context "when it is not resolved" do
       it "returns self" do
-        expect(subject.then {}).to eq(subject)
+        expect(promise.then { anything }).to eq(promise)
       end
 
       it "doesn't call the resolve callbacks yet" do
-        subject.then { resolved_with << 1 }.then { resolved_with << 2 }
+        promise.then { resolved_with << 1 }.then { resolved_with << 2 }
         expect(resolved_with).to be_empty
       end
     end
@@ -17,12 +19,12 @@ RSpec.describe Airbrake::Promise do
     context "when it is resolved" do
       shared_examples "then specs" do
         it "returns self" do
-          expect(subject.then {}).to eq(subject)
+          expect(promise.then { anything }).to eq(promise)
         end
 
         it "yields the resolved value" do
           yielded = nil
-          subject.then { |value| yielded = value }
+          promise.then { |value| yielded = value }
           expect(yielded).to eq('id' => '123')
         end
 
@@ -37,29 +39,29 @@ RSpec.describe Airbrake::Promise do
 
       context "and there are some resolve and reject callbacks in place" do
         before do
-          subject.then { resolved_with << 1 }.then { resolved_with << 2 }
-          subject.rescue { rejected_with << 1 }.rescue { rejected_with << 2 }
-          subject.resolve('id' => '123')
+          promise.then { resolved_with << 1 }.then { resolved_with << 2 }
+          promise.rescue { rejected_with << 1 }.rescue { rejected_with << 2 }
+          promise.resolve('id' => '123')
         end
 
         include_examples "then specs"
 
         it "registers the resolve callbacks" do
-          subject.resolve('id' => '456')
+          promise.resolve('id' => '456')
           expect(resolved_with).to match_array([1, 2, 1, 2])
         end
       end
 
       context "and additional then callbacks are added" do
         before do
-          subject.resolve('id' => '123')
-          subject.then { resolved_with << 1 }.then { resolved_with << 2 }
+          promise.resolve('id' => '123')
+          promise.then { resolved_with << 1 }.then { resolved_with << 2 }
         end
 
         include_examples "then specs"
 
         it "doesn't register new resolve callbacks" do
-          subject.resolve('id' => '456')
+          promise.resolve('id' => '456')
           expect(resolved_with).to match_array([1, 2])
         end
       end
@@ -72,11 +74,11 @@ RSpec.describe Airbrake::Promise do
 
     context "when it is not rejected" do
       it "returns self" do
-        expect(subject.then {}).to eq(subject)
+        expect(promise.then { anything }).to eq(promise)
       end
 
       it "doesn't call the reject callbacks yet" do
-        subject.rescue { rejected_with << 1 }.rescue { rejected_with << 2 }
+        promise.rescue { rejected_with << 1 }.rescue { rejected_with << 2 }
         expect(rejected_with).to be_empty
       end
     end
@@ -84,12 +86,12 @@ RSpec.describe Airbrake::Promise do
     context "when it is rejected" do
       shared_examples "rescue specs" do
         it "returns self" do
-          expect(subject.rescue {}).to eq(subject)
+          expect(promise.rescue { anything }).to eq(promise)
         end
 
         it "yields the rejected value" do
           yielded = nil
-          subject.rescue { |value| yielded = value }
+          promise.rescue { |value| yielded = value }
           expect(yielded).to eq('bingo')
         end
 
@@ -104,29 +106,29 @@ RSpec.describe Airbrake::Promise do
 
       context "and there are some resolve and reject callbacks in place" do
         before do
-          subject.then { resolved_with << 1 }.then { resolved_with << 2 }
-          subject.rescue { rejected_with << 1 }.rescue { rejected_with << 2 }
-          subject.reject('bingo')
+          promise.then { resolved_with << 1 }.then { resolved_with << 2 }
+          promise.rescue { rejected_with << 1 }.rescue { rejected_with << 2 }
+          promise.reject('bingo')
         end
 
         include_examples "rescue specs"
 
         it "registers the reject callbacks" do
-          subject.reject('bingo again')
+          promise.reject('bingo again')
           expect(rejected_with).to match_array([1, 2, 1, 2])
         end
       end
 
       context "and additional reject callbacks are added" do
         before do
-          subject.reject('bingo')
-          subject.rescue { rejected_with << 1 }.rescue { rejected_with << 2 }
+          promise.reject('bingo')
+          promise.rescue { rejected_with << 1 }.rescue { rejected_with << 2 }
         end
 
         include_examples "rescue specs"
 
         it "doesn't register new reject callbacks" do
-          subject.reject('bingo again')
+          promise.reject('bingo again')
           expect(rejected_with).to match_array([1, 2])
         end
       end
@@ -135,37 +137,38 @@ RSpec.describe Airbrake::Promise do
 
   describe ".resolve" do
     it "returns self" do
-      expect(subject.resolve(1)).to eq(subject)
+      expect(promise.resolve(1)).to eq(promise)
     end
 
     it "executes callbacks attached with .then" do
       array = []
-      subject.then { |notice_id| array << notice_id }.rescue { array << 999 }
+      promise.then { |notice_id| array << notice_id }.rescue { array << 999 }
 
       expect(array.size).to be_zero
-      subject.resolve(1)
+      promise.resolve(1)
       expect(array).to match_array([1])
     end
   end
 
   describe ".reject" do
     it "returns self" do
-      expect(subject.reject(1)).to eq(subject)
+      expect(promise.reject(1)).to eq(promise)
     end
 
     it "executes callbacks attached with .rescue" do
       array = []
-      subject.then { array << 1 }.rescue { |error| array << error }
+      promise.then { array << 1 }.rescue { |error| array << error }
 
       expect(array.size).to be_zero
-      subject.reject(999)
+      promise.reject(999)
       expect(array).to match_array([999])
     end
   end
 
   describe "#rejected?" do
     context "when it was rejected" do
-      before { subject.reject(1) }
+      before { promise.reject(1) }
+
       it { is_expected.to be_rejected }
     end
 
@@ -174,14 +177,16 @@ RSpec.describe Airbrake::Promise do
     end
 
     context "when it was resolved" do
-      before { subject.resolve }
+      before { promise.resolve }
+
       it { is_expected.not_to be_rejected }
     end
   end
 
   describe "#resolved?" do
     context "when it was resolved" do
-      before { subject.resolve }
+      before { promise.resolve }
+
       it { is_expected.to be_resolved }
     end
 
@@ -190,7 +195,8 @@ RSpec.describe Airbrake::Promise do
     end
 
     context "when it was rejected" do
-      before { subject.reject(1) }
+      before { promise.reject(1) }
+
       it { is_expected.not_to be_resolved }
     end
   end