airbrake-ruby 4.8.0 → 4.11.1

data/spec/notice_notifier/options_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Airbrake::NoticeNotifier do
 
     Airbrake::Config.instance = Airbrake::Config.new(
       project_id: project_id,
-      project_key: project_key
+      project_key: project_key,
     )
   end
 
@@ -64,7 +64,7 @@ RSpec.describe Airbrake::NoticeNotifier do
     describe ":root_directory" do
       before do
         subject.add_filter(
-          Airbrake::Filters::RootDirectoryFilter.new('/home/kyrylo/code')
+          Airbrake::Filters::RootDirectoryFilter.new('/home/kyrylo/code'),
         )
       end
 
@@ -73,7 +73,7 @@ RSpec.describe Airbrake::NoticeNotifier do
 
         expect(
           a_request(:post, endpoint)
-          .with(body: %r|{"file":"/PROJECT_ROOT/airbrake/ruby/spec/airbrake_spec.+|)
+          .with(body: %r|{"file":"/PROJECT_ROOT/airbrake/ruby/spec/airbrake_spec.+|),
         ).to have_been_made.once
       end
 
@@ -85,7 +85,7 @@ RSpec.describe Airbrake::NoticeNotifier do
             subject.notify_sync(ex)
             expect(
               a_request(:post, endpoint)
-              .with(body: %r{"rootDirectory":"/bingo/bango"})
+              .with(body: %r{"rootDirectory":"/bingo/bango"}),
             ).to have_been_made.once
           end
         end
@@ -105,7 +105,7 @@ RSpec.describe Airbrake::NoticeNotifier do
         WEBrick::HTTPServer.new(
           Port: 0,
           Logger: WEBrick::Log.new('/dev/null'),
-          AccessLog: []
+          AccessLog: [],
         )
       end
 
@@ -121,7 +121,7 @@ RSpec.describe Airbrake::NoticeNotifier do
       before do
         Airbrake::Config.instance.merge(
           proxy: proxy_params,
-          host: "http://localhost:#{proxy.config[:Port]}"
+          host: "http://localhost:#{proxy.config[:Port]}",
         )
 
         proxy.mount_proc '/' do |req, res|
@@ -139,7 +139,7 @@ RSpec.describe Airbrake::NoticeNotifier do
         if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
           skip(
             "We use Webmock 2, which doesn't support Ruby 2.6+. It's " \
-            "safe to run this test on 2.6+ once we upgrade to Webmock 3.5+"
+            "safe to run this test on 2.6+ once we upgrade to Webmock 3.5+",
           )
         end
         subject.notify_sync(ex)
@@ -164,7 +164,7 @@ RSpec.describe Airbrake::NoticeNotifier do
           subject.notify_sync(ex)
           expect(
             a_request(:post, endpoint)
-            .with(body: /"context":{.*"environment":"production".*}/)
+            .with(body: /"context":{.*"environment":"production".*}/),
           ).to have_been_made.once
         end
       end
@@ -192,7 +192,7 @@ RSpec.describe Airbrake::NoticeNotifier do
       context "when env is set and ignore_environments doesn't mention it" do
         params = {
           environment: :development,
-          ignore_environments: [:production]
+          ignore_environments: [:production],
         }
 
         include_examples 'sent notice', params
@@ -201,7 +201,7 @@ RSpec.describe Airbrake::NoticeNotifier do
       context "when the current env and notify envs are the same" do
         params = {
           environment: :development,
-          ignore_environments: %i[production development]
+          ignore_environments: %i[production development],
         }
 
         include_examples 'ignored notice', params
@@ -227,7 +227,7 @@ RSpec.describe Airbrake::NoticeNotifier do
       context "when ignore_environments specifies a Regexp pattern" do
         params = {
           environment: :testing,
-          ignore_environments: ['staging', /test.+/]
+          ignore_environments: ['staging', /test.+/],
         }
 
         include_examples 'ignored notice', params
@@ -241,7 +241,7 @@ RSpec.describe Airbrake::NoticeNotifier do
           before do
             Airbrake::Config.instance.merge(
               blacklist_keys: %i[password password_confirmation],
-              whitelist_keys: [:email, /user/i, 'account_id']
+              whitelist_keys: [:email, /user/i, 'account_id'],
             )
           end
 

data/spec/notice_notifier_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Airbrake::NoticeNotifier do
       project_id: 1,
       project_key: 'abc',
       logger: Logger.new('/dev/null'),
-      performance_stats: true
+      performance_stats: true,
     )
   end
 
@@ -32,7 +32,7 @@ RSpec.describe Airbrake::NoticeNotifier do
     let(:body) do
       {
         'id' => '00054414-b147-6ffa-85d6-1524d83362a6',
-        'url' => 'http://localhost/locate/00054414-b147-6ffa-85d6-1524d83362a6'
+        'url' => 'http://localhost/locate/00054414-b147-6ffa-85d6-1524d83362a6',
       }.to_json
     end
 
@@ -110,7 +110,7 @@ RSpec.describe Airbrake::NoticeNotifier do
       before do
         Airbrake::Config.instance.merge(
           environment: 'test',
-          ignore_environments: %w[test]
+          ignore_environments: %w[test],
         )
       end
 
@@ -132,7 +132,7 @@ RSpec.describe Airbrake::NoticeNotifier do
     let(:body) do
       {
         'id' => '00054414-b147-6ffa-85d6-1524d83362a6',
-        'url' => 'http://localhost/locate/00054414-b147-6ffa-85d6-1524d83362a6'
+        'url' => 'http://localhost/locate/00054414-b147-6ffa-85d6-1524d83362a6',
       }
     end
 
@@ -153,8 +153,8 @@ RSpec.describe Airbrake::NoticeNotifier do
       subject.notify_sync('foo', bingo: 'bango')
       expect(
         a_request(:post, endpoint).with(
-          body: /"params":{.*"bingo":"bango".*}/
-        )
+          body: /"params":{.*"bingo":"bango".*}/,
+        ),
       ).to have_been_made.once
     end
 
@@ -190,7 +190,7 @@ RSpec.describe Airbrake::NoticeNotifier do
     context "when the provided environment is ignored" do
       before do
         Airbrake::Config.instance.merge(
-          environment: 'test', ignore_environments: %w[test]
+          environment: 'test', ignore_environments: %w[test],
         )
       end
 
@@ -256,7 +256,7 @@ RSpec.describe Airbrake::NoticeNotifier do
           it "returns the full generated backtrace" do
             backtrace = [
               "/lib/airbrake-ruby/a.rb:84:in `build_notice'",
-              "/lib/airbrake-ruby/b.rb:124:in `send_notice'"
+              "/lib/airbrake-ruby/b.rb:124:in `send_notice'",
             ]
             allow(Kernel).to receive(:caller).and_return(backtrace)
 
@@ -265,8 +265,8 @@ RSpec.describe Airbrake::NoticeNotifier do
             expect(notice[:errors].first[:backtrace]).to eq(
               [
                 { file: '/lib/airbrake-ruby/a.rb', line: 84, function: 'build_notice' },
-                { file: '/lib/airbrake-ruby/b.rb', line: 124, function: 'send_notice' }
-              ]
+                { file: '/lib/airbrake-ruby/b.rb', line: 124, function: 'send_notice' },
+              ],
             )
           end
         end
@@ -276,7 +276,7 @@ RSpec.describe Airbrake::NoticeNotifier do
             backtrace = [
               "/airbrake-ruby/lib/airbrake-ruby/a.rb:84:in `b'",
               "/airbrake-ruby/lib/foo/b.rb:84:in `build'",
-              "/airbrake-ruby/lib/bar/c.rb:124:in `send'"
+              "/airbrake-ruby/lib/bar/c.rb:124:in `send'",
             ]
             allow(Kernel).to receive(:caller).and_return(backtrace)
 
@@ -285,8 +285,8 @@ RSpec.describe Airbrake::NoticeNotifier do
             expect(notice[:errors].first[:backtrace]).to eq(
               [
                 { file: '/airbrake-ruby/lib/foo/b.rb', line: 84, function: 'build' },
-                { file: '/airbrake-ruby/lib/bar/c.rb', line: 124, function: 'send' }
-              ]
+                { file: '/airbrake-ruby/lib/bar/c.rb', line: 124, function: 'send' },
+              ],
             )
           end
         end
