airbrake-ruby 5.0.0.rc.2 → 5.0.0

data/spec/code_hunk_spec.rb

@@ -34,9 +34,9 @@ RSpec.describe Airbrake::CodeHunk do
           eq(
             1 => 'module Airbrake',
             2 => '  ##',
-            # rubocop:disable Metrics/LineLength
+            # rubocop:disable Layout/LineLength
             3 => '  # Represents a chunk of information that is meant to be either sent to',
-            # rubocop:enable Metrics/LineLength
+            # rubocop:enable Layout/LineLength
           ),
         )
       end

data/spec/config/processor_spec.rb

@@ -54,26 +54,13 @@ RSpec.describe Airbrake::Config::Processor do
     end
 
     context "when the config defines a project_id" do
-      context "and when remote configuration is false" do
-        let(:config) do
-          Airbrake::Config.new(project_id: 123, __remote_configuration: false)
-        end
-
-        it "doesn't set remote settings" do
-          expect(Airbrake::RemoteSettings).not_to receive(:poll)
-          described_class.new(config).process_remote_configuration
-        end
+      let(:config) do
+        Airbrake::Config.new(project_id: 123)
       end
 
-      context "and when remote configuration is true" do
-        let(:config) do
-          Airbrake::Config.new(project_id: 123, __remote_configuration: true)
-        end
-
-        it "sets remote settings" do
-          expect(Airbrake::RemoteSettings).to receive(:poll)
-          described_class.new(config).process_remote_configuration
-        end
+      it "sets remote settings" do
+        expect(Airbrake::RemoteSettings).to receive(:poll)
+        described_class.new(config).process_remote_configuration
       end
     end
   end
@@ -142,7 +129,6 @@ RSpec.describe Airbrake::Config::Processor do
     let(:config) do
       Airbrake::Config.new(
         project_id: 123,
-        __remote_configuration: true,
         logger: logger,
       )
     end

data/spec/config_spec.rb

@@ -26,7 +26,10 @@ RSpec.describe Airbrake::Config do
   its(:query_stats) { is_expected.to eq(true) }
   its(:job_stats) { is_expected.to eq(true) }
   its(:error_notifications) { is_expected.to eq(true) }
-  its(:__remote_configuration) { is_expected.to eq(false) }
+
+  its(:remote_config_host) do
+    is_expected.to eq('https://v1-production-notifier-configs.s3.amazonaws.com')
+  end
 
   describe "#new" do
     context "when user config is passed" do
@@ -173,32 +176,4 @@ RSpec.describe Airbrake::Config do
       expect(subject.logger.level).to eq(Logger::WARN)
     end
   end
-
-  describe "#blacklist_keys=" do
-    before { allow(Kernel).to receive(:warn) }
-
-    it "sets blocklist_keys instead" do
-      subject.blacklist_keys = [1, 2, 3]
-      expect(subject.blocklist_keys).to eq([1, 2, 3])
-    end
-
-    it "prints a warning" do
-      expect(Kernel).to receive(:warn).with(/use blocklist_keys= instead/)
-      subject.blacklist_keys = [1, 2, 3]
-    end
-  end
-
-  describe "#whitelist_keys=" do
-    before { allow(Kernel).to receive(:warn) }
-
-    it "sets allowlist_keys instead" do
-      subject.whitelist_keys = [1, 2, 3]
-      expect(subject.allowlist_keys).to eq([1, 2, 3])
-    end
-
-    it "prints a warning" do
-      expect(Kernel).to receive(:warn).with(/use allowlist_keys= instead/)
-      subject.whitelist_keys = [1, 2, 3]
-    end
-  end
 end

data/spec/filters/gem_root_filter_spec.rb

@@ -7,18 +7,18 @@ RSpec.describe Airbrake::Filters::GemRootFilter do
   after { 2.times { Gem.path.pop } }
 
   it "replaces gem root in the backtrace with a label" do
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     notice[:errors].first[:backtrace] = [
       { file: "/home/kyrylo/code/airbrake/ruby/spec/spec_helper.rb" },
       { file: "#{root1}/gems/rspec-core-3.3.2/lib/rspec/core/configuration.rb" },
       { file: "/opt/rubies/ruby-2.2.2/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb" },
       { file: "#{root2}/gems/rspec-core-3.3.2/exe/rspec" },
     ]
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
 
     subject.call(notice)
 
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     expect(notice[:errors].first[:backtrace]).to(
       eq(
         [
@@ -29,7 +29,7 @@ RSpec.describe Airbrake::Filters::GemRootFilter do
         ],
       ),
     )
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
   end
 
   it "does not filter file when it is nil" do

data/spec/filters/keys_allowlist_spec.rb

@@ -151,6 +151,7 @@ RSpec.describe Airbrake::Filters::KeysAllowlist do
           # thing. One is a Java exception, the other is a Ruby exception.
           # Likely a bug: https://github.com/jruby/jruby/issues/1903
           raise ex unless RUBY_ENGINE == 'jruby'
+
           expect { subject.call(notice) }.to raise_error(java.lang.StackOverflowError)
         end
       end

data/spec/filters/keys_blocklist_spec.rb

@@ -150,6 +150,16 @@ RSpec.describe Airbrake::Filters::KeysBlocklist do
           { bongo: { bish: '[Filtered]' } },
         ],
       )
+
+      it "doesn't mutate the original hash" do
+        params = { bongo: { bish: 'bash' } }
+        notice[:params] = params
+
+        blocklist = described_class.new([:bish])
+        blocklist.call(notice)
+
+        expect(params[:bongo][:bish]).to eq('bash')
+      end
     end
 
     context "and it is recursive" do

data/spec/filters/root_directory_filter_spec.rb

@@ -5,18 +5,18 @@ RSpec.describe Airbrake::Filters::RootDirectoryFilter do
   let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   it "replaces root directory in the backtrace with a label" do
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     notice[:errors].first[:backtrace] = [
       { file: "/home/kyrylo/code/airbrake/ruby/spec/spec_helper.rb" },
       { file: "#{root_directory}/gems/rspec-core-3.3.2/lib/rspec/core/configuration.rb " },
       { file: "/opt/rubies/ruby-2.2.2/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb" },
       { file: "#{root_directory}/gems/rspec-core-3.3.2/exe/rspec" },
     ]
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
 
     subject.call(notice)
 
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     expect(notice[:errors].first[:backtrace]).to(
       eq(
         [
@@ -27,7 +27,7 @@ RSpec.describe Airbrake::Filters::RootDirectoryFilter do
         ],
       ),
     )
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
   end
 
   it "does not filter file when it is nil" do

data/spec/filters/sql_filter_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Airbrake::Filters::SqlFilter do
 
   ALL_DIALECTS = %i[mysql postgres sqlite cassandra oracle].freeze
 
-  # rubocop:disable Metrics/LineLength
+  # rubocop:disable Layout/LineLength
   [
     {
       input: 'SELECT * FROM things;',
@@ -229,7 +229,7 @@ RSpec.describe Airbrake::Filters::SqlFilter do
   ].each do |test|
     include_examples 'query filtering', test
   end
-  # rubocop:enable Metrics/LineLength
+  # rubocop:enable Layout/LineLength
 
   [
     'COMMIT',

data/spec/notice_notifier/options_spec.rb

@@ -149,10 +149,10 @@ RSpec.describe Airbrake::NoticeNotifier do
         expect(proxied_request.header['proxy-authorization'].first)
           .to eq('Basic dXNlcjpwYXNzd29yZA==')
 
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         expect(proxied_request.request_line)
           .to eq("POST http://localhost:#{proxy.config[:Port]}/api/v3/projects/105138/notices HTTP/1.1\r\n")
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       end
     end
 

data/spec/notice_notifier_spec.rb

@@ -309,7 +309,7 @@ RSpec.describe Airbrake::NoticeNotifier do
 
         notice = subject.build_notice(Exception.new)
 
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         expect(notice[:errors].first[:backtrace]).to eq(
           [
             { file: 'org/jruby/RubyKernel.java', line: 998, function: 'eval' },
@@ -317,7 +317,7 @@ RSpec.describe Airbrake::NoticeNotifier do
             { file: '/ruby/stdlib/irb.rb:489', line: 489, function: 'block in eval_input' },
           ],
         )
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       end
     end
 

data/spec/notice_spec.rb

@@ -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,21 +3,9 @@ RSpec.describe Airbrake::PerformanceBreakdown do
     subject do
       described_class.new(
         method: 'GET', route: '/', response_type: '', groups: {},
-        start_time: Time.now
       )
     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
-      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

@@ -541,31 +541,6 @@ RSpec.describe Airbrake::PerformanceNotifier do
       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)

data/spec/query_spec.rb

@@ -2,20 +2,10 @@ RSpec.describe Airbrake::Query do
   describe "#stash" do
     subject do
       described_class.new(
-        method: 'GET', route: '/', query: '', start_time: Time.now,
+        method: 'GET', route: '/', query: '',
       )
     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
-      query = described_class.new(
-        method: 'GET', route: '/', query: '', start_time: time,
-      )
-      expect(query.end_time).to eq(time + 1)
-    end
-  end
 end

data/spec/queue_spec.rb

@@ -9,21 +9,9 @@ RSpec.describe Airbrake::Queue 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
-      queue = described_class.new(
-        queue: 'bananas', error_count: 0, start_time: time,
-      )
-      expect(queue.end_time).to eq(time + 1)
-    end
-  end
-
   describe "#route" do
     it "always returns an empty route" do
-      queue = described_class.new(
-        queue: 'a', error_count: 0, start_time: Time.now,
-      )
+      queue = described_class.new(queue: 'a', error_count: 0)
       expect(queue.route).to be_empty
     end
   end

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/2020-06-18/config/123/config.json')
     end
   end
 
@@ -61,25 +60,64 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
   end
 
   describe "#config_route" do
-    context "when given a pathname" do
-      let(:data) do
-        { 'config_route' => 'http://example.com' }
+    let(:host) { 'https://v1-production-notifier-configs.s3.amazonaws.com' }
+
+    context "when given a remote host through the remote config" do
+      context "and when the remote host ends with a slash" do
+        let(:data) do
+          { 'config_route' => 'http://example.com/' }
+        end
+
+        it "returns the route with the host" 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
 
-      it "returns the given pathname" do
-        expect(described_class.new(project_id, data).config_route)
-          .to eq('http://example.com')
+      context "and when the remote host doesn't with a slash" do
+        let(:data) do
+          { 'config_route' => 'http://example.com' }
+        end
+
+        it "returns the route with the host" 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
+    end
+
+    context "when given a remote host through local configuration" do
+      context "and when the remote host ends with a slash" do
+        let(:host) { 'http://example.com/' }
+
+        it "returns the route with the host" 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 "and when the remote host doesn't with a slash" do
+        let(:host) { 'http://example.com' }
+
+        it "returns the route with the host" 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
     end
 
-    context "when the pathname is nil" do
+    context "when the given remote host in the remote config is 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/' \
+      it "returns the route with the given host instead" do
+        expect(described_class.new(project_id, data).config_route(host)).to eq(
+          'https://v1-production-notifier-configs.s3.amazonaws.com/' \
           "2020-06-18/config/#{project_id}/config.json",
         )
       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
@@ -51,7 +51,7 @@ RSpec.describe Airbrake::RemoteSettings 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) {}
+        remote_settings = described_class.poll(project_id, host) {}
         sleep(0.2)
         remote_settings.stop_polling
 
@@ -62,7 +62,7 @@ RSpec.describe Airbrake::RemoteSettings 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
 
@@ -76,7 +76,7 @@ RSpec.describe Airbrake::RemoteSettings do
             '**Airbrake: config loading failed: StandardError',
           )
 
-          remote_settings = described_class.poll(project_id) {}
+          remote_settings = described_class.poll(project_id, host) {}
           sleep(0.2)
           remote_settings.stop_polling
 
@@ -87,7 +87,7 @@ RSpec.describe Airbrake::RemoteSettings do
 
     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 +95,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 +107,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)
@@ -126,7 +126,7 @@ RSpec.describe Airbrake::RemoteSettings do
 
       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 +144,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)
@@ -163,7 +163,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)
@@ -189,7 +189,7 @@ RSpec.describe Airbrake::RemoteSettings do
       end
 
       it "makes the next request to the specified config route" do
-        remote_settings = described_class.poll(project_id) {}
+        remote_settings = described_class.poll(project_id, host) {}
         sleep(0.2)
 
         remote_settings.stop_polling
@@ -205,7 +205,7 @@ RSpec.describe Airbrake::RemoteSettings 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) {}
+      remote_settings = described_class.poll(project_id, host) {}
       sleep(0.2)
       remote_settings.stop_polling
 
@@ -219,7 +219,7 @@ RSpec.describe Airbrake::RemoteSettings do
           '**Airbrake: config dumping failed: StandardError',
         )
 
-        remote_settings = described_class.poll(project_id) {}
+        remote_settings = described_class.poll(project_id, host) {}
         sleep(0.2)
         remote_settings.stop_polling