airbrake-ruby 4.11.0 → 4.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dcee35c6f7f3d5d0cd59d6217c308acadcafeea8da860109735ad1fb11666f4
-  data.tar.gz: 2117a15ce8ee4de598ad3da47562614087c76765573e76b66d300fbb85f0a8ea
+  metadata.gz: 6b9d78ba8789ccfa27f139a5ad0fef6b544da9bde4239dfda22cc543493bdb45
+  data.tar.gz: c32c7e64425037221491c64de8e22d548815929ec6e3a0289aad3c74f8ffedc7
 SHA512:
-  metadata.gz: 0bbccd50cecc0ee0dbc0518e775d1381d4ab258e9d7ebe469cf427c1940d24a4bc11a0f844259b87b260137e44abed400f4c25f5a9a78696b680d49eebdd2990
-  data.tar.gz: cdf685b1acae7c8d94103561cf28597775638fb6d8e1a9635775fc3966d91006e46defdb0ac2ed4d917ad168b664ab2c9db1c2f3aab33fb87ec5ff8b929a906c
+  metadata.gz: 711d058e48af32390e7b92243171014122b5e454cea35afd19ca72e5fe39d04b919f0cbc95dfdf23685a3114cac14430310eb5a0c785c263d85a52ca26bab861
+  data.tar.gz: 300176c0bab2a6ddcb4b3453069be19ef5a477021ca10f68256edabc97c9d0d15b3b4a5659f2676e53071f89229b59c90ac6d0f1016d953342af8d9fc8b27581

data/lib/airbrake-ruby/performance_notifier.rb

@@ -120,14 +120,13 @@ module Airbrake
     end
 
     def send_resource(resource, sync:)
-      promise = @config.check_configuration
-      return promise if promise.rejected?
-
-      promise = @config.check_performance_options(resource)
+      promise = check_configuration(resource)
       return promise if promise.rejected?
 
       @filter_chain.refine(resource)
-      return if resource.ignored?
+      if resource.ignored?
+        return Promise.new.reject("#{resource.class} was ignored by a filter")
+      end
 
       @mutex.synchronize do
         update_payload(resource)
@@ -139,6 +138,20 @@ module Airbrake
       end
     end
 
+    def check_configuration(resource)
+      promise = @config.check_configuration
+      return promise if promise.rejected?
+
+      promise = @config.check_performance_options(resource)
+      return promise if promise.rejected?
+
+      if resource.timing && resource.timing == 0
+        return Promise.new.reject(':timing cannot be zero')
+      end
+
+      Promise.new
+    end
+
     def send(sender, payload, promise)
       signature = "#{self.class.name}##{__method__}"
       raise "#{signature}: payload (#{payload}) cannot be empty. Race?" if payload.none?

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.11.0'.freeze
+  AIRBRAKE_RUBY_VERSION = '4.11.1'.freeze
 end

data/spec/airbrake_spec.rb

@@ -171,7 +171,7 @@ RSpec.describe Airbrake do
           method: 'GET',
           route: '/',
           status_code: 200,
-          start_time: Time.now,
+          timing: 1,
         )
       end
     end
@@ -187,7 +187,7 @@ RSpec.describe Airbrake do
             method: 'GET',
             route: '/',
             status_code: 200,
-            start_time: Time.now,
+            timing: 1,
           },
           request_id: 1,
         )
@@ -204,7 +204,7 @@ RSpec.describe Airbrake do
           method: 'GET',
           route: '/',
           status_code: 200,
-          start_time: Time.now,
+          timing: 1,
         },
         request_id: 1,
       )
@@ -222,7 +222,7 @@ RSpec.describe Airbrake do
           method: 'GET',
           route: '/',
           query: '',
-          start_time: Time.now,
+          timing: 1,
         )
       end
     end
@@ -238,7 +238,7 @@ RSpec.describe Airbrake do
             method: 'GET',
             route: '/',
             query: '',
-            start_time: Time.now,
+            timing: 1,
           },
           request_id: 1,
         )
