airbrake-ruby 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8371a959c69ffddca0dd25b6e8096450ecea66e13ddd6f6ace583eb37976516
-  data.tar.gz: f769f0604e3dd7118df53cb6de2e3115beed43a898e9eefb5828174c29f16f67
+  metadata.gz: 2dfccc9b2cf013d06ad40e4b3726319c13bd09dcba70d9c1fa4b382c7d80b1b4
+  data.tar.gz: 63c8aa81c33948f26ead281e81769a274dbca9740880a420d62b4d951b352984
 SHA512:
-  metadata.gz: ef094ddf119abfe8fd552980dbbc05ce907ed7608c12f7012fbcde1ee7861a33da67a435c8ef6fc378ef2490274050b7ccde598ac2a1f0f1098cd587c36b1222
-  data.tar.gz: 737a3900b60024d24303d10277d89ab782f60c58cadeb8e7fef3b7da17e983c8dd0033724e3640fe07d3428f1f86952f65ef378f81547213c2a8b11a9271eaa7
+  metadata.gz: 694a9114eb130976c052748a51e0490b3276bf32fe347bf466e64caf68e26c703941cd131bb43a0b7f3b6c6c9580067feffd5c1d443a46319a09ec6d0d1f6a37
+  data.tar.gz: 59bf1fd79c2467401aabc0c352397d82bae83805cb54ccac40c5ca132dfcfdefa5281a8ba11dc96f67d569405837af61aeb05a22ce9e2f3425d0ecc4a1c69251

data/lib/airbrake-ruby/config/processor.rb

@@ -43,8 +43,14 @@ module Airbrake
       def process_remote_configuration
         return unless @config.remote_config
         return unless @project_id
+
+        # Never poll remote configuration in the test environment.
         return if @config.environment == 'test'
 
+        # If the current environment is ignored, don't try to poll remote
+        # configuration.
+        return if @config.ignore_environments.include?(@config.environment)
+
         RemoteSettings.poll(@project_id, @config.remote_config_host) do |data|
           @poll_callback.call(data)
         end

data/lib/airbrake-ruby/config.rb

@@ -248,14 +248,14 @@ module Airbrake
 
     # @return [Promise] resolved promise if neither of the performance options
     #   reject it, false otherwise
-    def check_performance_options(resource)
+    def check_performance_options(metric)
       promise = Airbrake::Promise.new
 
       if !performance_stats
         promise.reject("The Performance Stats feature is disabled")
-      elsif resource.is_a?(Airbrake::Query) && !query_stats
+      elsif metric.is_a?(Airbrake::Query) && !query_stats
         promise.reject("The Query Stats feature is disabled")
-      elsif resource.is_a?(Airbrake::Queue) && !job_stats
+      elsif metric.is_a?(Airbrake::Queue) && !job_stats
         promise.reject("The Job Stats feature is disabled")
       else
         promise

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/filters/git_repository_filter.rb

@@ -49,7 +49,13 @@ module Airbrake
       def detect_git_version
         return unless which('git')
 
-        Gem::Version.new(`git --version`.split[2])
+        begin
+          Gem::Version.new(`git --version`.split[2])
+        rescue Errno::EAGAIN
+          # Bugfix for the case when the system cannot allocate memory for
+          # a fork() call: https://github.com/airbrake/airbrake-ruby/issues/680
+          nil
+        end
       end
 
       # Cross-platform way to tell if an executable is accessible.

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

@@ -108,20 +108,20 @@ module Airbrake
         @regexp = Regexp.union(features)
       end
 
-      # @param [Airbrake::Query] resource
-      def call(resource)
-        return unless resource.respond_to?(:query)
+      # @param [Airbrake::Query] metric
+      def call(metric)
+        return unless metric.respond_to?(:query)
 
-        query = resource.query
+        query = metric.query
         if IGNORED_QUERIES.any? { |q| q =~ query }
-          resource.ignore!
+          metric.ignore!
           return
         end
 
         q = query.gsub(@regexp, FILTERED)
         q.gsub!(POST_FILTER, FILTERED) if q =~ POST_FILTER
         q = ERROR_MSG if UNMATCHED_PAIR[@dialect] =~ q
-        resource.query = q
+        metric.query = q
       end
     end
   end

data/lib/airbrake-ruby/performance_notifier.rb

@@ -1,6 +1,6 @@
 module Airbrake
