airbrake 9.0.2 → 9.1.0

data/spec/integration/rails/rails_spec.rb

@@ -262,7 +262,7 @@ RSpec.describe "Rails integration specs" do
         hash_including(
           route: '/crash(.:format)',
           method: 'GET',
-          func: 'tap',
+          func: 'call',
           file: 'lib/airbrake/rails/active_record_subscriber.rb',
           line: anything
         )
@@ -305,5 +305,34 @@ RSpec.describe "Rails integration specs" do
 
       get '/breakdown'
     end
+
+    context "when response format is */*" do
+      it "normalizes it to :html" do
+        expect(Airbrake).to receive(:notify_performance_breakdown)
+          .with(hash_including(response_type: :html))
+        get '/breakdown', {}, 'HTTP_ACCEPT' => '*/*'
+      end
+    end
+
+    context "when db_runtime is nil" do
+      it "omits the db group" do
+        expect(Airbrake).to receive(:notify_performance_breakdown)
+          .with(hash_including(groups: { view: be > 0 }))
+        get '/breakdown_view_only'
+      end
+    end
+
+    context "when an action performs a HTTP request" do
+      let!(:example_request) do
+        stub_request(:get, 'http://example.com').to_return(body: '')
+      end
+
+      it "includes the http breakdown" do
+        expect(Airbrake).to receive(:notify_performance_breakdown)
+          .with(hash_including(groups: { view: be > 0, http: be > 0 }))
+        get '/breakdown_http'
+        expect(example_request).to have_been_made
+      end
+    end
   end
 end

data/spec/unit/rails/action_controller_notify_subscriber_spec.rb

@@ -0,0 +1,43 @@
+require 'airbrake/rails/action_controller_notify_subscriber'
+
+RSpec.describe Airbrake::Rails::ActionControllerNotifySubscriber do
+  after { Airbrake::Rack::RequestStore.clear }
+
+  describe "#call" do
+    let(:event) { double(Airbrake::Rails::Event) }
+
+    before do
+      allow(Airbrake::Rails::Event).to receive(:new).and_return(event)
+    end
+
+    context "when there are no routes in the request store" do
+      it "doesn't notify requests" do
+        expect(Airbrake).not_to receive(:notify_request)
+        subject.call([])
+      end
+    end
+
+    context "when there's a route in the request store" do
+      before do
+        Airbrake::Rack::RequestStore[:routes] = {
+          '/test-route' => { method: 'GET', response_type: :html }
+        }
+
+        expect(event).to receive(:method).and_return('GET')
+        expect(event).to receive(:status_code).and_return(200)
+        expect(event).to receive(:time).and_return(Time.now)
+      end
+
+      it "sends request info to Airbrake" do
+        expect(Airbrake).to receive(:notify_request).with(
+          hash_including(
+            method: 'GET',
+            route: '/test-route',
+            status_code: 200
+          )
+        )
+        subject.call([])
+      end
+    end
+  end
+end

data/spec/unit/rails/action_controller_performance_breakdown_subscriber_spec.rb

@@ -1,6 +1,13 @@
 require 'airbrake/rails/action_controller_performance_breakdown_subscriber'
 
 RSpec.describe Airbrake::Rails::ActionControllerPerformanceBreakdownSubscriber do
+  let(:app) { double(Airbrake::Rails::App) }
+  let(:event) { double(Airbrake::Rails::Event) }
+
+  before do
+    allow(Airbrake::Rails::Event).to receive(:new).and_return(event)
+  end
+
   after { Airbrake::Rack::RequestStore.clear }
 
   context "when routes are not set in the request store" do
@@ -13,7 +20,7 @@ RSpec.describe Airbrake::Rails::ActionControllerPerformanceBreakdownSubscriber d
   end
 
   context "when there are no routes in the request store" do
-    before { Airbrake::Rack::RequestStore[:routes] = [] }
+    before { Airbrake::Rack::RequestStore[:routes] = {} }
 
     it "doesn't send performance breakdown info" do
       expect(Airbrake).not_to receive(:notify_performance_breakdown)
@@ -22,121 +29,35 @@ RSpec.describe Airbrake::Rails::ActionControllerPerformanceBreakdownSubscriber d
   end
 
   context "when there's a route in the request store" do
-    let(:event) do
-      OpenStruct.new(
-        payload: {
-          format: :html,
-          view_runtime: 0.5,
-          db_runtime: 0.5
-        }
-      )
-    end
-
     before do
