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

data/lib/airbrake-ruby/request.rb

@@ -4,7 +4,6 @@ module Airbrake
   # @see Airbrake.notify_request
   # @api public
   # @since v3.2.0
-  # rubocop:disable Metrics/ParameterLists
   class Request
     include HashKeyable
     include Ignorable
@@ -12,15 +11,12 @@ module Airbrake
     include Mergeable
     include Grouppable
 
-    attr_accessor :method, :route, :status_code, :start_time, :end_time,
-                  :timing, :time
+    attr_accessor :method, :route, :status_code, :timing, :time
 
     def initialize(
       method:,
       route:,
       status_code:,
-      start_time: Time.now,
-      end_time: start_time + 1,
       timing: nil,
       time: Time.now
     )
@@ -28,8 +24,6 @@ module Airbrake
       @method = method
       @route = route
       @status_code = status_code
-      @start_time = start_time
-      @end_time = end_time
       @timing = timing
       @time = time
     end
@@ -51,5 +45,4 @@ module Airbrake
       }.delete_if { |_key, val| val.nil? }
     end
   end
-  # rubocop:enable Metrics/ParameterLists
 end

data/lib/airbrake-ruby/stat.rb

@@ -9,7 +9,7 @@ module Airbrake
   #
   # @example
   #   stat = Airbrake::Stat.new
-  #   stat.increment(Time.now - 200)
+  #   stat.increment_ms(2000)
   #   stat.to_h # Pack and serialize data so it can be transmitted.
   #
   # @since v3.2.0
@@ -41,17 +41,6 @@ module Airbrake
       end
     end
 
-    # Increments tdigest timings and updates tdigest with the difference between
-    # +end_time+ and +start_time+.
-    #
-    # @param [Date] start_time
-    # @param [Date] end_time
-    # @return [void]
-    def increment(start_time, end_time = nil)
-      end_time ||= Time.new
-      increment_ms((end_time - start_time) * 1000)
-    end
-
     # Increments tdigest timings and updates tdigest with given +ms+ value.
     #
     # @param [Float] ms

data/lib/airbrake-ruby/sync_sender.rb

@@ -47,6 +47,7 @@ module Airbrake
       end
 
       return promise.reject(parsed_resp['error']) if parsed_resp.key?('error')
+
       promise.resolve(parsed_resp)
     end
 

data/lib/airbrake-ruby/tdigest.rb

@@ -200,6 +200,7 @@ module Airbrake
         unless (0..1).cover?(item)
           raise ArgumentError, "p should be in [0,1], got #{item}"
         end
+
         if size == 0
           nil
         else
@@ -271,6 +272,7 @@ module Airbrake
           shift = 7
           while (v & 0x80) != 0
             raise 'Shift too large in decode' if shift > 28
+
             v = counts_bytes.shift || 0
             z += (v & 0x7f) << shift
             shift += 7

data/lib/airbrake-ruby/thread_pool.rb

@@ -129,6 +129,7 @@ module Airbrake
       Thread.new do
         while (message = @queue.pop)
           break if message == :stop
+
           @block.call(message)
         end
       end

data/lib/airbrake-ruby/truncator.rb

@@ -12,6 +12,10 @@ module Airbrake
     #   strings with +ENCODING_OPTIONS+
     TEMP_ENCODING = 'utf-16'.freeze
 
+    # @return [Array<Encoding>] encodings that are eligible for fixing invalid
+    #   characters
+    SUPPORTED_ENCODINGS = [Encoding::UTF_8, Encoding::ASCII].freeze
+
     # @return [String] what to append when something is a circular reference
     CIRCULAR = '[Circular]'.freeze
 
@@ -35,6 +39,7 @@ module Airbrake
     def truncate(object, seen = Set.new)
       if seen.include?(object.object_id)
         return CIRCULAR if CIRCULAR_TYPES.any? { |t| object.is_a?(t) }
+
         return object
       end
       truncate_object(object, seen << object.object_id)
@@ -63,6 +68,7 @@ module Airbrake
     def truncate_string(str)
       fixed_str = replace_invalid_characters(str)
       return fixed_str if fixed_str.length <= @max_size
+
       (fixed_str.slice(0, @max_size) + TRUNCATED).freeze
     end
 