-  # QueryNotifier aggregates information about SQL queries and periodically sends
-  # collected data to Airbrake.
+  # PerformanceNotifier aggregates performance data and periodically sends it to
+  # Airbrake.
   #
   # @api public
   # @since v3.2.0
@@ -21,20 +21,20 @@ module Airbrake
       @has_payload = @payload.new_cond
     end
 
-    # @param [Hash] resource
+    # @param [Hash] metric
     # @see Airbrake.notify_query
     # @see Airbrake.notify_request
-    def notify(resource)
+    def notify(metric)
       @payload.synchronize do
-        send_resource(resource, sync: false)
+        send_metric(metric, sync: false)
       end
     end
 
-    # @param [Hash] resource
+    # @param [Hash] metric
     # @since v4.10.0
     # @see Airbrake.notify_queue_sync
-    def notify_sync(resource)
-      send_resource(resource, sync: true).value
+    def notify_sync(metric)
+      send_metric(metric, sync: true).value
     end
 
     # @see Airbrake.add_performance_filter
@@ -78,16 +78,16 @@ module Airbrake
       end
     end
 
-    def send_resource(resource, sync:)
-      promise = check_configuration(resource)
+    def send_metric(metric, sync:)
+      promise = check_configuration(metric)
       return promise if promise.rejected?
 
-      @filter_chain.refine(resource)
-      if resource.ignored?
-        return Promise.new.reject("#{resource.class} was ignored by a filter")
+      @filter_chain.refine(metric)
+      if metric.ignored?
+        return Promise.new.reject("#{metric.class} was ignored by a filter")
       end
 
-      update_payload(resource)
+      update_payload(metric)
       if sync || @flush_period == 0
         send(@sync_sender, @payload, promise)
       else
@@ -96,29 +96,29 @@ module Airbrake
       end
     end
 
-    def update_payload(resource)
-      if (total_stat = @payload[resource])
-        @payload.key(total_stat).merge(resource)
+    def update_payload(metric)
+      if (total_stat = @payload[metric])
+        @payload.key(total_stat).merge(metric)
       else
-        @payload[resource] = { total: Airbrake::Stat.new }
+        @payload[metric] = { total: Airbrake::Stat.new }
       end
 
-      @payload[resource][:total].increment_ms(resource.timing)
+      @payload[metric][:total].increment_ms(metric.timing)
 
-      resource.groups.each do |name, ms|
-        @payload[resource][name] ||= Airbrake::Stat.new
-        @payload[resource][name].increment_ms(ms)
+      metric.groups.each do |name, ms|
+        @payload[metric][name] ||= Airbrake::Stat.new
+        @payload[metric][name].increment_ms(ms)
       end
     end
 
-    def check_configuration(resource)
+    def check_configuration(metric)
       promise = @config.check_configuration
       return promise if promise.rejected?
 
-      promise = @config.check_performance_options(resource)
+      promise = @config.check_performance_options(metric)
       return promise if promise.rejected?
 
-      if resource.timing && resource.timing == 0
+      if metric.timing && metric.timing == 0
         return Promise.new.reject(':timing cannot be zero')
       end
 
@@ -128,47 +128,47 @@ module Airbrake
     def send(sender, payload, promise)
       raise "payload cannot be empty. Race?" if payload.none?
 
-      with_grouped_payload(payload) do |resource_hash, destination|
+      with_grouped_payload(payload) do |metric_hash, destination|
         url = URI.join(
           @config.apm_host,
           "api/v5/projects/#{@config.project_id}/#{destination}",
         )
 
         logger.debug do
-          "#{LOG_LABEL} #{self.class.name}##{__method__}: #{resource_hash}"
+          "#{LOG_LABEL} #{self.class.name}##{__method__}: #{metric_hash}"
         end
-        sender.send(resource_hash, promise, url)
+        sender.send(metric_hash, promise, url)
       end
 
       promise
     end
 
     def with_grouped_payload(raw_payload)
-      grouped_payload = raw_payload.group_by do |resource, _stats|
-        [resource.cargo, resource.destination]
+      grouped_payload = raw_payload.group_by do |metric, _stats|
+        [metric.cargo, metric.destination]
       end
 
-      grouped_payload.each do |(cargo, destination), resources|
+      grouped_payload.each do |(cargo, destination), metrics|
         payload = {}
-        payload[cargo] = serialize_resources(resources)
+        payload[cargo] = serialize_metrics(metrics)
         payload['environment'] = @config.environment if @config.environment
 
         yield(payload, destination)
       end
     end
 
