airbrake-ruby 4.8.0 → 5.2.0

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
@@ -268,7 +268,7 @@ RSpec.describe Airbrake::Notice do
     it "sets a payload value" do
       hash = { bingo: 'bango' }
       notice[:params] = hash
-      expect(notice[:params]).to equal(hash)
+      expect(notice[:params]).to eq(hash)
     end
 
     it "raises error if notice is ignored" do

data/spec/performance_breakdown_spec.rb

@@ -3,7 +3,6 @@ RSpec.describe Airbrake::PerformanceBreakdown do
     subject do
       described_class.new(
         method: 'GET', route: '/', response_type: '', groups: {},
-        start_time: Time.now
       )
     end
 

data/spec/performance_notifier_spec.rb

@@ -2,18 +2,21 @@ 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,
+      job_stats: true,
     )
   end
 
@@ -27,9 +30,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 +50,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 +60,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 +77,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 +87,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 +119,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 +169,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 +186,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 +210,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 +235,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 +246,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 +271,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 +282,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 +324,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,18 +383,18 @@ 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
 
       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
       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 +410,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 +439,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 +447,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 +456,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 +476,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 +490,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 +528,56 @@ 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 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('' => '')
+    end
   end
 
   describe "#close" do
@@ -449,8 +596,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 +605,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 +627,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