honeybadger 2.0.0.beta.2 → 2.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1cb69549509f0a3ba7d723dcbed181b4f8845d
-  data.tar.gz: d413ed284a9b6fb3a8be8ae3c8621514cb4f4037
+  metadata.gz: 2a59b10cd827731513426b228e5d19a58af562ca
+  data.tar.gz: c9691c718cfac669916547060fe2515437ef09a6
 SHA512:
-  metadata.gz: eba0eaf3bd4cc030b43904b0f855fbb536893faddbd095a046a4edeab8a2bfa876963e42e14dd9adcbbba00341230b11a20d2e7138128053790edc3c2133ed6c
-  data.tar.gz: 728b30a14a67a0f91ded6f26010fae33f8671780c3aab6ac4b57c38e16699f73f49b23bc902a308377e47a6a8866378b8f50dcbc367de9d39868c2bf2606e792
+  metadata.gz: baaa7ad6cd490e13aa917cd02c684b3c04850b81f4943c8612aabd961b321f990ade9bcc5cb9f3f879cfd7d4b6683b7d2d4798c5f0a1a43544fb3b1a2b5df89f
+  data.tar.gz: d91ee78cc723be8421b9c1adef00e59142558f2123f655862d070abb09f0e03aa66811094aa563d7e1b72d749ee8d27efc09c26b8cfd719012dbeb9c49020b4c

data/lib/honeybadger/cli.rb

@@ -229,8 +229,8 @@ module Honeybadger
           say(tab_indent(hierarchy.size) << "#{key}:")
           indent = tab_indent(hierarchy.size+1)
           say(indent + "Description: #{Config::OPTIONS[dotted_key][:description]}")
-          say(indent + "Default: #{Config::OPTIONS[dotted_key][:default].to_s}")
-          say(indent + "Current: #{value.to_s}")
+          say(indent + "Default: #{Config::OPTIONS[dotted_key][:default].inspect}")
+          say(indent + "Current: #{value.inspect}")
         end
       end
     end

data/lib/honeybadger/config.rb

@@ -178,6 +178,15 @@ module Honeybadger
       request && request.env['action_dispatch.parameter_filter'] or []
     end
 
+    def excluded_request_keys
+      [].tap do |keys|
+        keys << :session  if self[:'request.disable_session']
+        keys << :params   if self[:'request.disable_params']
+        keys << :cgi_data if self[:'request.disable_environment']
+        keys << :url      if self[:'request.disable_url']
+      end
+    end
+
     def write
       path = config_path
 

data/lib/honeybadger/config/defaults.rb

@@ -5,9 +5,10 @@ module Honeybadger
     IGNORE_DEFAULT = ['ActiveRecord::RecordNotFound',
                       'ActionController::RoutingError',
                       'ActionController::InvalidAuthenticityToken',
-                      'CGI::Session::CookieStore::TamperedWithCookie',
                       'ActionController::UnknownAction',
+                      'ActionController::UnknownFormat',
                       'AbstractController::ActionNotFound',
+                      'CGI::Session::CookieStore::TamperedWithCookie',
                       'Mongoid::Errors::DocumentNotFound',
                       'Sinatra::NotFound'].map(&:freeze).freeze
 
@@ -112,9 +113,21 @@ module Honeybadger
         description: 'A list of keys to filter when sending request data.',
         default: ['password'.freeze, 'password_confirmation'.freeze].freeze
       },