@@ -303,7 +303,7 @@ RSpec.describe Airbrake::NoticeNotifier do
         backtrace = [
           "org/jruby/RubyKernel.java:998:in `eval'",
           "/ruby/stdlib/irb/workspace.rb:87:in `evaluate'",
-          "/ruby/stdlib/irb.rb:489:in `block in eval_input'"
+          "/ruby/stdlib/irb.rb:489:in `block in eval_input'",
         ]
         allow(Kernel).to receive(:caller).and_return(backtrace)
 
@@ -314,8 +314,8 @@ RSpec.describe Airbrake::NoticeNotifier do
           [
             { file: 'org/jruby/RubyKernel.java', line: 998, function: 'eval' },
             { file: '/ruby/stdlib/irb/workspace.rb', line: 87, function: 'evaluate' },
-            { file: '/ruby/stdlib/irb.rb:489', line: 489, function: 'block in eval_input' }
-          ]
+            { file: '/ruby/stdlib/irb.rb:489', line: 489, function: 'block in eval_input' },
+          ],
         )
         # rubocop:enable Metrics/LineLength
       end
@@ -328,9 +328,9 @@ RSpec.describe Airbrake::NoticeNotifier do
       end
 
       it "raises error" do
-        expect { subject.build_notice(Exception.new) }.to raise_error(
+        expect { subject.build_notice(Exception.new('oops')) }.to raise_error(
           Airbrake::Error,
-          'attempted to build Exception with closed Airbrake instance'
+          "Airbrake is closed; can't build exception: Exception: oops",
         )
       end
     end

data/spec/notice_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Airbrake::Notice do
         before do
           Airbrake::Config.instance.merge(
             app_version: "1.2.3",
-            root_directory: "/one/two"
+            root_directory: "/one/two",
           )
         end
 
@@ -34,7 +34,7 @@ RSpec.describe Airbrake::Notice do
     context "when versions is empty" do
       it "doesn't set the 'versions' payload" do
         expect(notice.to_json).not_to match(
-          /"context":{"versions":{"dep":"1.2.3"}}/
+          /"context":{"versions":{"dep":"1.2.3"}}/,
         )
       end
     end
@@ -43,7 +43,7 @@ RSpec.describe Airbrake::Notice do
       it "sets the 'versions' payload" do
         notice[:context][:versions] = { 'dep' => '1.2.3' }
         expect(notice.to_json).to match(
-          /"context":{.*"versions":{"dep":"1.2.3"}.*}/
+          /"context":{.*"versions":{"dep":"1.2.3"}.*}/,
         )
       end
     end
@@ -192,7 +192,7 @@ RSpec.describe Airbrake::Notice do
             it "doesn't fail" do
               notice[:params] = { a: { b: { c: ObjectWithIoIvars.new } } }
               expect(notice.to_json).to match(
-                /"params":{"a":{"b":{"c":".+ObjectWithIoIvars.+"}}.*}/
+                /"params":{"a":{"b":{"c":".+ObjectWithIoIvars.+"}}.*}/,
               )
             end
           end
@@ -201,7 +201,7 @@ RSpec.describe Airbrake::Notice do
             it "doesn't fail" do
               notice[:params] = { a: [[ObjectWithIoIvars.new]] }
               expect(notice.to_json).to match(
-                /"params":{"a":\[\[".+ObjectWithIoIvars.+"\]\].*}/
+                /"params":{"a":\[\[".+ObjectWithIoIvars.+"\]\].*}/,
               )
             end
           end

data/spec/performance_breakdown_spec.rb

@@ -9,4 +9,15 @@ RSpec.describe Airbrake::PerformanceBreakdown do
 
     it { is_expected.to respond_to(:stash) }
   end
+
+  describe "#end_time" do
+    it "is always equal to start_time + 1 second by default" do
+      time = Time.now
+      performance_breakdown = described_class.new(
+        method: 'GET', route: '/', response_type: '', groups: {},
+        start_time: time
+      )
+      expect(performance_breakdown.end_time).to eq(time + 1)
+    end
+  end
 end

data/spec/performance_notifier_spec.rb

@@ -2,18 +2,20 @@ RSpec.describe Airbrake::PerformanceNotifier do
   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' }
+  let(:queues) { 'https://api.airbrake.io/api/v5/projects/1/queues-stats' }
 
   before do
     stub_request(:put, routes).to_return(status: 200, body: '')
     stub_request(:put, queries).to_return(status: 200, body: '')
     stub_request(:put, breakdowns).to_return(status: 200, body: '')
+    stub_request(:put, queues).to_return(status: 200, body: '')
 
     Airbrake::Config.instance = Airbrake::Config.new(
       project_id: 1,
       project_key: 'banana',
       performance_stats: true,
       performance_stats_flush_period: 0,
-      query_stats: true
+      query_stats: true,
     )
   end
 
@@ -27,9 +29,9 @@ RSpec.describe Airbrake::PerformanceNotifier do
           func: 'foo',
           file: 'foo.rb',
           line: 123,
-          start_time: Time.new(2018, 1, 1, 0, 49, 0, 0),
-          end_time: Time.new(2018, 1, 1, 0, 50, 0, 0)
-        )
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+        ),
       )
       subject.close
 
