airbrake-ruby 5.0.0.rc.2-java → 5.2.0-java

data/spec/remote_settings/settings_data_spec.rb

@@ -9,12 +9,11 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
 
     it "merges the given hash with the data" do
       settings_data = described_class.new(project_id, {})
-      # rubocop:disable Performance/RedundantMerge
       settings_data.merge!('poll_sec' => 123, 'config_route' => 'abc')
-      # rubocop:enable Performance/RedundantMerge
 
       expect(settings_data.interval).to eq(123)
-      expect(settings_data.config_route).to eq('abc')
+      expect(settings_data.config_route(''))
+        .to eq('/abc')
     end
   end
 
@@ -61,26 +60,48 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
   end
 
   describe "#config_route" do
-    context "when given a pathname" do
+    let(:host) { 'http://example.com/' }
+
+    context "when remote config specifies a config route" do
       let(:data) do
-        { 'config_route' => 'http://example.com' }
+        { 'config_route' => '123/cfg/321/cfg.json' }
       end
 
-      it "returns the given pathname" do
-        expect(described_class.new(project_id, data).config_route)
-          .to eq('http://example.com')
+      it "returns the config route with the provided location" do
+        expect(described_class.new(project_id, data).config_route(host)).to eq(
+          'http://example.com/123/cfg/321/cfg.json',
+        )
       end
     end
 
-    context "when the pathname is nil" do
+    context "when remote config DOES NOT specify a config route" do
+      it "returns the config route with the default location" do
+        expect(described_class.new(project_id, {}).config_route(host)).to eq(
+          "http://example.com/2020-06-18/config/#{project_id}/config.json",
+        )
+      end
+    end
+
+    context "when a config route is specified but is set to nil" do
       let(:data) do
         { 'config_route' => nil }
       end
 
-      it "returns the default pathname" do
-        expect(described_class.new(project_id, data).config_route).to eq(
-          'https://v1-staging-notifier-configs.s3.amazonaws.com/' \
-          "2020-06-18/config/#{project_id}/config.json",
+      it "returns the config route with the default location" do
+        expect(described_class.new(project_id, data).config_route(host)).to eq(
+          "http://example.com/2020-06-18/config/#{project_id}/config.json",
+        )
+      end
+    end
+
+    context "when a config route is specified but is set to an empty string" do
+      let(:data) do
+        { 'config_route' => '' }
+      end
+
+      it "returns the route with the default instead" do
+        expect(described_class.new(project_id, data).config_route(host)).to eq(
+          "http://example.com/2020-06-18/config/#{project_id}/config.json",
         )
       end
     end

data/spec/remote_settings_spec.rb

@@ -1,9 +1,9 @@
 RSpec.describe Airbrake::RemoteSettings do
   let(:project_id) { 123 }
+  let(:host) { 'https://v1-production-notifier-configs.s3.amazonaws.com' }
 
   let(:endpoint) do
-    "https://v1-staging-notifier-configs.s3.amazonaws.com/2020-06-18/config/" \
-    "#{project_id}/config.json"
+    "#{host}/2020-06-18/config/#{project_id}/config.json"
   end
 
   let(:body) do
@@ -22,72 +22,34 @@ RSpec.describe Airbrake::RemoteSettings do
     }
   end
 
-  let(:config_path) { described_class::CONFIG_DUMP_PATH }
-  let(:config_dir) { File.dirname(config_path) }
-
   let!(:stub) do
     stub_request(:get, Regexp.new(endpoint))
       .to_return(status: 200, body: body.to_json)
   end
 
-  before do
-    # Do not create config dumps on disk.
-    allow(Dir).to receive(:mkdir).with(config_dir)
-    allow(File).to receive(:write).with(config_path, anything)
-  end
-
   describe ".poll" do
     describe "config loading" do
       let(:settings_data) { described_class::SettingsData.new(project_id, body) }
 
       before do
-        allow(File).to receive(:exist?).with(config_path).and_return(true)
-        allow(File).to receive(:read).with(config_path).and_return(body.to_json)
-
         allow(described_class::SettingsData).to receive(:new).and_return(settings_data)
       end
 
-      it "loads the config from disk" do
-        expect(File).to receive(:read).with(config_path)
-        expect(settings_data).to receive(:merge!).with(body).twice
-
-        remote_settings = described_class.poll(project_id) {}
-        sleep(0.2)
-        remote_settings.stop_polling
-
-        expect(stub).to have_been_requested.once
-      end
-
       it "yields the config to the block twice" do
         block = proc {}
         expect(block).to receive(:call).twice
 
-        remote_settings = described_class.poll(project_id, &block)
+        remote_settings = described_class.poll(project_id, host, &block)
         sleep(0.2)
         remote_settings.stop_polling
 
         expect(stub).to have_been_requested.once
       end