-      :'request.exclude_keys' => {
-        description: 'A list of top-level keys to exclude when sending request data.',
-        default: [].freeze
+      :'request.disable_session' => {
+        description: 'Prevent session from being sent with request data.',
+        default: false
+      },
+      :'request.disable_params' => {
+        description: 'Prevent params from being sent with request data.',
+        default: false
+      },
+      :'request.disable_environment' => {
+        description: 'Prevent Rack environment from being sent with request data.',
+        default: false
+      },
+      :'request.disable_url' => {
+        description: 'Prevent url from being sent with request data (Rack environment may still contain it in some cases).',
+        default: false
       },
       :'user_informer.enabled' => {
         description: 'Enable the UserInformer middleware.',

data/lib/honeybadger/config/yaml.rb

@@ -1,11 +1,12 @@
 require 'pathname'
 require 'yaml'
+require 'erb'
 
 module Honeybadger
   class Config
     class Yaml < ::Hash
       def initialize(path, env = 'production')
-        @path = Pathname.new(path)
+        @path = path.kind_of?(Pathname) ? path : Pathname.new(path)
 
         if !@path.exist?
           raise ConfigError, "The configuration file #{@path} was not found."
@@ -14,9 +15,9 @@ module Honeybadger
         elsif !@path.writable?
           raise ConfigError, "The configuration file #{@path} is not writable."
         else
-          yaml = YAML.load(@path.read)
-          override = yaml.delete(env)
-          update(dotify_keys(yaml.merge(override || {})))
+          yaml = YAML.load(ERB.new(@path.read).result)
+          yaml.merge!(yaml[env]) if yaml[env].kind_of?(Hash)
+          update(dotify_keys(yaml))
         end
 
       rescue StandardError => e

data/lib/honeybadger/notice.rb

@@ -30,6 +30,16 @@ module Honeybadger
   # Internal: Matches lines beginning with ./
   RELATIVE_ROOT = Regexp.new('^\.\/').freeze
 
+  # Internal: default values to use for request data.
+  REQUEST_DEFAULTS = {
+    url: nil,
+    component: nil,
+    action: nil,
+    params: {}.freeze,
+    session: {}.freeze,
+    cgi_data: {}.freeze
+  }.freeze
+
   class Notice
     extend Forwardable
 
@@ -130,7 +140,7 @@ module Honeybadger
 
       @sanitizer = Util::Sanitizer.new(filters: config.params_filters)
       @request_sanitizer = Util::RequestSanitizer.new(@sanitizer)
-      @request = OpenStruct.new(construct_request_hash(config.request, opts, @request_sanitizer))
+      @request = OpenStruct.new(construct_request_hash(config.request, opts, @request_sanitizer, config.excluded_request_keys))
       @context = construct_context_hash(opts, @sanitizer)
 
       @stats = Util::Stats.all
@@ -299,21 +309,16 @@ module Honeybadger
       ].compact | BACKTRACE_FILTERS
     end
 
-    def construct_request_hash(rack_request, opts, sanitizer)
-      defaults = {
-        url: opts[:url],
-        component: opts[:component] || opts[:controller],
-        action: opts[:action],
-        params: opts[:params] || opts[:parameters] || {},
-        session: opts[:session] || {},
-        cgi_data: opts[:cgi_data] || {}
-      }
-
+    def construct_request_hash(rack_request, opts, sanitizer, excluded_keys = [])
       request = {}
       request.merge!(Rack::RequestHash.new(rack_request)) if rack_request
 
-      defaults.each_pair do |k,v|
-        request[k] = v if opts.has_key?(k) || !request.has_key?(k)
+      request[:component] = opts[:controller] if opts.has_key?(:controller)
+      request[:params] = opts[:parameters] if opts.has_key?(:parameters)
+
+      REQUEST_DEFAULTS.each do |key, default|
+        request[key] = opts[key] if opts.has_key?(key)
+        request[key] = default if !request[key] || excluded_keys.include?(key)
       end
 
       request[:session] = request[:session][:data] if request[:session][:data]

data/lib/honeybadger/plugin.rb

@@ -71,7 +71,7 @@ module Honeybadger
     def ok?(config)
       @requirements.all? {|r| Execution.new(config, &r).call }
     rescue => e
-      config.logger.error(sprintf('plugin error name=%s class=%s message=%s location=%s', name, e.class, e.message.dump, e.backtrace.first.dump))
+      config.logger.error(sprintf('plugin error name=%s class=%s message=%s at=%s', name, e.class, e.message.dump, e.backtrace.first.dump))
       false
     end
 
@@ -89,7 +89,7 @@ module Honeybadger
 
       @loaded
     rescue => e
-      config.logger.error(sprintf('plugin error name=%s class=%s message=%s location=%s', name, e.class, e.message.dump, e.backtrace.first.dump))
+      config.logger.error(sprintf('plugin error name=%s class=%s message=%s at=%s', name, e.class, e.message.dump, e.backtrace.first.dump))
       @loaded = true
       false
     end

data/lib/honeybadger/util/http.rb

@@ -66,7 +66,7 @@ module Honeybadger
         http
       rescue => e
         error do
-          sprintf('http error class=%s message=%s location=%s', e.class, e.message.dump, e.backtrace.first.dump)
+          sprintf('http error class=%s message=%s at=%s', e.class, e.message.dump, e.backtrace.first.dump)
         end
         raise e
       end

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # Public: The current String Honeybadger version.
-  VERSION = '2.0.0.beta.2'.freeze
+  VERSION = '2.0.0.beta.3'.freeze
 end

data/lib/honeybadger/worker.rb

@@ -70,15 +70,26 @@ module Honeybadger
     def trace(trace)
       if trace.duration > config[:'traces.threshold']
         debug { sprintf('worker adding trace duration=%s feature=traces id=%s', trace.duration.round(2), trace.id) }
-        mutex.synchronize do
-          traces.push(trace)
-        end
+        traces.push(trace)
+        flush_traces if traces.flush?
+        true
       else
         debug { sprintf('worker discarding trace duration=%s feature=traces id=%s', trace.duration.round(2), trace.id) }
+        false
       end
     end
 
-    def_delegators :@metrics, :timing, :increment
+    def timing(*args, &block)
+      metrics.timing(*args, &block)
+      flush_metrics if metrics.flush?
+      true
+    end
+
+    def increment(*args, &block)
+      metrics.increment(*args, &block)
+      flush_metrics if metrics.flush?
+      true
+    end
 
     private
 
@@ -108,14 +119,18 @@ module Honeybadger
 
     def flush_metrics
       debug { 'worker flushing metrics feature=metrics' } # TODO: Include count.
-      metrics.chunk(100, &method(:push).to_proc.curry[:metrics])
-      mutex.synchronize { init_metrics }
+      mutex.synchronize do
+        metrics.chunk(100, &method(:push).to_proc.curry[:metrics])
+        init_metrics
+      end
     end
 
     def flush_traces
       debug { sprintf('worker flushing traces feature=traces count=%d', traces.size) }
-      push(:traces, traces) unless traces.empty?
-      mutex.synchronize { init_traces }
+      mutex.synchronize do
+        push(:traces, traces) unless traces.empty?
+        init_traces
+      end
     end
 
     def flush_queue
@@ -145,9 +160,7 @@ module Honeybadger
         return false
       end
 
-      mutex.synchronize do
-        queue[feature].push(object)
-      end
+      queue[feature].push(object)
 
       true
     end
@@ -157,7 +170,7 @@ module Honeybadger
         debug { 'worker started' }
         work until finish
       rescue Exception => e
-        error(sprintf('error in worker thread (shutting down) class=%s message=%s location=%s', e.class, e.message.dump, e.backtrace.first.dump))
+        error(sprintf('error in worker thread (shutting down) class=%s message=%s at=%s', e.class, e.message.dump, e.backtrace.first.dump))
         raise e
       ensure
         debug { 'stopping worker' }
@@ -176,7 +189,7 @@ module Honeybadger
 
       sleep(0.1)
     rescue StandardError => e
-      error(sprintf('error in worker thread class=%s message=%s location=%s', e.class, e.message.dump, e.backtrace.first.dump))
+      error(sprintf('error in worker thread class=%s message=%s at=%s', e.class, e.message.dump, e.backtrace.first.dump))
       sleep(1)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0.beta.3
 platform: ruby
 authors:
 - Honeybadger Industries LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies: []
 description: Make managing application errors a more pleasant experience.
 email: