airbrake 9.1.0 → 9.2.0

data/spec/integration/rails/rails_spec.rb

@@ -322,7 +322,7 @@ RSpec.describe "Rails integration specs" do
       end
     end
 
-    context "when an action performs a HTTP request" do
+    context "when an action performs a Net::HTTP request" do
       let!(:example_request) do
         stub_request(:get, 'http://example.com').to_return(body: '')
       end
@@ -334,5 +334,97 @@ RSpec.describe "Rails integration specs" do
         expect(example_request).to have_been_made
       end
     end
+
+    context "when an action performs a Curl request" do
+      let!(:example_request) do
+        stub_request(:get, 'http://example.com').to_return(body: '')
+      end
+
+      before { skip("JRuby doesn't support Curb") if Airbrake::JRUBY }
+
+      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_curl_http'
+        expect(example_request).to have_been_made
+      end
+    end
+
+    context "when an action performs a Curl::Easy request" do
+      let!(:example_request) do
+        stub_request(:get, 'http://example.com').to_return(body: '')
+      end
+
+      before { skip("JRuby doesn't support Curb") if Airbrake::JRUBY }
+
+      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_curl_http_easy'
+        expect(example_request).to have_been_made
+      end
+    end
+
+    context "when an action performs a Curl::Multi request" do
+      before { skip("JRuby doesn't support Curb") if Airbrake::JRUBY }
+
+      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_curl_http_multi'
+      end
+    end
+
+    context "when an action performs an Excon 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: { http: be > 0 }))
+        get '/breakdown_excon'
+        expect(example_request).to have_been_made
+      end
+    end
+
+    context "when an action performs a HTTP.rb 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: { http: be > 0 }))
+        get '/breakdown_http_rb'
+        expect(example_request).to have_been_made
+      end
+    end
+
+    context "when an action performs a HTTPClient 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: { http: be > 0 }))
+        get '/breakdown_http_client'
+        expect(example_request).to have_been_made
+      end
+    end
+
+    context "when an action performs a Typhoeus 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: { http: be > 0 }))
+        get '/breakdown_typhoeus'
+        expect(example_request).to have_been_made
+      end
+    end
   end
 end

data/spec/unit/rack/instrumentable_spec.rb

@@ -0,0 +1,89 @@
+RSpec.describe Airbrake::Rack::Instrumentable do
+  after { Airbrake::Rack::RequestStore.clear }
+
+  describe ".airbrake_capture_timing" do
+    let(:routes) { Airbrake::Rack::RequestStore[:routes] }
+
+    let(:klass) do
+      Class.new do
+        extend Airbrake::Rack::Instrumentable
+
+        def method; end
+        airbrake_capture_timing :method
+
+        def method_with_arg(a); end
+        airbrake_capture_timing :method_with_arg
+
+        def method_with_args(a, b); end
+        airbrake_capture_timing :method_with_args
+
+        def method_with_vla(*args); end
+        airbrake_capture_timing :method_with_vla
+
+        def method_with_args_and_vla(*args); end
+        airbrake_capture_timing :method_with_args_and_vla
+
+        def method_with_kwargs(foo:, bar:); end
+        airbrake_capture_timing :method_with_kwargs
+      end
+    end
+
+    context "when request store doesn't have any routes" do
+      before { Airbrake::Rack::RequestStore.clear }
+
+      it "doesn't store timing of the tracked method" do
+        klass.new.method
+        expect(Airbrake::Rack::RequestStore.store).to be_empty
+      end
+    end
+
+    context "when request store has a route" do
+      let(:groups) { routes['/about'][:groups] }
+
+      before do
+        Airbrake::Rack::RequestStore[:routes] = {
+          '/about' => {
+            method: 'GET',
+            response_type: :html,
+            groups: {}
+          }
+        }
+      end
+
+      it "attaches timing for a method without an argument" do
+        klass.new.method
+        expect(groups).to match('method' => be > 0)
+      end
+
+      it "attaches timing for a method with an argument" do
+        klass.new.method_with_arg(1)
+        expect(groups).to match('method_with_arg' => be > 0)
+      end
+
+      it "attaches timing for a variable-length argument method" do
+        klass.new.method_with_vla(1, 2, 3)
+        expect(groups).to match('method_with_vla' => be > 0)
+      end
+
+      it "attaches timing for a method with args and a variable-length array" do
+        klass.new.method_with_args_and_vla(1, 2, 3)
+        expect(groups).to match('method_with_args_and_vla' => be > 0)
+      end
+
+      it "attaches timing for a method with kwargs" do
+        klass.new.method_with_kwargs(foo: 1, bar: 2)
+        expect(groups).to match('method_with_kwargs' => be > 0)
+      end
+
+      it "attaches all timings for multiple methods to the request store" do
+        klass.new.method
+        klass.new.method_with_arg(1)
+
+        expect(groups).to match(
+          'method' => be > 0,
+          'method_with_arg' => be > 0
+        )
+      end
+    end
+  end
+end

data/spec/unit/rack/rack_spec.rb