@@ -47,7 +49,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
             "sum":60000.0,
             "sumsq":3600000000.0,
             "tdigest":"AAAAAkA0AAAAAAAAAAAAAUdqYAAB"
-          }\]}\z|x)
+          }\]}\z|x),
       ).to have_been_made
     end
 
@@ -57,9 +59,9 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'POST',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 49, 0, 0),
-          end_time: Time.new(2018, 1, 1, 0, 50, 0, 0)
-        )
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+        ),
       )
       subject.close
 
@@ -74,7 +76,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
             "sum":60000.0,
             "sumsq":3600000000.0,
             "tdigest":"AAAAAkA0AAAAAAAAAAAAAUdqYAAB"
-          }\]}\z|x)
+          }\]}\z|x),
       ).to have_been_made
     end
 
@@ -84,10 +86,10 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'DELETE',
           route: '/routes-breakdowns',
           response_type: 'json',
-          start_time: Time.new(2018, 1, 1, 0, 49, 0, 0),
-          end_time: Time.new(2018, 1, 1, 0, 50, 0, 0),
-          groups: { db: 131, view: 421 }
-        )
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+          groups: { db: 131, view: 421 },
+        ),
       )
       subject.close
 
@@ -116,7 +118,47 @@ RSpec.describe Airbrake::PerformanceNotifier do
                 "tdigest":"AAAAAkA0AAAAAAAAAAAAAUPSgAAB"
               }
             }