-    def serialize_resources(resources)
-      resources.map do |resource, stats|
-        resource_hash = resource.to_h.merge!(stats[:total].to_h)
+    def serialize_metrics(metrics)
+      metrics.map do |metric, stats|
+        metric_hash = metric.to_h.merge!(stats[:total].to_h)
 
-        if resource.groups.any?
+        if metric.groups.any?
           group_stats = stats.reject { |name, _stat| name == :total }
-          resource_hash['groups'] = group_stats.merge(group_stats) do |_name, stat|
+          metric_hash['groups'] = group_stats.merge(group_stats) do |_name, stat|
             stat.to_h
           end
         end
 
-        resource_hash
+        metric_hash
       end
     end
   end

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/stat.rb

@@ -4,7 +4,7 @@ module Airbrake
   # Stat is a data structure that allows accumulating performance data (route
   # performance, SQL query performance and such). It's powered by TDigests.
   #
-  # Usually, one Stat corresponds to one resource (route or query,
+  # Usually, one Stat corresponds to one metric (route or query,
   # etc.). Incrementing a stat means pushing new performance statistics.
   #
   # @example

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/time_truncate.rb

@@ -6,10 +6,10 @@ module Airbrake
   module TimeTruncate
     # Truncate +time+ to floor minute and turn it into an RFC3339 timestamp.
     #
-    # @param [Time] time
+    # @param [Time, Integer, Float] time
     # @return [String]
     def self.utc_truncate_minutes(time)
-      tm = time.getutc
+      tm = Time.at(time).getutc
 
       Time.utc(tm.year, tm.month, tm.day, tm.hour, tm.min).to_datetime.rfc3339
     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.1.0'.freeze
 
   # @return [Hash{Symbol=>String}] the information about the notifier library
   # @since v5.0.0

data/lib/airbrake-ruby.rb

@@ -364,23 +364,14 @@ module Airbrake
     #     method: 'POST',
     #     route: '/thing/:id/create',
     #     status_code: 200,
-    #     func: 'do_stuff',
-    #     file: 'app/models/foo.rb',
-    #     line: 452,
     #     timing: 123.45 # ms
     #   )
     #
     # @param [Hash{Symbol=>Object}] request_info
     # @option request_info [String] :method The HTTP method that was invoked
     # @option request_info [String] :route The route that was invoked
-    # @option request_info [Integer] :status_code The respose code that the
+    # @option request_info [Integer] :status_code The response code that the
     #   route returned
-    # @option request_info [String] :func The function that called the query
-    #   (optional)
-    # @option request_info [String] :file The file that has the function that
-    #   called the query (optional)
-    # @option request_info [Integer] :line The line that executes the query
-    #   (optional)
     # @option request_info [Float] :timing  How much time it took to process the
     #   request (in ms)
     # @param [Hash] stash What needs to be appeneded to the stash, so it's
@@ -415,6 +406,9 @@ module Airbrake
     #     method: 'GET',
     #     route: '/things',
     #     query: 'SELECT * FROM things',
+    #     func: 'do_stuff',
+    #     file: 'app/models/foo.rb',
+    #     line: 452,
     #     timing: 123.45 # ms
     #   )
     #
@@ -424,6 +418,12 @@ module Airbrake
     # @option query_info [String] :route The route that triggered this SQL
     #    query (optional)
     # @option query_info [String] :query The query that was executed
+    # @option request_info [String] :func The function that called the query
+    #   (optional)
+    # @option request_info [String] :file The file that has the function that
+    #   called the query (optional)
+    # @option request_info [Integer] :line The line that executes the query
+    #   (optional)
     # @option query_info [Float] :timing How much time it took to process the
     #   query (in ms)
     # @param [Hash] stash What needs to be appeneded to the stash, so it's
@@ -451,7 +451,7 @@ module Airbrake
     # Increments performance breakdown statistics of a certain route.
     #
     # @example
-    #   Airbrake.notify_request(
+    #   Airbrake.notify_performance_breakdown(
     #     method: 'POST',
     #     route: '/thing/:id/create',
     #     response_type: 'json',
@@ -523,24 +523,24 @@ module Airbrake
       performance_notifier.notify_sync(queue)
     end
 
-    # Runs a callback before {.notify_request} or {.notify_query} kicks in. This
-    # is useful if you want to ignore specific resources or filter the data the
-    # resource contains.
+    # Runs a callback before {.notify_request}, {.notify_query}, {.notify_queue}
+    # or {.notify_performance_breakdown} kicks in. This is useful if you want to
+    # ignore specific metrics or filter the data the metric contains.
     #