@@ -0,0 +1,46 @@
+RSpec.describe Airbrake::Rack do
+  after { Airbrake::Rack::RequestStore.clear }
+
+  describe ".timing" do
+    let(:routes) { Airbrake::Rack::RequestStore[:routes] }
+
+    context "when request store doesn't have any routes" do
+      it "doesn't store timing" do
+        described_class.capture_timing('operation') {}
+        expect(Airbrake::Rack::RequestStore.store).to be_empty
+      end
+
+      it "returns the value of the block" do
+        expect(described_class.capture_timing('operation') { 1 }).to eq(1)
+      end
+    end
+
+    context "when request store has a route" do
+      before do
+        Airbrake::Rack::RequestStore[:routes] = {
+          '/about' => {
+            method: 'GET',
+            response_type: :html,
+            groups: {}
+          }
+        }
+      end
+
+      it "attaches all timings for different operations to the request store" do
+        described_class.capture_timing('operation 1') {}
+        described_class.capture_timing('operation 2') {}
+        described_class.capture_timing('operation 3') {}
+
+        expect(routes['/about'][:groups]).to match(
+          'operation 1' => be > 0,
+          'operation 2' => be > 0,
+          'operation 3' => be > 0
+        )
+      end
+
+      it "returns the value of the block" do
+        expect(described_class.capture_timing('operation') { 1 }).to eq(1)
+      end
+    end
+  end
+end

data/spec/unit/rails/excon_spec.rb

@@ -0,0 +1,46 @@
+require 'airbrake/rails/excon_subscriber'
+
+RSpec.describe Airbrake::Rails::Excon do
+  after { Airbrake::Rack::RequestStore.clear }
+
+  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_performance_breakdown)
+      subject.call([])
+    end
+  end
+
+  context "when there's a route in the request store" do
+    let(:route) { Airbrake::Rack::RequestStore[:routes]['/test-route'] }
+
+    before do
+      Airbrake::Rack::RequestStore[:routes] = {
+        '/test-route' => { groups: {} }
+      }
+
+      expect(event).to receive(:duration).and_return(0.1)
+    end
+
+    it "sets http group value of that route" do
+      subject.call([])
+      expect(route[:groups][:http]).to eq(0.1)
+    end
+
+    context "and when the subscriber is called multiple times" do
+      before { expect(event).to receive(:duration).and_return(0.1) }
+
+      it "increments http group value of that route" do
+        subject.call([])
+        subject.call([])
+
+        expect(route[:groups][:http]).to eq(0.2)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +240,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.64'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.64'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: |
   Airbrake is an online tool that provides robust exception tracking in any of
   your Ruby applications. In doing so, it allows you to easily review errors, tie
@@ -266,6 +336,7 @@ files:
 - lib/airbrake/rack/context_filter.rb
 - lib/airbrake/rack/http_headers_filter.rb
 - lib/airbrake/rack/http_params_filter.rb
+- lib/airbrake/rack/instrumentable.rb
 - lib/airbrake/rack/middleware.rb
 - lib/airbrake/rack/request_body_filter.rb
 - lib/airbrake/rack/request_store.rb
@@ -285,8 +356,13 @@ files:
 - lib/airbrake/rails/active_record_subscriber.rb
 - lib/airbrake/rails/app.rb
 - lib/airbrake/rails/backtrace_cleaner.rb
+- lib/airbrake/rails/curb.rb
 - lib/airbrake/rails/event.rb
+- lib/airbrake/rails/excon_subscriber.rb
+- lib/airbrake/rails/http.rb
+- lib/airbrake/rails/http_client.rb
 - lib/airbrake/rails/net_http.rb
+- lib/airbrake/rails/typhoeus.rb
 - lib/airbrake/rake.rb
 - lib/airbrake/rake/tasks.rb
 - lib/airbrake/resque.rb
@@ -315,7 +391,9 @@ files:
 - spec/unit/rack/context_filter_spec.rb
 - spec/unit/rack/http_headers_filter_spec.rb
 - spec/unit/rack/http_params_filter_spec.rb
+- spec/unit/rack/instrumentable_spec.rb
 - spec/unit/rack/middleware_spec.rb
+- spec/unit/rack/rack_spec.rb
 - spec/unit/rack/request_body_filter_spec.rb
 - spec/unit/rack/request_store_spec.rb
 - spec/unit/rack/route_filter_spec.rb
@@ -327,6 +405,7 @@ files:
 - 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/rails/excon_spec.rb
 - spec/unit/rake/tasks_spec.rb
 - spec/unit/shoryuken_spec.rb
 - spec/unit/sidekiq/retryable_jobs_filter_spec.rb
@@ -351,8 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Airbrake is an online tool that provides robust exception tracking in any
@@ -369,10 +447,12 @@ test_files:
 - spec/unit/rack/request_body_filter_spec.rb
 - spec/unit/rack/http_params_filter_spec.rb
 - spec/unit/rack/http_headers_filter_spec.rb
+- spec/unit/rack/rack_spec.rb
 - spec/unit/rack/middleware_spec.rb
 - spec/unit/rack/session_filter_spec.rb
 - spec/unit/rack/context_filter_spec.rb
 - spec/unit/rack/user_filter_spec.rb
+- spec/unit/rack/instrumentable_spec.rb
 - spec/unit/rack/user_spec.rb
 - spec/unit/rack/route_filter_spec.rb
 - spec/unit/rails/action_controller_performance_breakdown_subscriber_spec.rb
@@ -380,6 +460,7 @@ test_files:
 - 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/unit/rails/excon_spec.rb
 - spec/integration/sinatra/sinatra_spec.rb
 - spec/integration/rack/rack_spec.rb
 - spec/integration/shared_examples/rack_examples.rb