-      Airbrake::Rack::RequestStore[:routes] = [['/test-route', 'GET']]
-
-      event_dbl = double
-      expect(event_dbl).to receive(:new).and_return(event)
-      stub_const('ActiveSupport::Notifications::Event', event_dbl)
-    end
-
-    it "sends performance info to Airbrake" do
-      expect(Airbrake).to receive(:notify_performance_breakdown).with(
-        hash_including(
-          route: '/test-route',
-          method: 'GET',
-          response_type: :html,
-          groups: { db: 0.5, view: 0.5 }
-        )
-      )
-      subject.call([])
-    end
-
-    context "and when view_runtime is nil" do
-      before { event.payload[:view_runtime] = nil }
-
-      it "omits view_runtime" do
-        expect(Airbrake).to receive(:notify_performance_breakdown).with(
-          hash_including(
-            route: '/test-route',
-            method: 'GET',
-            response_type: :html,
-            groups: { db: 0.5 }
-          )
-        )
-        subject.call([])
-      end
-    end
-
-    context "and when db_runtime is nil" do
-      before { event.payload[:db_runtime] = nil }
-
-      it "omits db_runtime" do
-        expect(Airbrake).to receive(:notify_performance_breakdown).with(
-          hash_including(
-            route: '/test-route',
-            method: 'GET',
-            response_type: :html,
-            groups: { view: 0.5 }
-          )
-        )
-        subject.call([])
-      end
+      expect(event).to receive(:groups).and_return(db: 0.5, view: 0.5)
+      expect(event).to receive(:method).and_return('GET')
+      expect(event).to receive(:response_type).and_return(:html)
+      expect(event).to receive(:time).and_return(Time.new)
     end
 
-    context "when db_runtime is zero" do
-      before { event.payload[:db_runtime] = 0 }
-
-      it "omits db_runtime" do
-        expect(Airbrake).to receive(:notify_performance_breakdown).with(
-          hash_including(
-            route: '/test-route',
+    context "when request store routes have extra groups" do
+      before do
+        Airbrake::Rack::RequestStore[:routes] = {
+          '/test-route' => {
             method: 'GET',
             response_type: :html,
-            groups: { view: 0.5 }
-          )
-        )
-        subject.call([])
+            groups: { http: 0.5 }
+          }
+        }
       end
-    end
 
-    context "when view_runtime is zero" do
-      before { event.payload[:view_runtime] = 0 }
-
-      it "omits view_runtime" do
+      it "sends performance info to Airbrake with extra groups" do
         expect(Airbrake).to receive(:notify_performance_breakdown).with(
           hash_including(
             route: '/test-route',
             method: 'GET',
             response_type: :html,
-            groups: { db: 0.5 }
+            groups: { db: 0.5, view: 0.5, http: 0.5 }
           )
         )
         subject.call([])
       end
     end
-
-    context "when db_runtime and view_runtime are both zero" do
-      before do
-        event.payload[:db_runtime] = 0
-        event.payload[:view_runtime] = 0
-      end
-
-      it "doesn't notify Airbrake" do
-        expect(Airbrake).not_to receive(:notify_performance_breakdown)
-        subject.call([])
-      end
-    end
-
-    context "when response format is */*" do
-      before { event.payload[:format] = "*/*" }
-
-      it "normalizes it to :html" do
-        expect(Airbrake).to receive(:notify_performance_breakdown).with(
-          hash_including(response_type: :html)
-        )
-        subject.call([])
-      end
-    end
   end
 end

data/spec/unit/rails/action_controller_route_subscriber_spec.rb

@@ -0,0 +1,84 @@
+require 'ostruct'
+require 'airbrake/rails/action_controller_route_subscriber'
+
+RSpec.describe Airbrake::Rails::ActionControllerRouteSubscriber do
+  describe "#call" do
+    let(:app) { double(Airbrake::Rails::App) }
+    let(:event) { double(Airbrake::Rails::Event) }
+
+    let(:event_params) do
+      [
+        'start_processing.action_controller',
+        Time.new,
+        Time.new,
+        '123',
+        { method: 'HEAD', path: '/crash' }
+      ]
+    end
+
+    before do
+      allow(Airbrake::Rails::App).to receive(:new).and_return(app)
+      allow(Airbrake::Rails::Event).to receive(:new).and_return(event)
+    end
+
+    context "when request store has the :routes key" do
+      let(:routes) do
+        [Airbrake::Rails::App::Route.new('/crash', 'DummyController', 'crash')]
+      end
+
+      before do
+        allow(app).to receive(:routes).and_return(routes)
+        allow(event).to receive(:params).and_return(params)
+        allow(event).to receive(:method).and_return('HEAD')
+        allow(event).to receive(:response_type).and_return(:html)
+
+        Airbrake::Rack::RequestStore[:routes] = {}
+      end
+
+      after { Airbrake::Rack::RequestStore.clear }
+
+      context "and when the route can be found" do
+        let(:params) do
+          OpenStruct.new(controller: 'DummyController', action: 'crash')
+        end
+
+        it "stores a route in the request store under :routes" do
+          subject.call(event_params)
+          expect(Airbrake::Rack::RequestStore[:routes])
+            .to eq('/crash' => { method: 'HEAD', response_type: :html, groups: {} })
+        end
+      end
+
+      context "and when the event controller can't be found" do
+        let(:params) do
+          OpenStruct.new(controller: 'BananaController', action: 'crash')
+        end
+
+        it "doesn't store any routes in the request store under :routes" do
+          subject.call(event_params)
+          expect(Airbrake::Rack::RequestStore[:routes]).to be_empty
+        end
+      end
+
+      context "and when the event action can't be found" do
+        let(:params) do
+          OpenStruct.new(controller: 'DummyController', action: 'banana')
+        end
+
+        it "doesn't store any routes in the request store under :routes" do
+          subject.call(event_params)
+          expect(Airbrake::Rack::RequestStore[:routes]).to be_empty
+        end
+      end
+    end
+
+    context "when request store doesn't have the :routes key" do
+      before { Airbrake::Rack::RequestStore.clear }
+
+      it "doesn't store any routes in the request store" do
+        subject.call(event_params)
+        expect(Airbrake::Rack::RequestStore[:routes]).to be_nil
+      end
+    end
+  end
+end

