airbrake-ruby 4.13.1 → 4.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29f58448d31db594854b99c73fd6574b326f7943215f6c5e89b4407bf254add5
-  data.tar.gz: 2f2d9bd955015731f70abc13a6dafd3a73002567cea3b0b8b6bb0a1ae456a8be
+  metadata.gz: 63e544ab7354b30c5a8f4e3e73ba22daf9f27a0e3d4804e3bf015f38b34a6314
+  data.tar.gz: f2d238127b26e3fdfdc1b7848f847760993a87d15182ec7266e42d7db753609c
 SHA512:
-  metadata.gz: 52380ea7f5f9288dd967c70fc01f238cd22eb3d1b335dd05962d4b4b7c037b9fec385e32f5f036d7059a012799895dd0f168f5a3e7f0241d4d26690e822490a6
-  data.tar.gz: 65fbb12a214ea879b6b69405950f11d2c7d599f09bc1735e90bb3744e86f021482bf44e996a8392270bf6c6818294899eb9c0c672c25f8cd1a188ed5995f45fc
+  metadata.gz: 759ab3e188a8c20f2363e6aabdda6634f278b87cf24a67ecaad3998dde0dfe9de856ad8ca44f6a068b22afc2f8dcd7408ab66be6010ec3090cd2b52eef4434d8
+  data.tar.gz: 845c5c487af401362663273c85d56fb924578332a227ba534ced253d954af17ebdade9c6d5346a8e9640fcb4c8583ad068c8c43d0bc85fa7ec41298aff07c978

data/lib/airbrake-ruby.rb

@@ -1,7 +1,6 @@
 require 'net/https'
 require 'logger'
 require 'json'
-require 'thread'
 require 'set'
 require 'socket'
 require 'time'
@@ -582,6 +581,7 @@ module Airbrake
         notice_notifier.add_filter(whitelist)
       end
 
+      return if configured?
       return unless config.root_directory
 
       [

data/lib/airbrake-ruby/async_sender.rb

@@ -7,12 +7,6 @@ module Airbrake
   class AsyncSender
     include Loggable
 
-    # @return [String]
-    WILL_NOT_DELIVER_MSG =
-      "%<log_label>s AsyncSender has reached its capacity of %<capacity>s " \
-      "and the following notice will not be delivered " \
-      "Error: %<type>s - %<message>s\nBacktrace: %<backtrace>s\n".freeze
-
     def initialize(method = :post)
       @config = Airbrake::Config.instance
       @method = method
@@ -20,12 +14,13 @@ module Airbrake
 
     # Asynchronously sends a notice to Airbrake.
     #
-    # @param [Airbrake::Notice] notice A notice that was generated by the
-    #   library
+    # @param [Hash] payload Whatever needs to be sent
     # @return [Airbrake::Promise]
-    def send(notice, promise, endpoint = @config.endpoint)
-      unless thread_pool << [notice, promise, endpoint]
-        return will_not_deliver(notice, promise)
+    def send(payload, promise, endpoint = @config.endpoint)
+      unless thread_pool << [payload, promise, endpoint]
+        return promise.reject(
+          "AsyncSender has reached its capacity of #{@config.queue_size}",
+        )
       end
 
       promise
@@ -58,23 +53,5 @@ module Airbrake
         )
       end
     end
-
-    def will_not_deliver(notice, promise)
-      error = notice[:errors].first
-
-      logger.error(
-        format(
-          WILL_NOT_DELIVER_MSG,
-          log_label: LOG_LABEL,
-          capacity: @config.queue_size,
-          type: error[:type],
-          message: error[:message],
-          backtrace: error[:backtrace].map do |line|
-            "#{line[:file]}:#{line[:line]} in `#{line[:function]}'"
-          end.join("\n"),
-        ),
-      )
-      promise.reject("AsyncSender has reached its capacity of #{@config.queue_size}")
-    end
   end
 end

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

@@ -24,7 +24,18 @@ module Airbrake
 
       # @return [Array<Symbol>] parts of a Notice's *context* payload that can
       #   be modified by blacklist/whitelist filters
-      FILTERABLE_CONTEXT_KEYS = %i[user headers].freeze
+      FILTERABLE_CONTEXT_KEYS = %i[
+        user
+
+        # Provided by Airbrake::Rack::HttpHeadersFilter
+        headers
+        referer
+        httpMethod
+
+        # Provided by Airbrake::Rack::ContextFilter
+        userAddr
+        userAgent
+      ].freeze
 
       include Loggable
 

data/lib/airbrake-ruby/notice.rb