-    # @example Ignore all resources
+    # @example Ignore all metrics
     #   Airbrake.add_performance_filter(&:ignore!)
     # @example Filter sensitive data
-    #   Airbrake.add_performance_filter do |resource|
-    #     case resource
+    #   Airbrake.add_performance_filter do |metric|
+    #     case metric
     #     when Airbrake::Query
-    #       resource.route = '[Filtered]'
+    #       metric.route = '[Filtered]'
     #     when Airbrake::Request
-    #       resource.query = '[Filtered]'
+    #       metric.query = '[Filtered]'
     #     end
     #   end
     # @example Filter with help of a class
     #   class MyFilter
-    #     def call(resource)
+    #     def call(metric)
     #       # ...
     #     end
     #   end
@@ -548,7 +548,7 @@ module Airbrake
     #   Airbrake.add_performance_filter(MyFilter.new)
     #
     # @param [#call] filter The filter object
-    # @yield [resource] The resource to filter
+    # @yield [metric] The metric to filter
     # @yieldparam [Airbrake::Query, Airbrake::Request]
     # @yieldreturn [void]
     # @return [void]

data/spec/benchmark_spec.rb

@@ -11,13 +11,13 @@ RSpec.describe Airbrake::Benchmark do
     before { benchmark }
 
     context "when called one time" do
-      its(:stop) { is_expected.to eq(true) }
+      its(:stop) { is_expected.to be(true) }
     end
 
     context "when called twice or more" do
       before { benchmark.stop }
 
-      its(:stop) { is_expected.to eq(false) }
+      its(:stop) { is_expected.to be(false) }
     end
   end
 

data/spec/config/processor_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Airbrake::Config::Processor do
     context "when there ARE blocklist keys" do
       it "adds the blocklist filter" do
         described_class.new(config).process_blocklist(notifier)
-        expect(notifier.has_filter?(Airbrake::Filters::KeysBlocklist)).to eq(true)
+        expect(notifier.has_filter?(Airbrake::Filters::KeysBlocklist)).to be(true)
       end
     end
 
@@ -17,7 +17,7 @@ RSpec.describe Airbrake::Config::Processor do
       it "doesn't add the blocklist filter" do
         described_class.new(config).process_blocklist(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::KeysBlocklist))
-          .to eq(false)
+          .to be(false)
       end
     end
   end
@@ -28,7 +28,7 @@ RSpec.describe Airbrake::Config::Processor do
     context "when there ARE allowlist keys" do
       it "adds the allowlist filter" do
         described_class.new(config).process_allowlist(notifier)
-        expect(notifier.has_filter?(Airbrake::Filters::KeysAllowlist)).to eq(true)
+        expect(notifier.has_filter?(Airbrake::Filters::KeysAllowlist)).to be(true)
       end
     end
 
@@ -38,7 +38,7 @@ RSpec.describe Airbrake::Config::Processor do
       it "doesn't add the allowlist filter" do
         described_class.new(config).process_allowlist(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::KeysAllowlist))
-          .to eq(false)
+          .to be(false)
       end
     end
   end
@@ -68,6 +68,22 @@ RSpec.describe Airbrake::Config::Processor do
       end
     end
 
+    context "when the config sets :ignore_environments and :environment matches" do
+      let(:config) do
+        Airbrake::Config.new(
+          project_id: 123,
+          ignore_environments: %w[dev],
+          environment: 'dev',
+        )
+      end
+
+      it "doesn't set remote settings" do
+        described_class.new(config).process_remote_configuration
+
+        expect(Airbrake::RemoteSettings).not_to have_received(:poll)
+      end
+    end
+
     context "when the config defines a project_id" do
       let(:config) do
         Airbrake::Config.new(project_id: 123, environment: 'not-test')
@@ -98,25 +114,25 @@ RSpec.describe Airbrake::Config::Processor do
       it "adds RootDirectoryFilter" do
         described_class.new(config).add_filters(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::RootDirectoryFilter))
-          .to eq(true)
+          .to be(true)
       end
 
       it "adds GitRevisionFilter" do
         described_class.new(config).add_filters(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::GitRevisionFilter))
-          .to eq(true)
+          .to be(true)
       end
 
       it "adds GitRepositoryFilter" do
         described_class.new(config).add_filters(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::GitRepositoryFilter))
-          .to eq(true)
+          .to be(true)
       end
 
       it "adds GitLastCheckoutFilter" do
         described_class.new(config).add_filters(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::GitLastCheckoutFilter))