-
-      context "when config loading fails" do
-        it "logs an error" do
-          expect(File).to receive(:read).and_raise(StandardError)
-          expect(Airbrake::Loggable.instance).to receive(:error).with(
-            '**Airbrake: config loading failed: StandardError',
-          )
-
-          remote_settings = described_class.poll(project_id) {}
-          sleep(0.2)
-          remote_settings.stop_polling
-
-          expect(stub).to have_been_requested.once
-        end
-      end
     end
 
     context "when no errors are raised" do
       it "makes a request to AWS S3" do
-        remote_settings = described_class.poll(project_id) {}
+        remote_settings = described_class.poll(project_id, host) {}
         sleep(0.1)
         remote_settings.stop_polling
 
@@ -95,7 +57,7 @@ RSpec.describe Airbrake::RemoteSettings do
       end
 
       it "sends params about the environment with the request" do
-        remote_settings = described_class.poll(project_id) {}
+        remote_settings = described_class.poll(project_id, host) {}
         sleep(0.1)
         remote_settings.stop_polling
 
@@ -107,7 +69,7 @@ RSpec.describe Airbrake::RemoteSettings do
 
       it "fetches remote settings" do
         settings = nil
-        remote_settings = described_class.poll(project_id) do |data|
+        remote_settings = described_class.poll(project_id, host) do |data|
           settings = data
         end
         sleep(0.1)
@@ -121,12 +83,12 @@ RSpec.describe Airbrake::RemoteSettings do
 
     context "when an error is raised while making a HTTP request" do
       before do
-        allow(Net::HTTP).to receive(:get).and_raise(StandardError)
+        allow(Net::HTTP).to receive(:get_response).and_raise(StandardError)
       end
 
       it "doesn't fetch remote settings" do
         settings = nil
-        remote_settings = described_class.poll(project_id) do |data|
+        remote_settings = described_class.poll(project_id, host) do |data|
           settings = data
         end
         sleep(0.1)
@@ -144,7 +106,7 @@ RSpec.describe Airbrake::RemoteSettings do
 
       it "doesn't update settings data" do
         settings = nil
-        remote_settings = described_class.poll(project_id) do |data|
+        remote_settings = described_class.poll(project_id, host) do |data|
           settings = data
         end
         sleep(0.1)
@@ -155,15 +117,15 @@ RSpec.describe Airbrake::RemoteSettings do
       end
     end
 
-    context "when API returns an XML response" do
+    context "when API returns a non-200 response" do
       let!(:stub) do
         stub_request(:get, Regexp.new(endpoint))
-          .to_return(status: 200, body: '<?xml ...')
+          .to_return(status: 201, body: body.to_json)
       end
 
       it "doesn't update settings data" do
         settings = nil
-        remote_settings = described_class.poll(project_id) do |data|
+        remote_settings = described_class.poll(project_id, host) do |data|
           settings = data
         end
         sleep(0.1)
@@ -172,58 +134,53 @@ RSpec.describe Airbrake::RemoteSettings do
         expect(stub).to have_been_requested.once
         expect(settings.interval).to eq(600)
       end
-    end
 
-    context "when a config route is specified in the returned data" do
-      let(:new_endpoint) do
-        "http://example.com"
-      end
+      it "logs error" do
+        expect(Airbrake::Loggable.instance).to receive(:error).with(body.to_json)
 
-      let(:body) do
-        { 'config_route' => new_endpoint, 'poll_sec' => 0.1 }
+        remote_settings = described_class.poll(project_id, host) {}
+        sleep(0.1)
+        remote_settings.stop_polling
       end
+    end
 
-      let!(:new_stub) do
-        stub_request(:get, Regexp.new(new_endpoint))
+    context "when API returns a 200 response" do
+      let!(:stub) do
+        stub_request(:get, Regexp.new(endpoint))
           .to_return(status: 200, body: body.to_json)
       end
 
-      it "makes the next request to the specified config route" do
-        remote_settings = described_class.poll(project_id) {}
-        sleep(0.2)
+      it "doesn't log errors" do
+        expect(Airbrake::Loggable.instance).not_to receive(:error)
 
+        remote_settings = described_class.poll(project_id, host) {}
+        sleep(0.1)
         remote_settings.stop_polling
-
-        expect(stub).to have_been_requested.once
-        expect(new_stub).to have_been_requested.once
       end
     end
-  end
-
-  describe "#stop_polling" do
-    it "dumps config data to disk" do
-      expect(Dir).to receive(:mkdir).with(config_dir)
-      expect(File).to receive(:write).with(config_path, body.to_json)
 
-      remote_settings = described_class.poll(project_id) {}
-      sleep(0.2)
-      remote_settings.stop_polling
+    context "when a config route is specified in the returned data" do
+      let(:new_config_route) do
+        '213/config/111/config.json'
+      end
 
-      expect(stub).to have_been_requested.once
-    end
+      let(:body) do
+        { 'config_route' => new_config_route, 'poll_sec' => 0.1 }
+      end
 
