airbrake-ruby 6.0.0-java → 6.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e62872ef39cf99827e1c0e7395c645acace3addb2b61919d23504ba686fc57c1
-  data.tar.gz: f769f0604e3dd7118df53cb6de2e3115beed43a898e9eefb5828174c29f16f67
+  metadata.gz: b9bfa519dc331372374e2feab05e1429f19c17d3159fd30aef317acbed91e087
+  data.tar.gz: a2b4daefe2139f002a42754b6df05c6c11dca9d80b0ecf440cd0620336a2d87e
 SHA512:
-  metadata.gz: 1fef60cb8667cd9c5582dcab3f4d6562efc4ced3bafa89b2b538efe8b4f6dbbffa1663f27423d83d35f13d591f5b88675f8f5993731c2af4c09e52cffbb2af8c
-  data.tar.gz: 737a3900b60024d24303d10277d89ab782f60c58cadeb8e7fef3b7da17e983c8dd0033724e3640fe07d3428f1f86952f65ef378f81547213c2a8b11a9271eaa7
+  metadata.gz: 1da651d71a63854fa720ca1253052a6615a0c53224f7ae6bd80ba781037a790f7d92c2997cd5d820a32ad677b5512866e394cc06b96ff986a275cedb3012c41b
+  data.tar.gz: e09266840dd038be725ad564d6db02696e5c6a0f188eae5206da30cbd2cf454eccbe56cbcf027b454821e6ef1bee29cb8fb2db7c7c61f81ffa6e0ecb1566c133

data/lib/airbrake-ruby/filters/git_last_checkout_filter.rb

@@ -72,7 +72,7 @@ module Airbrake
         return unless File.exist?(head_path)
 
         last_line = nil
-        IO.foreach(head_path) do |line|
+        File.foreach(head_path) do |line|
           last_line = line if checkout_line?(line)
         end
         last_line

data/lib/airbrake-ruby/remote_settings.rb

@@ -1,7 +1,7 @@
 module Airbrake
   # RemoteSettings polls the remote config of the passed project at fixed
   # intervals. The fetched config is yielded as a callback parameter so that the
-  # invoker can define read config values.
+  # invoker can define read config values. Supports proxies.
   #
   # @example Disable/enable error notifications based on the remote value
   #   RemoteSettings.poll do |data|
@@ -43,6 +43,7 @@ module Airbrake
       @data = SettingsData.new(project_id, {})
       @host = host
       @block = block
+      @config = Airbrake::Config.instance
       @poll = nil
     end
 
@@ -72,11 +73,16 @@ module Airbrake
     private
 
     def fetch_config
+      uri = build_config_uri
+      https = build_https(uri)
+      req = Net::HTTP::Get.new(uri.request_uri)
       response = nil
+
       begin
-        response = Net::HTTP.get_response(build_config_uri)
+        response = https.request(req)
       rescue StandardError => ex
-        logger.error(ex)
+        reason = "#{LOG_LABEL} HTTP error: #{ex}"
+        logger.error(reason)
         return {}
       end
 
@@ -101,5 +107,22 @@ module Airbrake
       uri.query = QUERY_PARAMS
       uri
     end
+
+    def build_https(uri)
+      Net::HTTP.new(uri.host, uri.port, *proxy_params).tap do |https|
+        https.use_ssl = uri.is_a?(URI::HTTPS)
+        if @config.timeout
+          https.open_timeout = @config.timeout
+          https.read_timeout = @config.timeout
+        end
+      end
+    end
+
+    def proxy_params
+      return unless @config.proxy.key?(:host)
+
+      [@config.proxy[:host], @config.proxy[:port], @config.proxy[:user],
+       @config.proxy[:password]]
+    end
   end
 end

data/lib/airbrake-ruby/thread_pool.rb

@@ -48,11 +48,11 @@ module Airbrake
     #   false if the queue is full
     def <<(message)
       if backlog >= @queue_size
-        logger.error(
+        logger.info do
           "#{LOG_LABEL} ThreadPool has reached its capacity of " \
           "#{@queue_size} and the following message will not be " \
-          "processed: #{message.inspect}",
-        )
+          "processed: #{message.inspect}"
+        end
         return false
       end
 

data/lib/airbrake-ruby/version.rb

@@ -3,7 +3,7 @@
 module Airbrake
   # @return [String] the library version
   # @api public
-  AIRBRAKE_RUBY_VERSION = '6.0.0'.freeze
+  AIRBRAKE_RUBY_VERSION = '6.0.1'.freeze
 
   # @return [Hash{Symbol=>String}] the information about the notifier library
   # @since v5.0.0

data/spec/filters/git_revision_filter_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe Airbrake::Filters::GitRevisionFilter do
         end
       end
 
-      context "and also when HEAD starts with 'ref: " do
+      context "and also when HEAD starts with 'ref: '" do
         before do
           allow(File).to(
             receive(:read).with('root/dir/.git/HEAD').and_return("ref: refs/foo\n"),

data/spec/remote_settings_spec.rb

@@ -85,8 +85,12 @@ RSpec.describe Airbrake::RemoteSettings do
     end
 
     context "when an error is raised while making a HTTP request" do
+      let(:https) { instance_double(Net::HTTP) }
+
       before do
-        allow(Net::HTTP).to receive(:get_response).and_raise(StandardError)
+        allow(Net::HTTP).to receive(:new).and_return(https)
+        allow(https).to receive(:use_ssl=).with(true)
+        allow(https).to receive(:request).and_raise(StandardError)
       end
 
       it "doesn't fetch remote settings" do

data/spec/thread_pool_spec.rb

@@ -55,14 +55,13 @@ RSpec.describe Airbrake::ThreadPool do
       end
 
       it "logs discarded tasks" do
-        allow(Airbrake::Loggable.instance).to receive(:error)
+        allow(Airbrake::Loggable.instance).to receive(:info)
 
         15.times { full_thread_pool << 1 }
         full_thread_pool.close
 
-        expect(Airbrake::Loggable.instance).to have_received(:error).with(
-          /reached its capacity/,
-        ).exactly(15).times
+        expect(Airbrake::Loggable.instance)
+          .to have_received(:info).exactly(15).times
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: java
 authors:
 - Airbrake Technologies, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree-jruby