@@ -76,6 +82,7 @@ module Airbrake
       truncated_hash = {}
       hash.each_with_index do |(key, val), idx|
         break if idx + 1 > @max_size
+
         truncated_hash[key] = truncate(val, seen)
       end
 
@@ -103,8 +110,7 @@ module Airbrake
     # @return [String] a UTF-8 encoded string
     # @see https://github.com/flori/json/commit/3e158410e81f94dbbc3da6b7b35f4f64983aa4e3
     def replace_invalid_characters(str)
-      encoding = str.encoding
-      utf8_string = (encoding == Encoding::UTF_8 || encoding == Encoding::ASCII)
+      utf8_string = SUPPORTED_ENCODINGS.include?(str.encoding)
       return str if utf8_string && str.valid_encoding?
 
       temp_str = str.dup

data/lib/airbrake-ruby/version.rb

@@ -3,10 +3,10 @@
 module Airbrake
   # @return [String] the library version
   # @api public
-  AIRBRAKE_RUBY_VERSION = '5.0.0.rc.2'.freeze
+  AIRBRAKE_RUBY_VERSION = '5.2.0'.freeze
 
   # @return [Hash{Symbol=>String}] the information about the notifier library
-  # @since ?.?.?
+  # @since v5.0.0
   # @api public
   NOTIFIER_INFO = {
     name: 'airbrake-ruby'.freeze,

data/spec/backtrace_spec.rb

@@ -2,7 +2,7 @@ RSpec.describe Airbrake::Backtrace do
   describe ".parse" do
     context "UNIX backtrace" do
       let(:parsed_backtrace) do
-        # rubocop:disable Metrics/LineLength, Style/HashSyntax, Layout/SpaceAroundOperators, Layout/SpaceInsideHashLiteralBraces
+        # rubocop:disable Layout/LineLength, Style/HashSyntax, Layout/SpaceAroundOperators, Layout/SpaceInsideHashLiteralBraces
         [{:file=>"/home/kyrylo/code/airbrake/ruby/spec/spec_helper.rb", :line=>23, :function=>"<top (required)>"},
          {:file=>"/opt/rubies/ruby-2.2.2/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb", :line=>54, :function=>"require"},
          {:file=>"/opt/rubies/ruby-2.2.2/lib/ruby/2.2.0/rubygems/core_ext/kernel_require.rb", :line=>54, :function=>"require"},
@@ -16,7 +16,7 @@ RSpec.describe Airbrake::Backtrace do
          {:file=>"/home/kyrylo/.gem/ruby/2.2.2/gems/rspec-core-3.3.2/lib/rspec/core/runner.rb", :line=>73, :function=>"run"},
          {:file=>"/home/kyrylo/.gem/ruby/2.2.2/gems/rspec-core-3.3.2/lib/rspec/core/runner.rb", :line=>41, :function=>"invoke"},
          {:file=>"/home/kyrylo/.gem/ruby/2.2.2/gems/rspec-core-3.3.2/exe/rspec", :line=>4, :function=>"<main>"}]
-        # rubocop:enable Metrics/LineLength, Style/HashSyntax, Layout/SpaceAroundOperators, Layout/SpaceInsideHashLiteralBraces
+        # rubocop:enable Layout/LineLength, Style/HashSyntax, Layout/SpaceAroundOperators, Layout/SpaceInsideHashLiteralBraces
       end
 
       it "returns a properly formatted array of hashes" do
@@ -34,10 +34,10 @@ RSpec.describe Airbrake::Backtrace do
       let(:ex) { AirbrakeTestError.new.tap { |e| e.set_backtrace(windows_bt) } }
 
       let(:parsed_backtrace) do
-        # rubocop:disable Metrics/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
+        # rubocop:disable Layout/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
         [{:file=>"C:/Program Files/Server/app/models/user.rb", :line=>13, :function=>"magic"},
          {:file=>"C:/Program Files/Server/app/controllers/users_controller.rb", :line=>8, :function=>"index"}]
-        # rubocop:enable Metrics/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
+        # rubocop:enable Layout/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
       end
 
       it "returns a properly formatted array of hashes" do
@@ -47,7 +47,7 @@ RSpec.describe Airbrake::Backtrace do
 
     context "JRuby Java exceptions" do
       let(:backtrace_array) do
-        # rubocop:disable Metrics/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
+        # rubocop:disable Layout/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
         [{:file=>"InstanceMethodInvoker.java", :line=>26, :function=>"org.jruby.java.invokers.InstanceMethodInvoker.call"},
          {:file=>"Interpreter.java", :line=>126, :function=>"org.jruby.ir.interpreter.Interpreter.INTERPRET_EVAL"},
          {:file=>"RubyKernel$INVOKER$s$0$3$eval19.gen", :line=>nil, :function=>"org.jruby.RubyKernel$INVOKER$s$0$3$eval19.call"},
@@ -59,7 +59,7 @@ RSpec.describe Airbrake::Backtrace do
          {:file=>"Compiler.java", :line=>111, :function=>"org.jruby.ir.Compiler$1.load"},
          {:file=>"Main.java", :line=>225, :function=>"org.jruby.Main.run"},
          {:file=>"Main.java", :line=>197, :function=>"org.jruby.Main.main"}]
-        # rubocop:enable Metrics/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
+        # rubocop:enable Layout/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
       end
 
       it "returns a properly formatted array of hashes" do
@@ -72,21 +72,21 @@ RSpec.describe Airbrake::Backtrace do
 
     context "JRuby classloader exceptions" do
       let(:backtrace) do
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         ['uri_3a_classloader_3a_.META_minus_INF.jruby_dot_home.lib.ruby.stdlib.net.protocol.rbuf_fill(uri:classloader:/META-INF/jruby.home/lib/ruby/stdlib/net/protocol.rb:158)',
          'bin.processors.image_uploader.block in make_streams(bin/processors/image_uploader.rb:21)',
          'uri_3a_classloader_3a_.gems.faye_minus_websocket_minus_0_dot_10_dot_5.lib.faye.websocket.api.invokeOther13:dispatch_event(uri_3a_classloader_3a_/gems/faye_minus_websocket_minus_0_dot_10_dot_5/lib/faye/websocket/uri:classloader:/gems/faye-websocket-0.10.5/lib/faye/websocket/api.rb:109)',
          'tmp.jruby9022301782566983632extract.$dot.META_minus_INF.rails.file(/tmp/jruby9022301782566983632extract/./META-INF/rails.rb:13)']
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       end
 
       let(:parsed_backtrace) do
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         [{ file: 'uri:classloader:/META-INF/jruby.home/lib/ruby/stdlib/net/protocol.rb', line: 158, function: 'uri_3a_classloader_3a_.META_minus_INF.jruby_dot_home.lib.ruby.stdlib.net.protocol.rbuf_fill' },
          { file: 'bin/processors/image_uploader.rb', line: 21, function: 'bin.processors.image_uploader.block in make_streams' },
          { file: 'uri_3a_classloader_3a_/gems/faye_minus_websocket_minus_0_dot_10_dot_5/lib/faye/websocket/uri:classloader:/gems/faye-websocket-0.10.5/lib/faye/websocket/api.rb', line: 109, function: 'uri_3a_classloader_3a_.gems.faye_minus_websocket_minus_0_dot_10_dot_5.lib.faye.websocket.api.invokeOther13:dispatch_event' },
          { file: '/tmp/jruby9022301782566983632extract/./META-INF/rails.rb', line: 13, function: 'tmp.jruby9022301782566983632extract.$dot.META_minus_INF.rails.file' }]
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       end
 
       let(:ex) { JavaAirbrakeTestError.new.tap { |e| e.set_backtrace(backtrace) } }
@@ -99,19 +99,19 @@ RSpec.describe Airbrake::Backtrace do
 
     context "JRuby non-throwable exceptions" do
       let(:backtrace) do
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         ['org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl(org/postgresql/core/v3/ConnectionFactoryImpl.java:257)',
          'org.postgresql.core.ConnectionFactory.openConnection(org/postgresql/core/ConnectionFactory.java:65)',
          'org.postgresql.jdbc2.AbstractJdbc2Connection.<init>(org/postgresql/jdbc2/AbstractJdbc2Connection.java:149)']
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       end
 
       let(:parsed_backtrace) do
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         [{ file: 'org/postgresql/core/v3/ConnectionFactoryImpl.java', line: 257, function: 'org.postgresql.core.v3.ConnectionFactoryImpl.openConnectionImpl' },
          { file: 'org/postgresql/core/ConnectionFactory.java', line: 65, function: 'org.postgresql.core.ConnectionFactory.openConnection' },
          { file: 'org/postgresql/jdbc2/AbstractJdbc2Connection.java', line: 149, function: 'org.postgresql.jdbc2.AbstractJdbc2Connection.<init>' }]
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       end
 
       let(:ex) { AirbrakeTestError.new.tap { |e| e.set_backtrace(backtrace) } }
@@ -123,22 +123,22 @@ RSpec.describe Airbrake::Backtrace do
 
     context "generic backtrace" do
       context "when function is absent" do
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         let(:generic_bt) do
           ["/home/bingo/bango/assets/stylesheets/error_pages.scss:139:in `animation'",
            "/home/bingo/bango/assets/stylesheets/error_pages.scss:139",
            "/home/bingo/.gem/ruby/2.2.2/gems/sass-3.4.20/lib/sass/tree/visitors/perform.rb:349:in `block in visit_mixin'"]
         end
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
 
         let(:ex) { AirbrakeTestError.new.tap { |e| e.set_backtrace(generic_bt) } }
 
         let(:parsed_backtrace) do
-          # rubocop:disable Metrics/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
+          # rubocop:disable Layout/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
           [{:file=>"/home/bingo/bango/assets/stylesheets/error_pages.scss", :line=>139, :function=>"animation"},
            {:file=>"/home/bingo/bango/assets/stylesheets/error_pages.scss", :line=>139, :function=>nil},
            {:file=>"/home/bingo/.gem/ruby/2.2.2/gems/sass-3.4.20/lib/sass/tree/visitors/perform.rb", :line=>349, :function=>"block in visit_mixin"}]
-          # rubocop:enable Metrics/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
+          # rubocop:enable Layout/LineLength, Style/HashSyntax, Layout/SpaceInsideHashLiteralBraces, Layout/SpaceAroundOperators
         end
 
         it "returns a properly formatted array of hashes" do
@@ -277,9 +277,9 @@ RSpec.describe Airbrake::Backtrace do
                 93 => '        begin',
                 94 => '          json = @payload.to_json',
                 95 => '        rescue *JSON_EXCEPTIONS => ex',
-                # rubocop:disable Metrics/LineLength,Lint/InterpolationCheck
+                # rubocop:disable Layout/LineLength,Lint/InterpolationCheck
                 96 => '          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")',
-                # rubocop:enable Metrics/LineLength,Lint/InterpolationCheck
+                # rubocop:enable Layout/LineLength,Lint/InterpolationCheck
               },
             },
             {
@@ -325,9 +325,9 @@ RSpec.describe Airbrake::Backtrace do
                 93 => '        begin',
                 94 => '          json = @payload.to_json',
                 95 => '        rescue *JSON_EXCEPTIONS => ex',
-                # rubocop:disable Metrics/LineLength,Lint/InterpolationCheck
+                # rubocop:disable Layout/LineLength,Lint/InterpolationCheck
                 96 => '          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")',
-                # rubocop:enable Metrics/LineLength,Lint/InterpolationCheck
+                # rubocop:enable Layout/LineLength,Lint/InterpolationCheck
               },
             },
           ]