-          .to eq(true)
+          .to be(true)
       end
     end
 
@@ -126,25 +142,25 @@ RSpec.describe Airbrake::Config::Processor do
       it "doesn't add RootDirectoryFilter" do
         described_class.new(config).add_filters(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::RootDirectoryFilter))
-          .to eq(false)
+          .to be(false)
       end
 
       it "doesn't add GitRevisionFilter" do
         described_class.new(config).add_filters(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::GitRevisionFilter))
-          .to eq(false)
+          .to be(false)
       end
 
       it "doesn't add GitRepositoryFilter" do
         described_class.new(config).add_filters(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::GitRepositoryFilter))
-          .to eq(false)
+          .to be(false)
       end
 
       it "doesn't add GitLastCheckoutFilter" do
         described_class.new(config).add_filters(notifier)
         expect(notifier.has_filter?(Airbrake::Filters::GitLastCheckoutFilter))
-          .to eq(false)
+          .to be(false)
       end
     end
   end

data/spec/config_spec.rb

@@ -23,12 +23,12 @@ RSpec.describe Airbrake::Config do
   its(:timeout) { is_expected.to be_nil }
   its(:blocklist_keys) { is_expected.to be_empty }
   its(:allowlist_keys) { is_expected.to be_empty }
-  its(:performance_stats) { is_expected.to eq(true) }
+  its(:performance_stats) { is_expected.to be(true) }
   its(:performance_stats_flush_period) { is_expected.to eq(15) }
-  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_config) { is_expected.to eq(true) }
+  its(:query_stats) { is_expected.to be(true) }
+  its(:job_stats) { is_expected.to be(true) }
+  its(:error_notifications) { is_expected.to be(true) }
+  its(:remote_config) { is_expected.to be(true) }
 
   its(:remote_config_host) do
     is_expected.to eq('https://notifier-configs.airbrake.io')
@@ -127,22 +127,22 @@ RSpec.describe Airbrake::Config do
 
   describe "#check_performance_options" do
     it "returns a promise" do
-      resource = Airbrake::Query.new(method: '', route: '', query: '', timing: 1)
-      expect(config.check_performance_options(resource))
+      metric = Airbrake::Query.new(method: '', route: '', query: '', timing: 1)
+      expect(config.check_performance_options(metric))
         .to be_an(Airbrake::Promise)
     end
 
     context "when performance stats are disabled" do
       before { config.performance_stats = false }
 
-      let(:resource) do
+      let(:metric) do
         Airbrake::Request.new(
           method: 'GET', route: '/foo', status_code: 200, timing: 1,
         )
       end
 
       it "returns a rejected promise" do
-        promise = config.check_performance_options(resource)
+        promise = config.check_performance_options(metric)
         expect(promise.value).to eq(
           'error' => "The Performance Stats feature is disabled",
         )
@@ -152,12 +152,12 @@ RSpec.describe Airbrake::Config do
     context "when query stats are disabled" do
       before { config.query_stats = false }
 
-      let(:resource) do
+      let(:metric) do
         Airbrake::Query.new(method: 'GET', route: '/foo', query: '', timing: 1)
       end
 
       it "returns a rejected promise" do
-        promise = config.check_performance_options(resource)
+        promise = config.check_performance_options(metric)
         expect(promise.value).to eq(
           'error' => "The Query Stats feature is disabled",
         )
@@ -167,12 +167,12 @@ RSpec.describe Airbrake::Config do
     context "when job stats are disabled" do
       before { config.job_stats = false }
 
-      let(:resource) do
+      let(:metric) do
         Airbrake::Queue.new(queue: 'foo_queue', error_count: 0, timing: 1)
       end
 
       it "returns a rejected promise" do
-        promise = config.check_performance_options(resource)
+        promise = config.check_performance_options(metric)
         expect(promise.value).to eq(
           'error' => "The Job Stats feature is disabled",
         )

data/spec/filter_chain_spec.rb

@@ -101,14 +101,14 @@ RSpec.describe Airbrake::FilterChain do
         klass = Class.new
 
         filter_chain.add_filter(klass.new)
-        expect(filter_chain.includes?(klass)).to eq(true)
+        expect(filter_chain.includes?(klass)).to be(true)
       end
     end
 
     context "when Proc filter class is included in the filter chain" do
       it "returns true" do
         filter_chain.add_filter(proc {})
-        expect(filter_chain.includes?(Proc)).to eq(true)
+        expect(filter_chain.includes?(Proc)).to be(true)
       end
     end
 