-        }\]}\z|x)
+        }\]}\z|x),
+      ).to have_been_made
+    end
+
+    it "sends full queue" do
+      subject.notify(
+        Airbrake::Queue.new(
+          queue: 'emails',
+          error_count: 2,
+          groups: { redis: 131, sql: 421 },
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+        ),
+      )
+      subject.close
+
+      expect(
+        a_request(:put, queues).with(body: /
+          \A{"queues":\[{
+            "queue":"emails",
+            "errorCount":2,
+            "time":"2018-01-01T00:49:00\+00:00",
+            "count":1,
+            "sum":60000.0,
+            "sumsq":3600000000.0,
+            "tdigest":"AAAAAkA0AAAAAAAAAAAAAUdqYAAB",
+            "groups":{
+              "redis":{
+                "count":1,
+                "sum":131.0,
+                "sumsq":17161.0,
+                "tdigest":"AAAAAkA0AAAAAAAAAAAAAUMDAAAB"
+              },
+              "sql":{
+                "count":1,
+                "sum":421.0,
+                "sumsq":177241.0,
+                "tdigest":"AAAAAkA0AAAAAAAAAAAAAUPSgAAB"
+              }
+            }
+        }\]}\z/x),
       ).to have_been_made
     end
 
@@ -126,13 +168,14 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'GET',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 0, 20, 0)
-        )
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 0, 20, 0),
+        ),
       )
       subject.close
 
       expect(
-        a_request(:put, routes).with(body: /"time":"2018-01-01T00:00:00\+00:00"/)
+        a_request(:put, routes).with(body: /"time":"2018-01-01T00:00:00\+00:00"/),
       ).to have_been_made
     end
 
@@ -142,21 +185,21 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'GET',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 0, 20, 0)
-        )
+          timing: 213,
+        ),
       )
       subject.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 0, 50, 0)
-        )
+          timing: 123,
+        ),
       )
       subject.close
 
       expect(
-        a_request(:put, routes).with(body: /"count":2/)
+        a_request(:put, routes).with(body: /"count":2/),
       ).to have_been_made
     end
 