@@ -357,9 +357,9 @@ RSpec.describe Airbrake::Backtrace do
                 93 => '        begin',
                 94 => '          json = @payload.to_json',
                 95 => '        rescue *JSON_EXCEPTIONS => ex',
-                # rubocop:disable Metrics/LineLength,Lint/InterpolationCheck
+                # rubocop:disable Layout/LineLength,Lint/InterpolationCheck
                 96 => '          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")',
-                # rubocop:enable Metrics/LineLength,Lint/InterpolationCheck
+                # rubocop:enable Layout/LineLength,Lint/InterpolationCheck
               },
             },
             {
@@ -370,9 +370,9 @@ RSpec.describe Airbrake::Backtrace do
                 93 => '        begin',
                 94 => '          json = @payload.to_json',
                 95 => '        rescue *JSON_EXCEPTIONS => ex',
-                # rubocop:disable Metrics/LineLength,Lint/InterpolationCheck
+                # rubocop:disable Layout/LineLength,Lint/InterpolationCheck
                 96 => '          @config.logger.debug("#{LOG_LABEL} `notice.to_json` failed: #{ex.class}: #{ex}")',
-                # rubocop:enable Metrics/LineLength,Lint/InterpolationCheck
+                # rubocop:enable Layout/LineLength,Lint/InterpolationCheck
                 97 => '        else',
               },
             },

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

