failbot 2.5.5 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef2b30021fd84983545c9fa374d030d9c1269d3ef51b778cf84d55fe96fde087
-  data.tar.gz: 998dde878c99c47177d03ff693625e05f1522009d84bf4e5f1a12a0fb398ad0e
+  metadata.gz: a2261cff70dfa6a7d6a35eec441d3440055ab89166e3441d61d10ccbd7fe635d
+  data.tar.gz: a163db78583fa4ceb80be66e5edb2477fec732718ff9057d331075163f4a35d2
 SHA512:
-  metadata.gz: 774ccebb4f0b04886309e32840d73f17b0278388a73aa6a15541870c791a832f68c767b140ed1d62527feff87ae880aedebf60e942946c103116103c32bda9be
-  data.tar.gz: 778c39eea60f8acdd0b53246401351e1373bf9386259fde67adfb86c0956baa8780fdda6afcf01f942ee6327aa8672390ec57d699e93ade429c8123b6f5ef3a6
+  metadata.gz: 915c6f252c20266490c1d345bacf92a246dc352fd409126c260954bf65f569a8a8c05566883c592e68de12af3516722c0469526ac3824f52ad670c1dd161eb3a
+  data.tar.gz: '08e40f7a93557a96a8e9b6857eb3302781f360c47b914f587330a62599b7c6d6a9b93984d58c40e2287ec7d1de4bdcd5ddc15e1ed6b25486a7d26f6b240d7678'

data/lib/failbot/compat.rb

@@ -76,17 +76,17 @@ module Failbot
       warn "#{caller[0]} Failbot.report_errors? is deprecated and will be " \
         "removed in subsequent releases."
 
-      if @report_errors.nil?
+      if @thread_local_report_errors.nil?
         config['report_errors']
       else
-        @report_errors
+        @thread_local_report_errors.value
       end
     end
 
     def report_errors=(v)
       warn "#{caller[0]} Failbot.report_errors= is deprecated and will be " \
         "removed in subsequent releases."
-      @report_errors = v
+      @thread_local_report_errors.value = v
     end
 
     # Load and initialize the exception reporting backend as specified by

data/lib/failbot/exception_format/structured.rb

@@ -14,7 +14,7 @@ module Failbot
       def self.call(e)
         message = e.message.to_s
         class_name = e.class.to_s
-        stacktrace = begin
+        begin
           Failbot.backtrace_parser.call(e)
         rescue => ex
           message += "\nUnable to parse backtrace (#{ex.inspect})\nDon't put non-backtrace text in Exception#backtrace please!\nSo-called backtrace follows:\n#{e.backtrace.join("\n")}"
@@ -22,6 +22,7 @@ module Failbot
           EMPTY_ARRAY
         end
         {
+          "platform" => "ruby",
           "exception_detail" => exception_details(e),
           "ruby" => RUBY_DESCRIPTION,
           "created_at" => Time.now.utc.iso8601(6)

data/lib/failbot/haystack.rb

@@ -4,10 +4,11 @@ require 'json'
 
 module Failbot
   class Haystack
-    attr_accessor :connect_timeout
-    def initialize(url, connect_timeout=nil)
+    attr_accessor :connect_timeout, :rw_timeout
+    def initialize(url, connect_timeout=nil, timeout_seconds=nil)
       @url = url
       @connect_timeout = connect_timeout
+      @rw_timeout = timeout_seconds - @connect_timeout.to_f if timeout_seconds
     end
 
     def user
@@ -26,7 +27,7 @@ module Failbot
 
       # Raise if the exception doesn't make it to Haystack, ensures the failure
       # is logged
-      raise StandardError, "couldn't send exception to Haystack" unless response.code == "201"
+      raise StandardError, "couldn't send exception to Haystack: #{response.code} #{response.message}" unless response.code == "201"
     end
 
     def self.send_data(data)
@@ -54,6 +55,8 @@ module Failbot
 
       # Set the connect timeout if it was provided
       http.open_timeout = @connect_timeout if @connect_timeout
+      http.read_timeout = @rw_timeout if @rw_timeout
+      http.write_timeout = @rw_timeout if @rw_timeout
 
       # push it through
       http.request(request)

data/lib/failbot/http_backend.rb

@@ -1,12 +1,11 @@
 module Failbot
   class HTTPBackend
-    def initialize(url, connect_timeout = nil)
+    def initialize(url, connect_timeout = nil, timeout_seconds = nil)
       if url.to_s.empty?
         raise ArgumentError, "FAILBOT_HAYSTACK_URL setting required."
       end
 
-      @connect_timeout = connect_timeout
-      @haystack = Failbot::Haystack.new(url, connect_timeout)
+      @haystack = Failbot::Haystack.new(url, connect_timeout, timeout_seconds)
     end
 
     def report(data)
@@ -28,5 +27,13 @@ module Failbot
     def connect_timeout=(timeout)
       @haystack.connect_timeout = timeout
     end
+
+    def rw_timeout
+      @haystack.rw_timeout
+    end
+
+    def rw_timeout=(timeout)
+      @haystack.rw_timeout = timeout
+    end
   end
 end

data/lib/failbot/json_backend.rb

@@ -17,7 +17,7 @@ module Failbot
     def report(data)
       payload = data.to_json
 
-      response = socket do |s|
+      socket do |s|
         s.send(payload, 0)
         nil
       end

data/lib/failbot/middleware.rb

@@ -10,16 +10,17 @@ module Failbot
 
     def call(env)
       Failbot.reset!
-      Failbot.push @other.merge(self.class.context(env)) do
-        begin
-          start = Time.now
-          @app.call(env)
-        rescue Object => boom
-          elapsed = Time.now - start
-          Failbot.report(boom, {:time => elapsed.to_s})
-          raise
-        end
+      Failbot.push @other.merge(self.class.context(env))
+      begin
+        start = Time.now
+        @app.call(env)
+      rescue Object => boom
+        elapsed = Time.now - start
+        Failbot.report(boom, {:time => elapsed.to_s})
+        raise
       end
+    ensure
+      Failbot.reset!
     end
 
     def self.context(env)

data/lib/failbot/thread_local_variable.rb

@@ -0,0 +1,27 @@
+module Failbot
+  # Public: A simplified implementation of [`::Concurrent::ThreadLocalVar`](https://github.com/ruby-concurrency/concurrent-ruby/blob/7dc6eb04142f008ffa79a59c125669c6fcbb85a8/lib/concurrent-ruby/concurrent/atomic/thread_local_var.rb)
+  #
+  # Why not just use `concurrent-ruby`? We wanted to minimize external dependencies to avoid conflicts with gems already installed with `github/github`.
+  #
+  class ThreadLocalVariable
+    def initialize(&block)
+      @default_block = block || proc {}
+      @key = "_thread_local_variable_#{object_id}".to_sym
+    end
+
+    def value
+      value_from_thread(Thread.current)
+    end
+
+    def value=(val)
+      Thread.current.thread_variable_set(@key, val)
+    end
+
+    def value_from_thread(thread)
+      if !thread.thread_variables.include?(@key)
+        thread.thread_variable_set(@key, @default_block.call)
+      end
+      thread.thread_variable_get(@key)
+    end
+  end
+end

data/lib/failbot/version.rb

@@ -1,3 +1,3 @@
 module Failbot
-  VERSION = "2.5.5"
+  VERSION = "2.10.0"
 end

data/lib/failbot.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'digest/md5'
+require 'digest/sha2'
 require 'logger'
 require 'socket'
 require "time"
@@ -28,6 +28,8 @@ module Failbot
   autoload :JSONBackend,    'failbot/json_backend'
   autoload :WaiterBackend,  'failbot/waiter_backend'
 
+  autoload :ThreadLocalVariable, 'failbot/thread_local_variable'
+
   # Public: Set an instrumenter to be called when exceptions are reported.
   #
   #   class CustomInstrumenter
@@ -46,9 +48,6 @@ module Failbot
   #
   attr_accessor :instrumenter
 
-  # prevent recursive calls to Failbot.report!
-  attr_accessor :already_reporting
-
   # Root directory of the project's source. Used to clean up stack traces if the exception format supports it
 
   def source_root=(str)
@@ -90,7 +89,7 @@ module Failbot
 
   # Default to the original exception format used by haystack unless
   # apps opt in to the newer version.
-  self.exception_format = :haystack
+  self.exception_format = :structured
 
   # Set a callable that is responsible for parsing and formatting ruby
   # backtraces.  This is only necessary to set if your app deals with
@@ -137,9 +136,16 @@ module Failbot
       return setup_deprecated(settings)
     end
 
-    if default_context.respond_to?(:to_hash) && !default_context.to_hash.empty?
-      context[0] = default_context.to_hash
+    initial_context = if default_context.respond_to?(:to_hash) && !default_context.to_hash.empty?
+                        default_context.to_hash
+                      else
+                        { 'server' => hostname }
+                      end
+
+    @thread_local_context = ::Failbot::ThreadLocalVariable.new do
+      [initial_context]
     end
+    @thread_local_already_reporting = ::Failbot::ThreadLocalVariable.new { false }
 
     populate_context_from_settings(settings)
     @enable_timeout = false
@@ -164,7 +170,7 @@ module Failbot
       when "file"
         Failbot::FileBackend.new(settings["FAILBOT_BACKEND_FILE_PATH"])
       when "http"
-        Failbot::HTTPBackend.new(URI(settings["FAILBOT_HAYSTACK_URL"]), @connect_timeout_seconds)
+        Failbot::HTTPBackend.new(URI(settings["FAILBOT_HAYSTACK_URL"]), @connect_timeout_seconds, @timeout_seconds)
       when 'json'
         Failbot::JSONBackend.new(settings["FAILBOT_BACKEND_JSON_HOST"], settings["FAILBOT_BACKEND_JSON_PORT"])
       when 'console'
@@ -174,7 +180,9 @@ module Failbot
       end
 
     @raise_errors  = !settings["FAILBOT_RAISE"].to_s.empty?
-    @report_errors = settings["FAILBOT_REPORT"] != "0"
+    @thread_local_report_errors = ::Failbot::ThreadLocalVariable.new do
+      settings["FAILBOT_REPORT"] != "0"
+    end
 
     # allows overriding the 'app' value to send to single haystack bucket.
     # used primarily on ghe.io.
@@ -184,6 +192,10 @@ module Failbot
     if settings["FAILBOT_EXCEPTION_FORMAT"]
       self.exception_format = settings["FAILBOT_EXCEPTION_FORMAT"].to_sym
     end
+
+    @ignored_error_classes = settings.fetch("FAILBOT_IGNORED_ERROR_CLASSES", "").split(",").map do |class_name|
+      Module.const_get(class_name.strip)
+    end
   end
 
   # Bring in deprecated methods
@@ -195,7 +207,7 @@ module Failbot
   # hashes are condensed down into one and included in the next report. Don't
   # mess with this structure directly - use the #push and #pop methods.
   def context
-    @context ||= [{'server' => hostname}]
+    @thread_local_context.value
   end
 
   # Add info to be sent in the next failbot report, should one occur.
@@ -206,6 +218,11 @@ module Failbot
   #
   # Returns the value returned by the block when given; otherwise, returns nil.
   def push(info={})
+    info.each do |key, value|
+      if value.kind_of?(Proc)
+        raise ArgumentError, "Proc usage has been removed from Failbot"
+      end
+    end
     context.push(info)
     yield if block_given?
   ensure
@@ -219,7 +236,7 @@ module Failbot
 
   # Reset the context stack to a pristine state.
   def reset!
-    @context = [context[0]]
+    @thread_local_context.value = [context[0]].dup
   end
 
   # Loops through the stack of contexts and deletes the given key if it exists.
@@ -280,13 +297,13 @@ module Failbot
   # Default rollup for an exception. Exceptions with the same rollup are
   # grouped together in Haystack. The rollup is an MD5 hash of the exception
   # class and the raising file, line, and method.
-  DEFAULT_ROLLUP = lambda do |exception, context|
+  DEFAULT_ROLLUP = lambda do |exception, context, thread|
     backtrace_line = Array(exception.backtrace).first || ""
     # We want all exceptions from foo.html.erb:123 to be grouped together, no
     # matter what wacky generated ERB method name is attached to it.
     cleaned_line = backtrace_line.sub(/_erb__[_\d]+'\z/, "_erb'")
 
-    Digest::MD5.hexdigest("#{exception.class}#{cleaned_line}")
+    Digest::SHA256.hexdigest("#{exception.class}#{cleaned_line}")
   end
 
   private_constant :DEFAULT_ROLLUP
@@ -315,6 +332,8 @@ module Failbot
   #
   # Returns nothing.
   def report(e, other = {})
+    return if ignore_error?(e)
+
     if @raise_errors
       squash_contexts(context, exception_info(e), other) # surface problems squashing
       raise e
@@ -324,59 +343,22 @@ module Failbot
   end
 
   def report!(e, other = {})
-    return unless @report_errors
+    report_with_context!(Thread.current, context, e, other)
+  end
 
-    if already_reporting
-      logger.warn "FAILBOT: asked to report while reporting!" rescue nil
-      logger.warn e.message rescue nil
-      logger.warn e.backtrace.join("\n") rescue nil
-      return
+  def report_from_thread(thread, e, other = {})
+    if @raise_errors
+      squash_contexts(@thread_local_context.value_from_thread(thread), exception_info(e), other) # surface problems squashing
+      raise e
+    else
+      report_from_thread!(thread, e, other)
     end
-    self.already_reporting = true
-
-    begin
-      data = squash_contexts(context, exception_info(e), other)
-
-      if !data.has_key?("rollup")
-        data = data.merge("rollup" => @rollup.call(e, data))
-      end
-
-      if @before_report
-        data = squash_contexts(data, @before_report.call(e, data))
-      end
-
-      if @app_override
-        data = data.merge("app" => @app_override)
-      end
+  end
 
-      data = scrub(sanitize(data))
-    rescue Object => i
-      log_failure("processing", data, e, i)
-      self.already_reporting = false
-      return
-    end
+  def report_from_thread!(thread, e, other = {})
+    return if ignore_error?(e)
 
-    start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    instrumentation_data = {
-      "report_status" => "error",
-    }
-    begin
-      if @enable_timeout
-        Timeout.timeout(@timeout_seconds) do
-          backend.report(data)
-        end
-      else
-        backend.report(data)
-      end
-      instrumentation_data["report_status"] = "success"
-    rescue Object => i
-      log_failure("reporting", data, e, i)
-      instrumentation_data["exception_type"] = i.class.name
-    ensure
-      instrumentation_data["elapsed_ms"] = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000).to_i
-      instrument("report.failbot", data.merge(instrumentation_data)) rescue nil
-      self.already_reporting = false
-    end
+    report_with_context!(thread, @thread_local_context.value_from_thread(thread), e, other)
   end
 
   # Public: Disable exception reporting. This is equivalent to calling
@@ -389,14 +371,14 @@ module Failbot
   # block - an optional block to perform while reporting is disabled. If a block
   #         is passed, reporting will be re-enabled after the block is called.
   def disable(&block)
-    original_report_errors = @report_errors
-    @report_errors = false
+    original_report_errors = @thread_local_report_errors.value
+    @thread_local_report_errors.value = false
 
     if block
       begin
         block.call
       ensure
-        @report_errors = original_report_errors
+        @thread_local_report_errors.value = original_report_errors
       end
     end
   end
@@ -405,7 +387,7 @@ module Failbot
   # this can be called if it is explicitly disabled by calling `Failbot.disable`
   # or setting `FAILBOT_REPORTING => "0"` in `Failbot.setup`.
   def enable
-    @report_errors = true
+    @thread_local_report_errors.value = true
   end
 
   # Public: exceptions that were reported. Only available when using the
@@ -429,7 +411,6 @@ module Failbot
 
     contexts_to_squash.flatten.each do |hash|
       hash.each do |key, value|
-        value = (value.call rescue nil) if value.kind_of?(Proc)
         squashed[key.to_s] = value
       end
     end
@@ -451,6 +432,8 @@ module Failbot
           value
         when String, true, false
           value.to_s
+        when Proc
+          "proc usage is deprecated"
         when Array
           if key == EXCEPTION_DETAIL
             # special-casing for the exception_detail key, which is allowed to
@@ -492,7 +475,16 @@ module Failbot
   end
 
   def logger
-    @logger ||= Logger.new($stderr)
+    @logger ||= Logger.new($stderr, formatter: proc { |severity, datetime, progname, msg|
+      log = case msg
+            when Hash
+              msg.map { |k,v| "#{k}=#{v.inspect}" }.join(" ")
+            else
+              %Q|msg="#{msg.inspect}"|
+            end
+      log_line = %Q|ts="#{datetime.utc.iso8601}" level=#{severity} logger=Failbot #{log}\n|
+      log_line.lstrip
+    })
   end
 
   def logger=(logger)
@@ -503,8 +495,73 @@ module Failbot
     @hostname ||= Socket.gethostname
   end
 
+  def already_reporting=(bool)
+    @thread_local_already_reporting.value = bool
+  end
+
+  def already_reporting
+    @thread_local_already_reporting.value
+  end
+
   private
 
+  def report_with_context!(thread, provided_context, e, other = {})
+    return unless @thread_local_report_errors.value
+    return if ignore_error?(e)
+
+    if already_reporting
+      logger.warn "FAILBOT: asked to report while reporting!" rescue nil
+      logger.warn e.message rescue nil
+      logger.warn e.backtrace.join("\n") rescue nil
+      return
+    end
+    self.already_reporting = true
+
+    begin
+      data = squash_contexts(provided_context, exception_info(e), other)
+
+      if !data.has_key?("rollup")
+        data = data.merge("rollup" => @rollup.call(e, data, thread))
+      end
+
+      if defined?(@before_report) && @before_report
+        data = squash_contexts(data, @before_report.call(e, data, thread))
+      end
+
+      if @app_override
+        data = data.merge("app" => @app_override)
+      end
+
+      data = scrub(sanitize(data))
+    rescue Object => i
+      log_failure("processing", data, e, i)
+      self.already_reporting = false
+      return
+    end
+
+    start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    instrumentation_data = {
+      "report_status" => "error",
+    }
+    begin
+      if @enable_timeout
+        Timeout.timeout(@timeout_seconds) do
+          backend.report(data)
+        end
+      else
+        backend.report(data)
+      end
+      instrumentation_data["report_status"] = "success"
+    rescue Object => i
+      log_failure("reporting", data, e, i)
+      instrumentation_data["exception_type"] = i.class.name
+    ensure
+      instrumentation_data["elapsed_ms"] = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000).to_i
+      instrument("report.failbot", data.merge(instrumentation_data)) rescue nil
+      self.already_reporting = false
+    end
+  end
+
   # Internal: Publish an event to the instrumenter
   def instrument(name, payload = {})
     Failbot.instrumenter.instrument(name, payload) if Failbot.instrumenter