@@ -166,18 +209,18 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'GET',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 0, 49, 0),
-          end_time: Time.new(2018, 1, 1, 0, 0, 50, 0)
-        )
+          timing: 1000,
+          time: Time.new(2018, 1, 1, 0, 0, 49, 0),
+        ),
       )
       subject.notify(
         Airbrake::Request.new(
           method: 'GET',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 1, 49, 0),
-          end_time: Time.new(2018, 1, 1, 0, 1, 55, 0)
-        )
+          timing: 6000,
+          time: Time.new(2018, 1, 1, 0, 1, 49, 0),
+        ),
       )
       subject.close
 
@@ -191,8 +234,8 @@ RSpec.describe Airbrake::PerformanceNotifier do
               {"method":"GET","route":"/foo","statusCode":200,
                "time":"2018-01-01T00:01:00\+00:00","count":1,"sum":6000.0,
                "sumsq":36000000.0,"tdigest":"AAAAAkA0AAAAAAAAAAAAAUW7gAAB"}\]}
-          \z|x
-        )
+          \z|x,
+        ),
       ).to have_been_made
     end
 
@@ -202,18 +245,18 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'GET',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 49, 0, 0),
-          end_time: Time.new(2018, 1, 1, 0, 50, 0, 0)
-        )
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+        ),
       )
       subject.notify(
         Airbrake::Request.new(
           method: 'POST',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 49, 0, 0),
-          end_time: Time.new(2018, 1, 1, 0, 50, 0, 0)
-        )
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+        ),
       )
       subject.close
 
@@ -227,8 +270,8 @@ RSpec.describe Airbrake::PerformanceNotifier do
               {"method":"POST","route":"/foo","statusCode":200,
                "time":"2018-01-01T00:49:00\+00:00","count":1,"sum":60000.0,
                "sumsq":3600000000.0,"tdigest":"AAAAAkA0AAAAAAAAAAAAAUdqYAAB"}\]}
-          \z|x
-        )
+          \z|x,
+        ),
       ).to have_been_made
     end
 
@@ -238,20 +281,20 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'DELETE',
           route: '/routes-breakdowns',
           response_type: 'json',
-          start_time: Time.new(2018, 1, 1, 0, 0, 20, 0),
-          end_time: Time.new(2018, 1, 1, 0, 0, 22, 0),
-          groups: { db: 131, view: 421 }
-        )
+          timing: 2000,
+          time: Time.new(2018, 1, 1, 0, 0, 20, 0),
+          groups: { db: 131, view: 421 },
+        ),
       )
       subject.notify(
         Airbrake::PerformanceBreakdown.new(
           method: 'DELETE',
           route: '/routes-breakdowns',
           response_type: 'json',
-          start_time: Time.new(2018, 1, 1, 0, 0, 30, 0),
-          end_time: Time.new(2018, 1, 1, 0, 0, 32, 0),
-          groups: { db: 55, view: 11 }
-        )
+          timing: 2000,
+          time: Time.new(2018, 1, 1, 0, 0, 30, 0),
+          groups: { db: 55, view: 11 },
+        ),
       )
       subject.close
 
@@ -280,7 +323,56 @@ RSpec.describe Airbrake::PerformanceNotifier do
                 "tdigest":"AAAAAkA0AAAAAAAAAAAAAkEwAABDzQAAAQE="
               }
             }
-        }\]}\z|x)
+        }\]}\z|x),
+      ).to have_been_made
+    end
+
+    it "groups queues by queue key" do
+      subject.notify(
+        Airbrake::Queue.new(
+          queue: 'emails',
+          error_count: 2,
+          groups: { redis: 131, sql: 421 },
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+        ),
+      )
+      subject.notify(
+        Airbrake::Queue.new(
+          queue: 'emails',
+          error_count: 3,
+          groups: { redis: 131, sql: 421 },
+          timing: 60000,
+          time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+        ),
+      )
+      subject.close
+
+      expect(
+        a_request(:put, queues).with(body: /
+          \A{"queues":\[{
+            "queue":"emails",
+            "errorCount":5,
+            "time":"2018-01-01T00:49:00\+00:00",
+            "count":2,
+            "sum":120000.0,
+            "sumsq":7200000000.0,
+            "tdigest":"AAAAAkA0AAAAAAAAAAAAAUdqYAAC",
+            "groups":{
+              "redis":{
+                "count":2,
+                "sum":262.0,
+                "sumsq":34322.0,
+                "tdigest":"AAAAAkA0AAAAAAAAAAAAAUMDAAAC"
+              },
+              "sql":{
+                "count":2,
+                "sum":842.0,
+                "sumsq":354482.0,
+                "tdigest":"AAAAAkA0AAAAAAAAAAAAAUPSgAAC"
+              }
+            }
+        }\]}\z/x),
       ).to have_been_made
     end
 