@@ -53,27 +53,32 @@ RSpec.describe Airbrake::Config::Processor do
       end
     end
 
+    context "when the config sets environment to 'test'" do
+      let(:config) { Airbrake::Config.new(project_id: 123, environment: 'test') }
+
+      it "doesn't set remote settings" do
+        expect(Airbrake::RemoteSettings).not_to receive(:poll)
+        described_class.new(config).process_remote_configuration
+      end
+    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
+      let(:config) do
+        Airbrake::Config.new(project_id: 123, environment: 'not-test')
+      end
 
-        it "doesn't set remote settings" do
-          expect(Airbrake::RemoteSettings).not_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
 
-      context "and when remote configuration is true" do
-        let(:config) do
-          Airbrake::Config.new(project_id: 123, __remote_configuration: true)
-        end
+    context "when the config disables the remote_config option" do
+      let(:config) { Airbrake::Config.new(project_id: 123, remote_config: false) }
 
-        it "sets remote settings" do
-          expect(Airbrake::RemoteSettings).to receive(:poll)
-          described_class.new(config).process_remote_configuration
-        end
+      it "doesn't set remote settings" do
+        expect(Airbrake::RemoteSettings).not_to receive(:poll)
+        described_class.new(config).process_remote_configuration
       end
     end
   end