@@ -522,12 +579,44 @@ module Failbot
   end
 
   def log_failure(action, data, original_exception, exception)
-    # don't fail for any reason
-    logger.debug "FAILBOT EXCEPTION: action=#{action} exception=#{exception.class.name} original_type: #{original_exception.class.name} data=#{data.inspect}" rescue nil
-    logger.debug original_exception.message rescue nil
-    logger.debug original_exception.backtrace.join("\n") rescue nil
-    logger.debug exception.message rescue nil
-    logger.debug exception.backtrace.join("\n") rescue nil
+    begin
+      record = {
+        "msg" => "exception",
+        "action" => action,
+        "data" => data,
+      }
+
+      record.merge!(to_semconv(exception))
+      logger.debug record
+
+      record = {
+        "msg" => "report-failed",
+        "action" => action,
+        "data" => data,
+      }
+      record.merge!(to_semconv(original_exception))
+      logger.debug record
+    rescue => e
+      raise e
+    end
+  end
+
+  def to_semconv(exception)
+    {
+      "exception.type" => exception.class.to_s,
+      "exception.message" => exception.message.encode("UTF-8", invalid: :replace, undef: :replace, replace: '�'),
+      "exception.backtrace" => exception.full_message(highlight: false, order: :top).encode('UTF-8', invalid: :replace, undef: :replace, replace: '�'),
+    }
+  end
+
+  def ignore_error?(error)
+    @cache ||= Hash.new do |hash, error_class|
+      hash[error_class] = @ignored_error_classes.any? do |ignored_error_class|
+        error_class.ancestors.include?(ignored_error_class)
+      end
+    end
+
+    @cache[error.class]
   end
 
   extend self

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: failbot
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.10.0
 platform: ruby
 authors:
 - "@rtomayko"
 - "@atmos"
 - "@sr"
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.4
 - !ruby/object:Gem::Dependency
@@ -82,6 +82,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: "..."
 email:
 - github+failbot@lists.github.com
@@ -106,13 +120,14 @@ files:
 - lib/failbot/middleware.rb
 - lib/failbot/resque_failure_backend.rb
 - lib/failbot/sensitive_data_scrubber.rb
+- lib/failbot/thread_local_variable.rb
 - lib/failbot/version.rb
 - lib/failbot/waiter_backend.rb
 homepage: http://github.com/github/failbot#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Deliver exceptions to Haystack
 test_files: []