@@ -290,8 +382,8 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'GET',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 49, 0, 0)
-        )
+          timing: 123,
+        ),
       )
       subject.close
 
@@ -301,7 +393,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
 
     it "checks performance stat configuration" do
       request = Airbrake::Request.new(
-        method: 'GET', route: '/foo', status_code: 200, start_time: Time.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)
@@ -317,15 +409,15 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'POST',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new
-        )
+          timing: 123,
+        ),
       )
       subject.close
 
       expect(
         a_request(:put, routes).with(
-          body: /\A{"routes":\[.+\],"environment":"test"}\z/x
-        )
+          body: /\A{"routes":\[.+\],"environment":"test"}\z/x,
+        ),
       ).to have_been_made
     end
 
@@ -346,7 +438,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
           project_id: 1,
           project_key: 'banana',
           performance_stats: true,
-          performance_stats_flush_period: flush_period
+          performance_stats_flush_period: flush_period,
         )
 
         subject.notify(
@@ -354,8 +446,8 @@ RSpec.describe Airbrake::PerformanceNotifier do
             method: 'GET',
             route: '/foo',
             status_code: 200,
-            start_time: Time.new(2018, 1, 1, 0, 49, 0, 0)
-          )
+            timing: 123,
+          ),
         )
 
         subject.notify(
@@ -363,8 +455,8 @@ 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: 123,
+          ),
         )
 
         sleep(flush_period + 0.5)
@@ -383,8 +475,8 @@ 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
 
@@ -397,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
@@ -419,18 +527,81 @@ 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: 123,
+          ),
         )
         subject.close
 
         expect(
           a_request(:put, queries).with(
-            body: /\A{"queries":\[{"method":"POST","route":"\[Filtered\]"/
-          )
+            body: /\A{"queries":\[{"method":"POST","route":"\[Filtered\]"/,
+          ),
         ).to have_been_made
       end
     end
+
+    context "when :start_time is specified (deprecated)" do
+      before do
+        allow(Kernel).to receive(:warn)
+      end
+
+      it "uses the value of :start_time to update stat" do
+        subject.notify(
+          Airbrake::Query.new(
+            method: 'POST',
+            route: '/foo',
+            query: 'SELECT * FROM things',
+            start_time: Time.new(2018, 1, 1, 0, 49, 0, 0),
+            end_time: Time.new(2018, 1, 1, 0, 50, 0, 0),
+          ),
+        )
+        subject.close
+
+        expect(
+          a_request(:put, queries).with(
+            body: /"count":1,"sum":60000.0,"sumsq":3600000000.0/,
+          ),
+        ).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
+    it "notifies synchronously" do
+      retval = subject.notify_sync(
+        Airbrake::Query.new(
+          method: 'POST',
+          route: '/foo',
+          query: 'SELECT * FROM things',
+          timing: 123,
+        ),
+      )
+
+      expect(
+        a_request(:put, queries).with(
+          body: %r|\A{"queries":\[{"method":"POST","route":"/foo"|,
+        ),
+      ).to have_been_made
+      expect(retval).to eq('' => nil)
+    end
   end
 
   describe "#close" do
@@ -449,8 +620,8 @@ 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: 123,
+        ),
       )
       subject.close
     end
@@ -458,7 +629,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
     it "logs the exit message" do
       allow(Airbrake::Loggable.instance).to receive(:debug)
       expect(Airbrake::Loggable.instance).to receive(:debug).with(
-        /performance notifier closed/
+        /performance notifier closed/,
       )
       subject.close
     end
@@ -480,8 +651,8 @@ RSpec.describe Airbrake::PerformanceNotifier do
           method: 'POST',
           route: '/foo',
           status_code: 200,
-          start_time: Time.new(2018, 1, 1, 0, 49, 0, 0)
-        )
+          timing: 123,
+        ),
       )
       subject.close