honeybadger 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a304866efae8f56e2fda056d380f07171ce9a678
-  data.tar.gz: a9e6a086d55d5384d4d776bc5d4e208fd2f34924
+  metadata.gz: 79fe93e10a1b35669ebcd1c438a4912da596b62f
+  data.tar.gz: ffd173874c4d87f717e08ca9226b86bfbfec618e
 SHA512:
-  metadata.gz: 2126e97c4ffb1162d2840a535e714565be7aa7ff2822755c382a247ff3fb3bf0ecefcc121bd9c97878573d25dbcbac6ea1ae8ade525a628c15d32dd3e705dea7
-  data.tar.gz: 23b99fcda16cfc38ab3e50f5628f96d4bd3a4fe22ea74e576e149ebda236281fb4936cd5ec5445418ee4b8021d6ff9003b936a423cfab0d4ca657b1a872f0ead
+  metadata.gz: 98e463c6e283b7e31892aa1c9375fbefc47a6093e8da98f86d81e849a853ec5733857b701631b621ac3fdf42bf808ade90eb6dbaae5d81e79d410e3f0f217caf
+  data.tar.gz: 381ec55c9dacf32022183c85c21898ec7ac44f90acc8f91f819cb5005b792dccff94bce57cd9bb03e4799db92ea542d90b94207924ba16ccede32568c078fcc4

data/CHANGELOG.md

@@ -1,184 +1,128 @@
-* Update heroku cli deprecations.
-
-  *@adamkuipers*
-
-* Don't insert middleware if they're disabled.
-
-  *Bradley Priest*
-
-* Don't send RAW_POST_DATA.
-
-  *Joshua Wood*
-
-* Filter HTTP_COOKIE in request cgi_data.
-
-  *Sam McTaggart*
-
-* Fix breakage relating to Exceptions containing a :cause attribute which is not
-  itself an Exception.
-
-  *Gabe da Silveira*
-
-* Support for extracting the correct component & action for Rails Active Jobs (previously all Active Jobs where reported as  'ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper')
-
-  *Panos Korros*
-
-* Allow API key to be overridden from `Honeybadger.notify`.
-
-  *Joshua Wood*
-
-* Trim all sanitized strings to 2k.
-
-  *Joshua Wood*
-
-* Add events to instrumented traces (i.e. in background jobs).
-
-  *Joshua Wood*
-
-* Restart workers once per hour when shutdown due to 40x.
-
-  *Joshua Wood*
-
-* Fix a tracing issue with net/http requests.
-
-  *Joshua Wood*
-
-* Send request data with traces.
-
-  *Joshua Wood*
-
-* Ditch per-controller metrics and add render_partial event to traces.
-
-  *Benjamin Curtis*
-
-* Disable local variables when BetterErrors is detected.
-
-  *Joshua Wood*
-
-* Exit with 1 from deploy command when request fails but ignore the failures in
-  the capistrano task.
-
-  *Joshua Wood*
-
-* Support Resque natively.
-
-  *Joshua Wood*
-
-* Configure sidekiq.attempt_threshold to suppress notifications until retry
+# Change Log
+All notable changes to this project will be documented in this file. See [Keep a
+CHANGELOG](http://keepachangelog.com/) for how to update this file. This project
+adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased][unreleased]
+
+## [2.1.3] - 2015-07-24
+### Added
+- Don't send empty local_variables in payload when disabled.
+- Better logging of reason when API requests are denied.
+- Truncate long queries in traces rather than tossing them.
+
+## Fixed
+- Missing vendor libs.
+
+## [2.1.2][yanked]
+
+## [2.1.1] - 2015-07-15
+### Added
+- Update heroku cli deprecations. -@adamkuipers
+- Don't insert middleware if they're disabled. -Bradley Priest
+- Don't send RAW_POST_DATA.
+- Filter HTTP_COOKIE in request cgi_data. -Sam McTaggart
+- Support for extracting the correct component & action for Rails Active Jobs
+  (previously all Active Jobs where reported as
+  'ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper'). -Panos Korros
+
+### Fixed
+- Fix breakage relating to Exceptions containing a :cause attribute which is not
+  itself an Exception. -Gabe da Silveira
+
+## [2.1.0] - 2015-06-04
+### Added
+- Add events to instrumented traces (i.e. in background jobs).
+- Restart workers once per hour when shutdown due to 40x.
+- Send request data with traces.
+- Support Resque natively.
+- Configure sidekiq.attempt_threshold to suppress notifications until retry
   threshold is reached.
+- Add exceptions.unwrap to config.
 
-  *Joshua Wood*
-
-* Prevent Sinatra from using the same middleware more than once and add
+### Changed
+- Trim all sanitized strings to 2k.
+- Ditch per-controller metrics and add render_partial event to traces. -Benjamin Curtis
+- Exit with 1 from deploy command when request fails but ignore the failures in
+  the capistrano task.
+- Update default ignored exceptions to include the latest Rails rescue
+  responses. (see issue #107)
+- Exceptions with the same type but caused within different delayed jobs are not
+  grouped together. They have their component and action set so that the
+  application class name and excecuted action is displayed in the UI.  -Panos
+  Korros
+- All events logged within a delayed_job even those logged by Honeybadger.notify
+  inherit the context of the delayed job and include the job_id, attempts,
+  last_error and queue. -Panos Korros
+
+### Fixed
+- Allow API key to be overridden from `Honeybadger.notify`.
+- Fix a tracing issue with net/http requests.
+- Disable local variables when BetterErrors is detected.
+- Prevent Sinatra from using the same middleware more than once and add
   sinatra.enabled setting (default true) to disable auto-initialization
   of Sinatra.
+- Catch Errno::ENFILE when reading system stats. -Dmitry Polushkin
+- Use explicit types for config options when casting from ENV.
 
-  *Joshua Wood*
-
-* Update default ignored exceptions to include the latest Rails rescue
-  responses. (see issue #107)
-
-  *Joshua Wood*
-
-* Fix bug when processing source extract for action_view templates.
-
-  *Joshua Wood*
-
-* Exceptions with the same type but caused within different delayed jobs are not grouped together. They have their component and action set so that the application class name and excecuted action is displayed in the UI.
-
-  *Panos Korros*
-
-* All events logged within a delayed_job even those logged by Honeybadger.notify inherit the context of the delayed job and include the job_id, attempts, last_error and queue
-
-  *Panos Korros*
-
-* Catch Errno::ENFILE when reading system stats.
-
-  *Dmitry Polushkin*
-
-* Use explicit types for config options when casting from ENV.
-
-  *Joshua Wood*
-
-* Add exceptions.unwrap to config.
-
-  *Joshua Wood*
-
-* Don't access secrets before Rails initialization.
-
-  *Joshua Wood*
-
-* Fix a bug which introduced a hard-dependency on Rack.
-
-  *Joshua Wood*
-
-* Fix a bug in ping where JSON was double-quoted.
-
-  *Joshua Wood*
+## [2.0.12] - 2015-04-27
+### Fixed
+- Fix bug when processing source extract for action_view templates.
 
-* Add support for honeybadger_user with Capistrano 2.
+## [2.0.11] - 2015-04-02
+### Fixed
+- Don't access secrets before Rails initialization.
+- Fix a bug which introduced a hard-dependency on Rack.
 
-  *Nathan Fixler*
+## [2.0.10] - 2015-03-24
+### Added
+- Add support for honeybadger_user with Capistrano 2. -Nathan Fixler
 
-* Fixed a bug introduced in v2.0.8 which applied params filters to backtrace.
+### Fixed
+- Fix a bug in ping where JSON was double-quoted.
 
-  *Joshua Wood*
+## [2.0.9] - 2015-03-15
+### Fixed
+- Fixed a bug introduced in v2.0.8 which applied params filters to backtrace.
+- Fail gracefully when honeybadger.yml is empty or invalid.
 
-* Fail gracefully when honeybadger.yml is empty or invalid.
+## [2.0.8] - 2015-03-11
+### Added
+- Include full backtrace when logging worker exceptions.
+- Always send a test notice on install.
+- Send the id of the current process with error reports.
 
-  *Joshua Wood*
+### Fixed
+- Handle bad encodings in exception payloads.
 
-* Handle bad encodings in exception payloads.
+## [2.0.7][yanked] - 2015-03-11
 
-  *Joshua Wood*
+## [2.0.6] - 2015-02-16
+### Fixed
+- Don't sub partial project root in backtrace lines.
 
-* Include full backtrace when logging worker exceptions.
-
-  *Joshua Wood*
-
-* Always send a test notice on install.
-
-  *Joshua Wood*
-
-* Send the id of the current process with error reports.
-
-  *Joshua Wood*
-
-* Don't sub partial project root in backtrace lines.
-
-  *Joshua Wood*
-
-* Merge exceptions.ignore config values with default ignored exception class
+## [2.0.5] - 2015-02-12
+### Added
+- Merge exceptions.ignore config values with default ignored exception class
   names and add exceptions.ignore_only option to override.
 
-  *Joshua Wood*
-
-* Support for capistrano-rbenv gem in Capistrano task.
-
-  *Chris Gunther*
+## [2.0.4] - 2015-02-10
+### Added
+- Support for capistrano-rbenv gem in Capistrano task. -Chris Gunther
 
-* Support for capistrano-rvm gem in Capistrano task.
+## [2.0.3] - 2015-02-10
+### Fixed
+- Support for capistrano-rvm gem in Capistrano task. -Kyle Rippey
+- Don't require honeybadger.yml to be writable when reading.
 
-  *Kyle Rippey*
-
-* Don't require honeybadger.yml to be writable when reading.
-
-  *Joshua Wood*
-
-* Detect ActionDispatch::TestProcess being included globally, fix issue locally,
+## [2.0.2] - 2015-02-04
+### Fixed
+- Detect ActionDispatch::TestProcess being included globally, fix issue locally,
   warn the user.
+- Fix a nil logger bug when a config error occurs.
 
-  *Joshua Wood*
-
-* Fix a nil logger bug when a config error occurs.
-
-  *Joshua Wood*
-
-* Don't instrument metrics and traces in Rails when features are not available
-  on account
-
-  *Joshua Wood*
-
-* Don't send error reports when disabled via configuration
-
-  *Joshua Wood*
+## [2.0.1] - 2015-01-30
+### Fixed
+- Don't instrument metrics and traces in Rails when features are not available
+  on account.
+- Don't send error reports when disabled via configuration.

data/lib/honeybadger/agent/worker.rb

@@ -202,10 +202,10 @@ module Honeybadger
           add_throttle(1.25)
           debug { sprintf('worker applying throttle=1.25 interval=%s feature=%s code=%s', throttle_interval, feature, response.code) }
         when 402
-          warn { sprintf('data will not be reported until next restart (payment required) feature=%s code=%s', feature, response.code) }
+          warn { sprintf('data will not be reported (payment required) feature=%s code=%s', feature, response.code) }
           suspend(3600)
         when 403
-          warn { sprintf('data will not be reported until next restart (unauthorized) feature=%s code=%s', feature, response.code) }
+          warn { sprintf('data will not be reported feature=%s code=%s error=%s', feature, response.code, response.error.to_s.dump) }
           suspend(3600)
         when 201
           if throttle = del_throttle

data/lib/honeybadger/backend/base.rb

@@ -1,12 +1,15 @@
 require 'forwardable'
 require 'net/http'
+require 'json'
 
 require 'honeybadger/logging'
 
 module Honeybadger
   module Backend
     class Response
-      attr_reader :code, :body, :message
+      NOT_BLANK = /\S/
+
+      attr_reader :code, :body, :message, :error
 
       # Public: Initializes the Response instance.
       #
@@ -27,11 +30,22 @@ module Honeybadger
         end
 
         @success = (200..299).cover?(@code)
+        @error = parse_error(body) unless @success
       end
 
       def success?
         @success
       end
+
+      private
+
+      def parse_error(body)
+        return unless body =~ NOT_BLANK
+        obj = JSON.parse(body)
+        return obj['error'] if obj.kind_of?(Hash)
+      rescue JSON::ParserError
+        nil
+      end
     end
 
     class Base

data/lib/honeybadger/cli.rb

@@ -1,4 +1,4 @@
-$:.unshift(File.expand_path('../../../vendor/thor/lib', __FILE__))
+$:.unshift(File.expand_path('../../../vendor/cli', __FILE__))
 
 require 'thor'
 

data/lib/honeybadger/cli/heroku.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.expand_path('../../../../vendor/inifile/lib', __FILE__))
-
 require 'honeybadger/cli/helpers'
 
 module Honeybadger

data/lib/honeybadger/notice.rb

@@ -163,6 +163,9 @@ module Honeybadger
     #
     # Returns Hash JSON representation of notice
     def as_json(*args)
+      @request[:context] = s(context)
+      @request[:local_variables] = s(local_variables) if local_variables
+
       {
         api_key: s(api_key),
         notifier: NOTIFIER,
@@ -176,10 +179,7 @@ module Honeybadger
           tags: s(tags),
           causes: s(causes)
         },
-        request: @request.update({
-          context: s(context),
-          local_variables: s(local_variables)
-        }),
+        request: @request,
         server: {
           project_root: s(config[:root]),
           environment_name: s(config[:env]),
@@ -370,7 +370,7 @@ module Honeybadger
     #
     # Returns a Hash of local variables
     def local_variables_from_exception(exception, config)
-      return {} unless send_local_variables?(config)
+      return nil unless send_local_variables?(config)
       return {} unless Exception === exception
       return {} unless exception.respond_to?(:__honeybadger_bindings_stack)
       return {} if exception.__honeybadger_bindings_stack.empty?

data/lib/honeybadger/trace.rb

@@ -1,6 +1,7 @@
 require 'securerandom'
 
 require 'honeybadger/agent'
+require 'honeybadger/util/sanitizer'
 
 module Honeybadger
   class Trace
@@ -175,11 +176,11 @@ module Honeybadger
       end
 
       def to_s
-        return "Super long query" if event.payload[:sql].length > 1024
         sql = event.payload[:sql]
         sql = sql.gsub(EscapedQuotes, EmptyReplacement).gsub(SQuotedData, Replacement)
         sql = sql.gsub(DQuotedData, Replacement) unless ::ActiveRecord::Base.connection_pool.spec.config[:adapter] =~ DoubleQuoters
-        sql.gsub(NumericData, Replacement).gsub(Newline, EmptyReplacement).squeeze(' ')
+        sql = sql.gsub(NumericData, Replacement).gsub(Newline, EmptyReplacement).squeeze(' ')
+        Util::Sanitizer.sanitize_string(sql)
       end
     end
 

data/lib/honeybadger/util/sanitizer.rb

@@ -31,7 +31,7 @@ module Honeybadger
         end
 
         if data.kind_of?(String)
-          sanitize_string(data)
+          self.class.sanitize_string(data)
         elsif data.respond_to?(:to_hash)
           return '[max depth reached]' if depth >= max_depth
           hash = data.to_hash
@@ -53,7 +53,7 @@ module Honeybadger
         elsif OBJECT_WHITELIST.any? {|c| data.kind_of?(c) }
           data
         else
-          sanitize_string(data.to_s)
+          self.class.sanitize_string(data.to_s)
         end
       end
 
@@ -82,12 +82,39 @@ module Honeybadger
         filtered_url
       end
 
-      private
-
       VALID_ENCODINGS = [Encoding::UTF_8, Encoding::ISO_8859_1].freeze
       ENCODE_OPTS = { invalid: :replace, undef: :replace, replace: '?'.freeze }.freeze
       UTF8_STRING = ''.freeze
 
+      class << self
+
+        def valid_encoding?(data)
+           data.valid_encoding? && (
+             VALID_ENCODINGS.include?(data.encoding) ||
+             VALID_ENCODINGS.include?(Encoding.compatible?(UTF8_STRING, data))
+           )
+        end
+
+        def valid_encoding(data)
+          return data if valid_encoding?(data)
+
+          if data.encoding == Encoding::UTF_8
+            data.encode(Encoding::UTF_16, ENCODE_OPTS).encode!(Encoding::UTF_8)
+          else
+            data.encode(Encoding::UTF_8, ENCODE_OPTS)
+          end
+        end
+
+        def sanitize_string(data)
+          data = valid_encoding(data)
+          return data unless data.respond_to?(:size) && data.size > MAX_STRING_SIZE
+          data[0...MAX_STRING_SIZE] + TRUNCATION_REPLACEMENT
+        end
+
+      end
+
+      private
+
       attr_reader :max_depth, :filters
 
       def recursive?(data)
@@ -105,29 +132,6 @@ module Honeybadger
           end
         end
       end
-
-      def valid_encoding?(data)
-         data.valid_encoding? && (
-           VALID_ENCODINGS.include?(data.encoding) ||
-           VALID_ENCODINGS.include?(Encoding.compatible?(UTF8_STRING, data))
-         )
-      end
-
-      def valid_encoding(data)
-        return data if valid_encoding?(data)
-
-        if data.encoding == Encoding::UTF_8
-          data.encode(Encoding::UTF_16, ENCODE_OPTS).encode!(Encoding::UTF_8)
-        else
-          data.encode(Encoding::UTF_8, ENCODE_OPTS)
-        end
-      end
-
-      def sanitize_string(data)
-        data = valid_encoding(data)
-        return data unless data.respond_to?(:size) && data.size > MAX_STRING_SIZE
-        data[0...MAX_STRING_SIZE] + TRUNCATION_REPLACEMENT
-      end
     end
   end
 end