@@ -255,7 +255,7 @@ RSpec.describe Airbrake do
           method: 'GET',
           route: '/',
           query: '',
-          start_time: Time.now,
+          timing: 1,
         },
         request_id: 1,
       )
@@ -273,7 +273,7 @@ RSpec.describe Airbrake do
           method: 'GET',
           route: '/',
           query: '',
-          start_time: Time.now,
+          timing: 1,
         )
       end
     end
@@ -292,7 +292,7 @@ RSpec.describe Airbrake do
             route: '/',
             response_type: :html,
             groups: {},
-            start_time: Time.now,
+            timing: 1,
           },
           request_id: 1,
         )
@@ -310,7 +310,7 @@ RSpec.describe Airbrake do
           route: '/',
           response_type: :html,
           groups: {},
-          start_time: Time.now,
+          timing: 1,
         },
         request_id: 1,
       )

data/spec/config_spec.rb

@@ -110,9 +110,7 @@ RSpec.describe Airbrake::Config do
 
   describe "#check_performance_options" do
     it "returns a promise" do
-      resource = Airbrake::Query.new(
-        method: '', route: '', query: '', start_time: Time.now,
-      )
+      resource = Airbrake::Query.new(method: '', route: '', query: '', timing: 1)
       expect(subject.check_performance_options(resource))
         .to be_an(Airbrake::Promise)
     end
@@ -122,7 +120,7 @@ RSpec.describe Airbrake::Config do
 
       let(:resource) do
         Airbrake::Request.new(
-          method: 'GET', route: '/foo', status_code: 200, start_time: Time.new,
+          method: 'GET', route: '/foo', status_code: 200, timing: 1,
         )
       end
 
@@ -138,9 +136,7 @@ RSpec.describe Airbrake::Config do
       before { subject.query_stats = false }
 
       let(:resource) do
-        Airbrake::Query.new(
-          method: 'GET', route: '/foo', query: '', start_time: Time.new,
-        )
+        Airbrake::Query.new(method: 'GET', route: '/foo', query: '', timing: 1)
       end
 
       it "returns a rejected promise" do

data/spec/filters/sql_filter_spec.rb

@@ -13,9 +13,7 @@ RSpec.describe Airbrake::Filters::SqlFilter do
   shared_examples "query blacklisting" do |query, opts|
     it "ignores '#{query}'" do
       filter = described_class.new('postgres')
-      q = Airbrake::Query.new(
-        query: query, method: 'GET', route: '/', start_time: Time.now,
-      )
+      q = Airbrake::Query.new(query: query, method: 'GET', route: '/', timing: 1)
       filter.call(q)
 
       expect(q.ignored?).to eq(opts[:should_ignore])

data/spec/performance_notifier_spec.rb

@@ -475,7 +475,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
             method: 'GET',
             route: '/foo',
             status_code: 200,
-            start_time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+            timing: 1,
           ),
         )
         subject.close
@@ -489,13 +489,29 @@ RSpec.describe Airbrake::PerformanceNotifier do
             method: 'POST',
             route: '/foo',
             query: 'SELECT * FROM things',
-            start_time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+            timing: 1,
           ),
         )
         subject.close
 
         expect(a_request(:put, queries)).not_to have_been_made
       end
+
+      it "returns a rejected promise" do
+        promise = subject.notify(
+          Airbrake::Query.new(
+            method: 'POST',
+            route: '/foo',
+            query: 'SELECT * FROM things',
+            timing: 1,
+          ),
+        )
+        subject.close
+
+        expect(promise.value).to eq(
+          'error' => 'Airbrake::Query was ignored by a filter',
+        )
+      end
     end
 
     context "when a filter that modifies payload was defined" do
@@ -548,6 +564,24 @@ RSpec.describe Airbrake::PerformanceNotifier do
         ).to have_been_made
       end
     end
+
+    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
+
+        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
+
+        expect(promise.value).to eq('error' => ':timing cannot be zero')
+      end
+    end
   end
 
   describe "#notify_sync" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.11.1
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.