data/spec/unit/rails/active_record_subscriber_spec.rb

@@ -0,0 +1,70 @@
+require 'airbrake/rails/active_record_subscriber'
+
+RSpec.describe Airbrake::Rails::ActiveRecordSubscriber do
+  after { Airbrake::Rack::RequestStore.clear }
+
+  describe "#call" do
+    let(:event) { double(Airbrake::Rails::Event) }
+
+    before do
+      allow(Airbrake::Rails::Event).to receive(:new).and_return(event)
+    end
+
+    context "when there are no routes in the request store" do
+      it "doesn't notify requests" do
+        expect(Airbrake).not_to receive(:notify_query)
+        subject.call([])
+      end
+    end
+
+    context "when there's a route in the request store" do
+      before do
+        Airbrake::Rack::RequestStore[:routes] = {
+          '/test-route' => { method: 'GET', response_type: :html }
+        }
+
+        allow(event).to receive(:sql).and_return('SELECT * FROM bananas')
+        allow(event).to receive(:time).and_return(Time.now)
+        allow(event).to receive(:end).and_return(Time.now)
+        allow(Airbrake::Rails::BacktraceCleaner).to receive(:clean).and_return(
+          "/lib/pry/cli.rb:117:in `start'"
+        )
+      end
+
+      it "sends query info to Airbrake" do
+        expect(Airbrake).to receive(:notify_query).with(
+          hash_including(
+            method: 'GET',
+            route: '/test-route',
+            query: 'SELECT * FROM bananas',
+            func: 'start',
+            line: 117,
+            file: '/lib/pry/cli.rb'
+          )
+        )
+        subject.call([])
+      end
+
+      context "and when backtrace couldn't be parsed" do
+        before do
+          allow(Airbrake::Rails::BacktraceCleaner)
+            .to receive(:clean).and_return([])
+        end
+
+        it "sends empty func/file/line to Airbrake" do
+          expect(Airbrake).to receive(:notify_query).with(
+            hash_including(
+              method: 'GET',
+              route: '/test-route',
+              query: 'SELECT * FROM bananas',
+              func: nil,
+              line: nil,
+              file: nil
+            )
+          )
+          subject.call([])
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.1.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -283,6 +283,10 @@ files:
 - lib/airbrake/rails/active_job.rb
 - lib/airbrake/rails/active_record.rb
 - lib/airbrake/rails/active_record_subscriber.rb
+- lib/airbrake/rails/app.rb
+- lib/airbrake/rails/backtrace_cleaner.rb
+- lib/airbrake/rails/event.rb
+- lib/airbrake/rails/net_http.rb
 - lib/airbrake/rake.rb
 - lib/airbrake/rake/tasks.rb
 - lib/airbrake/resque.rb
@@ -319,7 +323,10 @@ files:
 - spec/unit/rack/user_filter_spec.rb
 - spec/unit/rack/user_spec.rb
 - spec/unit/rails/action_cable/notify_callback_spec.rb
+- spec/unit/rails/action_controller_notify_subscriber_spec.rb
 - spec/unit/rails/action_controller_performance_breakdown_subscriber_spec.rb
+- spec/unit/rails/action_controller_route_subscriber_spec.rb
+- spec/unit/rails/active_record_subscriber_spec.rb
 - spec/unit/rake/tasks_spec.rb
 - spec/unit/shoryuken_spec.rb
 - spec/unit/sidekiq/retryable_jobs_filter_spec.rb
@@ -369,7 +376,10 @@ test_files:
 - spec/unit/rack/user_spec.rb
 - spec/unit/rack/route_filter_spec.rb
 - spec/unit/rails/action_controller_performance_breakdown_subscriber_spec.rb
+- spec/unit/rails/active_record_subscriber_spec.rb
 - spec/unit/rails/action_cable/notify_callback_spec.rb
+- spec/unit/rails/action_controller_notify_subscriber_spec.rb
+- spec/unit/rails/action_controller_route_subscriber_spec.rb
 - spec/integration/sinatra/sinatra_spec.rb
 - spec/integration/rack/rack_spec.rb
 - spec/integration/shared_examples/rack_examples.rb