@@ -135,89 +140,4 @@ RSpec.describe Airbrake::Config::Processor do
       end
     end
   end
-
-  describe "#poll_callback" do
-    let(:logger) { Logger.new(File::NULL) }
-
-    let(:config) do
-      Airbrake::Config.new(
-        project_id: 123,
-        __remote_configuration: true,
-        logger: logger,
-      )
-    end
-
-    let(:data) do
-      instance_double(Airbrake::RemoteSettings::SettingsData)
-    end
-
-    before do
-      allow(data).to receive(:to_h)
-      allow(data).to receive(:error_host)
-      allow(data).to receive(:apm_host)
-      allow(data).to receive(:error_notifications?)
-      allow(data).to receive(:performance_stats?)
-    end
-
-    it "logs given data" do
-      expect(logger).to receive(:debug).with(/applying remote settings/)
-      described_class.new(config).poll_callback(data)
-    end
-
-    it "sets the error_notifications option" do
-      config.error_notifications = false
-      expect(data).to receive(:error_notifications?).and_return(true)
-
-      described_class.new(config).poll_callback(data)
-      expect(config.error_notifications).to eq(true)
-    end
-
-    it "sets the performance_stats option" do
-      config.performance_stats = false
-      expect(data).to receive(:performance_stats?).and_return(true)
-
-      described_class.new(config).poll_callback(data)
-      expect(config.performance_stats).to eq(true)
-    end
-
-    context "when error_host returns a value" do
-      it "sets the error_host option" do
-        config.error_host = 'http://api.airbrake.io'
-        allow(data).to receive(:error_host).and_return('https://api.example.com')
-
-        described_class.new(config).poll_callback(data)
-        expect(config.error_host).to eq('https://api.example.com')
-      end
-    end
-
-    context "when error_host returns nil" do
-      it "doesn't modify the error_host option" do
-        config.error_host = 'http://api.airbrake.io'
-        allow(data).to receive(:error_host).and_return(nil)
-
-        described_class.new(config).poll_callback(data)
-        expect(config.error_host).to eq('http://api.airbrake.io')
-      end
-    end
-
-    context "when apm_host returns a value" do
-      it "sets the apm_host option" do
-        config.apm_host = 'http://api.airbrake.io'
-        allow(data).to receive(:apm_host).and_return('https://api.example.com')
-
-        described_class.new(config).poll_callback(data)
-        expect(config.apm_host).to eq('https://api.example.com')
-      end
-    end
-
-    context "when apm_host returns nil" do
-      it "doesn't modify the apm_host option" do
-        config.apm_host = 'http://api.airbrake.io'
-        allow(data).to receive(:apm_host).and_return(nil)
-
-        described_class.new(config).poll_callback(data)
-        expect(config.apm_host).to eq('http://api.airbrake.io')
-      end
-    end
-  end
 end