-    context "when config dumping fails" do
-      it "logs an error" do
-        expect(File).to receive(:write).and_raise(StandardError)
-        expect(Airbrake::Loggable.instance).to receive(:error).with(
-          '**Airbrake: config dumping failed: StandardError',
-        )
+      let!(:new_stub) do
+        stub_request(:get, Regexp.new(new_config_route))
+          .to_return(status: 200, body: body.to_json)
+      end
 
-        remote_settings = described_class.poll(project_id) {}
+      it "makes the next request to the specified config route" do
+        remote_settings = described_class.poll(project_id, host) {}
         sleep(0.2)
+
         remote_settings.stop_polling
 
         expect(stub).to have_been_requested.once
+        expect(new_stub).to have_been_requested.once
       end
     end
   end

data/spec/request_spec.rb

@@ -1,21 +1,9 @@
 RSpec.describe Airbrake::Request do
   describe "#stash" do
     subject do
-      described_class.new(
-        method: 'GET', route: '/', status_code: 200, start_time: Time.now,
-      )
+      described_class.new(method: 'GET', route: '/', status_code: 200)
     end
 
     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
-      request = described_class.new(
-        method: 'GET', route: '/', status_code: 200, start_time: time,
-      )
-      expect(request.end_time).to eq(time + 1)
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -33,7 +33,7 @@ class AirbrakeTestError < RuntimeError
 
   def initialize(*)
     super
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     @backtrace = [
       "/home/kyrylo/code/airbrake/ruby/spec/spec_helper.rb:23:in `<top (required)>'",
       "/opt/rubies/ruby-2.2.2/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb:54:in `require'",
@@ -49,7 +49,7 @@ class AirbrakeTestError < RuntimeError
       "/home/kyrylo/.gem/ruby/2.2.2/gems/rspec-core-3.3.2/lib/rspec/core/runner.rb:41:in `invoke'",
       "/home/kyrylo/.gem/ruby/2.2.2/gems/rspec-core-3.3.2/exe/rspec:4:in `<main>'",
     ]
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
   end
 
   # rubocop:disable Naming/AccessorMethodName
@@ -66,7 +66,7 @@ end
 class JavaAirbrakeTestError < AirbrakeTestError
   def initialize(*)
     super
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     @backtrace = [
       "org.jruby.java.invokers.InstanceMethodInvoker.call(InstanceMethodInvoker.java:26)",
       "org.jruby.ir.interpreter.Interpreter.INTERPRET_EVAL(Interpreter.java:126)",
@@ -80,7 +80,7 @@ class JavaAirbrakeTestError < AirbrakeTestError
       "org.jruby.Main.run(Main.java:225)",
       "org.jruby.Main.main(Main.java:197)",
     ]
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
   end
 
   def is_a?(*)

data/spec/stat_spec.rb

@@ -10,15 +10,6 @@ RSpec.describe Airbrake::Stat do
     end
   end
 
-  describe "#increment" do
-    let(:start_time) { Time.new(2018, 1, 1, 0, 0, 20, 0) }
-    let(:end_time) { Time.new(2018, 1, 1, 0, 0, 22, 0) }
-
-    before { subject.increment(start_time, end_time) }
-
-    its(:sum) { is_expected.to eq(2000) }
-  end
-
   describe "#increment_ms" do
     before { subject.increment_ms(1000) }
 

data/spec/tdigest_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe Airbrake::TDigest do
           maxerr = [maxerr, (i - q).abs].max
         end
 
-        expect(maxerr).to be < 0.01
+        expect(maxerr).to be < 0.02
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc.2
+  version: 5.2.0
 platform: java
 authors:
 - Airbrake Technologies, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree-jruby
@@ -79,6 +79,7 @@ files:
 - lib/airbrake-ruby/query.rb
 - lib/airbrake-ruby/queue.rb
 - lib/airbrake-ruby/remote_settings.rb
+- lib/airbrake-ruby/remote_settings/callback.rb
 - lib/airbrake-ruby/remote_settings/settings_data.rb
 - lib/airbrake-ruby/request.rb
 - lib/airbrake-ruby/response.rb
@@ -135,6 +136,7 @@ files:
 - spec/promise_spec.rb
 - spec/query_spec.rb
 - spec/queue_spec.rb
+- spec/remote_settings/callback_spec.rb
 - spec/remote_settings/settings_data_spec.rb
 - spec/remote_settings_spec.rb
 - spec/request_spec.rb
@@ -160,12 +162,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key:
@@ -215,6 +217,7 @@ test_files:
 - spec/notice_notifier/options_spec.rb
 - spec/filter_chain_spec.rb
 - spec/remote_settings/settings_data_spec.rb
+- spec/remote_settings/callback_spec.rb
 - spec/response_spec.rb
 - spec/queue_spec.rb
 - spec/code_hunk_spec.rb