@@ -117,7 +117,7 @@ RSpec.describe Airbrake::FilterChain do
         klass = Class.new
 
         filter_chain.add_filter(proc {})
-        expect(filter_chain.includes?(klass)).to eq(false)
+        expect(filter_chain.includes?(klass)).to be(false)
       end
     end
   end

data/spec/filters/{git_repository_filter.rb → git_repository_filter_spec.rb}

@@ -1,9 +1,7 @@
 RSpec.describe Airbrake::Filters::GitRepositoryFilter do
   subject(:git_repository_filter) { described_class.new('.') }
 
-  let(:notice) do
-    Airbrake::Notice.new(Airbrake::Config.new, AirbrakeTestError.new)
-  end
+  let(:notice) { Airbrake::Notice.new(AirbrakeTestError.new) }
 
   describe "#initialize" do
     it "parses standard git version" do
@@ -23,6 +21,14 @@ RSpec.describe Airbrake::Filters::GitRepositoryFilter do
         .to receive(:`).and_return('git version 2.17.2 (Apple Git-113)')
       expect { git_repository_filter }.not_to raise_error
     end
+
+    context "when Errno::EAGAIN is raised when detecting git version" do
+      it "doesn't attach anything to context/repository" do
+        allow_any_instance_of(Kernel).to receive(:`).and_raise(Errno::EAGAIN)
+        git_repository_filter.call(notice)
+        expect(notice[:context][:repository]).to be_nil
+      end
+    end
   end
 
   context "when context/repository is defined" do
@@ -34,7 +40,7 @@ RSpec.describe Airbrake::Filters::GitRepositoryFilter do
   end
 
   context "when .git directory doesn't exist" do
-    git_repository_filter { described_class.new('root/dir') }
+    subject(:git_repository_filter) { described_class.new('root/dir') }
 
     it "doesn't attach anything to context/repository" do
       git_repository_filter.call(notice)
@@ -45,15 +51,20 @@ RSpec.describe Airbrake::Filters::GitRepositoryFilter do
   context "when .git directory exists" do
     it "attaches context/repository" do
       git_repository_filter.call(notice)
-      expect(notice[:context][:repository]).to eq(
-        'ssh://git@github.com/airbrake/airbrake-ruby.git',
+      expect(notice[:context][:repository]).to match(
+        'github.com/airbrake/airbrake-ruby',
       )
     end
   end
 
   context "when git is not in PATH" do
+    let!(:path) { ENV['PATH'] }
+
+    before { ENV['PATH'] = '' }
+
+    after { ENV['PATH'] = path }
+
     it "does not attach context/repository" do
-      ENV['PATH'] = ''
       git_repository_filter.call(notice)
       expect(notice[:context][:repository]).to be_nil
     end

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/performance_notifier_spec.rb

@@ -522,8 +522,8 @@ RSpec.describe Airbrake::PerformanceNotifier do
 
     context "when a filter that modifies payload was defined" do
       before do
-        perf_notifier.add_filter do |resource|
-          resource.route = '[Filtered]'
+        perf_notifier.add_filter do |metric|
+          metric.route = '[Filtered]'
         end
       end
 
@@ -621,7 +621,7 @@ RSpec.describe Airbrake::PerformanceNotifier do
   describe "#delete_filter" do
     let(:filter) do
       Class.new do
-        def call(resource); end
+        def call(metric); end
       end
     end
 

data/spec/remote_settings/callback_spec.rb

@@ -42,13 +42,13 @@ RSpec.describe Airbrake::RemoteSettings::Callback do
         callback = described_class.new(config)
 
         callback.call(data)
-        expect(config.error_notifications).to eq(false)
+        expect(config.error_notifications).to be(false)
 
         callback.call(data)
-        expect(config.error_notifications).to eq(false)
+        expect(config.error_notifications).to be(false)
 
         callback.call(data)
-        expect(config.error_notifications).to eq(false)
+        expect(config.error_notifications).to be(false)
       end
       # rubocop:enable RSpec/MultipleExpectations
     end
@@ -63,12 +63,12 @@ RSpec.describe Airbrake::RemoteSettings::Callback do
         allow(data).to receive(:error_notifications?).and_return(false)
 
         callback.call(data)
-        expect(config.error_notifications).to eq(false)
+        expect(config.error_notifications).to be(false)
 
         allow(data).to receive(:error_notifications?).and_return(true)
 
         callback.call(data)
-        expect(config.error_notifications).to eq(true)
+        expect(config.error_notifications).to be(true)
 
         expect(data).to have_received(:error_notifications?).twice
       end
@@ -86,13 +86,13 @@ RSpec.describe Airbrake::RemoteSettings::Callback do
         callback = described_class.new(config)
 
         callback.call(data)
-        expect(config.performance_stats).to eq(false)
+        expect(config.performance_stats).to be(false)
 
         callback.call(data)
-        expect(config.performance_stats).to eq(false)
+        expect(config.performance_stats).to be(false)
 
         callback.call(data)
-        expect(config.performance_stats).to eq(false)
+        expect(config.performance_stats).to be(false)
       end
       # rubocop:enable RSpec/MultipleExpectations
     end
@@ -107,12 +107,12 @@ RSpec.describe Airbrake::RemoteSettings::Callback do
         allow(data).to receive(:performance_stats?).and_return(false)
 
         callback.call(data)
-        expect(config.performance_stats).to eq(false)
+        expect(config.performance_stats).to be(false)
 
         allow(data).to receive(:performance_stats?).and_return(true)
 
         callback.call(data)
-        expect(config.performance_stats).to eq(true)
+        expect(config.performance_stats).to be(true)
 
         expect(data).to have_received(:performance_stats?).twice
       end

data/spec/remote_settings/settings_data_spec.rb

@@ -123,7 +123,7 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
 
         it "returns true" do
           expect(described_class.new(project_id, data).error_notifications?)
-            .to eq(true)
+            .to be(true)
         end
       end
 
@@ -141,7 +141,7 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
 
         it "returns false" do
           expect(described_class.new(project_id, data).error_notifications?)
-            .to eq(false)
+            .to be(false)
         end
       end
     end
@@ -153,7 +153,7 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
 
       it "returns true" do
         expect(described_class.new(project_id, data).error_notifications?)
-          .to eq(true)
+          .to be(true)
       end
     end
   end
@@ -174,7 +174,7 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
 
         it "returns true" do
           expect(described_class.new(project_id, data).performance_stats?)
-            .to eq(true)
+            .to be(true)
         end
       end
 
@@ -192,7 +192,7 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
 
         it "returns false" do
           expect(described_class.new(project_id, data).performance_stats?)
-            .to eq(false)
+            .to be(false)
         end
       end
     end
@@ -204,7 +204,7 @@ RSpec.describe Airbrake::RemoteSettings::SettingsData do
 
       it "returns true" do
         expect(described_class.new(project_id, data).performance_stats?)
-          .to eq(true)
+          .to be(true)
       end
     end
   end

data/spec/remote_settings_spec.rb

@@ -77,16 +77,20 @@ RSpec.describe Airbrake::RemoteSettings do
         sleep(0.1)
         remote_settings.stop_polling
 
-        expect(settings.error_notifications?).to eq(true)
-        expect(settings.performance_stats?).to eq(false)
+        expect(settings.error_notifications?).to be(true)
+        expect(settings.performance_stats?).to be(false)
         expect(settings.interval).to eq(1)
       end
       # rubocop:enable RSpec/MultipleExpectations
     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

@@ -15,7 +15,7 @@ RSpec.describe Airbrake::ThreadPool do
     it "returns true" do
       retval = thread_pool << 1
       thread_pool.close
-      expect(retval).to eq(true)
+      expect(retval).to be(true)
     end
 
     it "performs work in background" do
@@ -44,7 +44,7 @@ RSpec.describe Airbrake::ThreadPool do
       it "returns false" do
         retval = full_thread_pool << 1
         full_thread_pool.close
-        expect(retval).to eq(false)
+        expect(retval).to be(false)
       end
 
       it "discards tasks" do
@@ -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

data/spec/time_truncate_spec.rb

@@ -1,15 +1,30 @@
 RSpec.describe Airbrake::TimeTruncate do
+  time = Time.new(2018, 1, 1, 0, 0, 20, 0)
+  time_with_zone = Time.new(2018, 1, 1, 0, 0, 20, '-05:00')
+
   describe "#utc_truncate_minutes" do
-    it "truncates time to the floor minute and returns an RFC3339 timestamp" do
-      time = Time.new(2018, 1, 1, 0, 0, 20, 0)
-      expect(described_class.utc_truncate_minutes(time))
-        .to eq('2018-01-01T00:00:00+00:00')
+    shared_examples 'time conversion' do |t|
+      it "truncates the time to the floor minute and returns an RFC3339 timestamp" do
+        expect(described_class.utc_truncate_minutes(t))
+          .to eq('2018-01-01T00:00:00+00:00')
+      end
+
+      it "converts time with zone to UTC" do
+        expect(described_class.utc_truncate_minutes(time_with_zone))
+          .to eq('2018-01-01T05:00:00+00:00')
+      end
+    end
+
+    context "when the time argument is a Time object" do
+      include_examples 'time conversion', time
+    end
+
+    context "when the time argument is a Float" do
+      include_examples 'time conversion', time.to_f
     end
 
-    it "converts time with zone to UTC" do
-      time = Time.new(2018, 1, 1, 0, 0, 20, '-05:00')
-      expect(described_class.utc_truncate_minutes(time))
-        .to eq('2018-01-01T05:00:00+00:00')
+    context "when the time argument is an Integer" do
+      include_examples 'time conversion', time.to_i
     end
   end
 end

data/spec/timed_trace_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe Airbrake::TimedTrace do
   describe "#start_span" do
     context "when called once" do
       it "returns true" do
-        expect(timed_trace.start_span('operation')).to eq(true)
+        expect(timed_trace.start_span('operation')).to be(true)
       end
     end
 
@@ -30,7 +30,7 @@ RSpec.describe Airbrake::TimedTrace do
       before { timed_trace.start_span('operation') }
 
       it "returns false" do
-        expect(timed_trace.start_span('operation')).to eq(false)
+        expect(timed_trace.start_span('operation')).to be(false)
       end
     end
 
@@ -38,7 +38,7 @@ RSpec.describe Airbrake::TimedTrace do
       before { timed_trace.start_span('operation') }
 
       it "returns true" do
-        expect(timed_trace.start_span('another operation')).to eq(true)
+        expect(timed_trace.start_span('another operation')).to be(true)
       end
     end
 
@@ -54,7 +54,7 @@ RSpec.describe Airbrake::TimedTrace do
   describe "#stop_span" do
     context "when #start_span wasn't invoked" do
       it "returns false" do
-        expect(timed_trace.stop_span('operation')).to eq(false)
+        expect(timed_trace.stop_span('operation')).to be(false)
       end
     end
 
@@ -62,7 +62,7 @@ RSpec.describe Airbrake::TimedTrace do
       before { timed_trace.start_span('operation') }
 
       it "returns true" do
-        expect(timed_trace.stop_span('operation')).to eq(true)
+        expect(timed_trace.stop_span('operation')).to be(true)
       end
     end
 
@@ -74,15 +74,15 @@ RSpec.describe Airbrake::TimedTrace do
 
       context "and when stopping in LIFO order" do
         it "returns true for all spans" do
-          expect(timed_trace.stop_span('another operation')).to eq(true)
-          expect(timed_trace.stop_span('operation')).to eq(true)
+          expect(timed_trace.stop_span('another operation')).to be(true)
+          expect(timed_trace.stop_span('operation')).to be(true)
         end
       end
 
       context "and when stopping in FIFO order" do
         it "returns true for all spans" do
-          expect(timed_trace.stop_span('operation')).to eq(true)
-          expect(timed_trace.stop_span('another operation')).to eq(true)
+          expect(timed_trace.stop_span('operation')).to be(true)
+          expect(timed_trace.stop_span('another operation')).to be(true)
         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.1.0
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree3
@@ -110,7 +110,7 @@ files:
 - spec/filters/exception_attributes_filter_spec.rb
 - spec/filters/gem_root_filter_spec.rb
 - spec/filters/git_last_checkout_filter_spec.rb
-- spec/filters/git_repository_filter.rb
+- spec/filters/git_repository_filter_spec.rb
 - spec/filters/git_revision_filter_spec.rb
 - spec/filters/keys_allowlist_spec.rb
 - spec/filters/keys_blocklist_spec.rb
@@ -155,7 +155,8 @@ files:
 homepage: https://airbrake.io
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -171,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Ruby notifier for https://airbrake.io
@@ -193,7 +194,7 @@ test_files:
 - spec/filters/exception_attributes_filter_spec.rb
 - spec/filters/gem_root_filter_spec.rb
 - spec/filters/git_last_checkout_filter_spec.rb
-- spec/filters/git_repository_filter.rb
+- spec/filters/git_repository_filter_spec.rb
 - spec/filters/git_revision_filter_spec.rb
 - spec/filters/keys_allowlist_spec.rb
 - spec/filters/keys_blocklist_spec.rb