@@ -76,7 +76,7 @@ module Airbrake
     #
     # @return [Hash{String=>String}, nil]
     # @api private
-    def to_json
+    def to_json(*_args)
       loop do
         begin
           json = @payload.to_json

data/lib/airbrake-ruby/notice_notifier.rb

@@ -9,7 +9,7 @@ module Airbrake
     # @return [Array<Class>] filters to be executed first
     DEFAULT_FILTERS = [
       Airbrake::Filters::SystemExitFilter,
-      Airbrake::Filters::GemRootFilter
+      Airbrake::Filters::GemRootFilter,
 
       # Optional filters (must be included by users):
       # Airbrake::Filters::ThreadFilter

data/lib/airbrake-ruby/stat.rb

@@ -24,18 +24,21 @@ module Airbrake
       @sum = sum
       @sumsq = sumsq
       @tdigest = tdigest
+      @mutex = Mutex.new
     end
 
     # @return [Hash{String=>Object}] stats as a hash with compressed TDigest
     #   (serialized as base64)
     def to_h
-      tdigest.compress!
-      {
-        'count' => tdigest.size,
-        'sum' => sum,
-        'sumsq' => sumsq,
-        'tdigest' => Base64.strict_encode64(tdigest.as_small_bytes),
-      }
+      @mutex.synchronize do
+        tdigest.compress!
+        {
+          'count' => tdigest.size,
+          'sum' => sum,
+          'sumsq' => sumsq,
+          'tdigest' => Base64.strict_encode64(tdigest.as_small_bytes),
+        }
+      end
     end
 
     # Increments tdigest timings and updates tdigest with the difference between
@@ -54,10 +57,12 @@ module Airbrake
     # @param [Float] ms
     # @return [void]
     def increment_ms(ms)
-      self.sum += ms
-      self.sumsq += ms * ms
+      @mutex.synchronize do
+        self.sum += ms
+        self.sumsq += ms * ms
 
-      tdigest.push(ms)
+        tdigest.push(ms)
+      end
     end
 
     # We define custom inspect so that we weed out uninformative TDigest, which

data/lib/airbrake-ruby/thread_pool.rb

@@ -45,7 +45,15 @@ module Airbrake
     # @return [Boolean] true if the message was successfully sent to the pool,
     #   false if the queue is full
     def <<(message)
-      return false if backlog >= @queue_size
+      if backlog >= @queue_size
+        logger.error(
+          "#{LOG_LABEL} ThreadPool has reached its capacity of " \
+          "#{@queue_size} and the following message will not be " \
+          "processed: #{message.inspect}",
+        )
+        return false
+      end
+
       @queue << message
       true
     end

data/lib/airbrake-ruby/version.rb

@@ -2,5 +2,5 @@
 # More information: http://semver.org/
 module Airbrake
   # @return [String] the library version
-  AIRBRAKE_RUBY_VERSION = '4.13.1'.freeze
+  AIRBRAKE_RUBY_VERSION = '4.13.3'.freeze
 end

data/spec/airbrake_spec.rb

@@ -75,6 +75,16 @@ RSpec.describe Airbrake do
         described_class.configure {}
         expect(described_class.deploy_notifier).to eql(deploy_notifier)
       end
+
+      it "doesn't append the same notice notifier filters over and over" do
+        described_class.configure do |c|
+          c.project_id = 1
+          c.project_key = '2'
+        end
+
+        expect(described_class.notice_notifier).not_to receive(:add_filter)
+        10.times { described_class.configure {} }
+      end
     end
 
     context "when blacklist_keys gets configured" do

data/spec/async_sender_spec.rb

@@ -58,15 +58,6 @@ RSpec.describe Airbrake::AsyncSender do
           'error' => "AsyncSender has reached its capacity of 1",
         )
       end
-
-      it "logs discarded notice" do
-        expect(Airbrake::Loggable.instance).to receive(:error).with(
-          /reached its capacity/,
-        ).at_least(:once)
-
-        15.times { subject.send(notice, Airbrake::Promise.new) }
-        subject.close
-      end
     end
   end
 end

data/spec/thread_pool_spec.rb

@@ -51,6 +51,15 @@ RSpec.describe Airbrake::ThreadPool do
 
         expect(tasks.size).to be_zero
       end
+
+      it "logs discarded tasks" do
+        expect(Airbrake::Loggable.instance).to receive(:error).with(
+          /reached its capacity/,
+        ).exactly(15).times
+
+        15.times { subject << 1 }
+        subject.close
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake-ruby
 version: !ruby/object:Gem::Version
-  version: 4.13.1
+  version: 4.13.3
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree3