honeybadger 1.16.3 → 1.16.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 95c84537311090f380f204bebae0cad76c3a6ed0
+  data.tar.gz: ce0863f60d458ffb2adf191c1ddb3e45d425bd02
+SHA512:
+  metadata.gz: 7fdc08780b454cdb572ba8f3958e884a329b5ef8eeeb561f202ad485d195ec2bc561b999f6467d8c08eb241674efb4d02e86f91e577e584b0bd522a0fef5ccc1
+  data.tar.gz: 576b88251d6d3ac32ad314229114fe855216cc5e7ed6e9f539efe2b28dbe020681be25d51ae839df7d557e138e74a2653d472eb4cdc6b9a963638f48aa1804bb

data/Appraisals

@@ -45,7 +45,7 @@ if RUBY_VERSION > '1.9'
   appraise 'rails3.0' do
     gem 'rails', '~> 3.0.17'
     gem 'honeybadger', :path => '../'
-    gem 'better_errors', :require => false
+    gem 'better_errors', '~> 1.0', :require => false
     gem 'rack-mini-profiler', '~>0.1.31 ', :require => false
     gem 'capistrano', '~> 2.0'
   end
@@ -53,7 +53,7 @@ if RUBY_VERSION > '1.9'
   appraise 'rails3.1' do
     gem 'rails', '~> 3.1.12'
     gem 'honeybadger', :path => '../'
-    gem 'better_errors', :require => false
+    gem 'better_errors', '~> 1.0', :require => false
     gem 'rack-mini-profiler', :require => false
     gem 'capistrano', '~> 2.0'
   end
@@ -61,7 +61,7 @@ if RUBY_VERSION > '1.9'
   appraise 'rails3.2' do
     gem 'rails', '~> 3.2.12'
     gem 'honeybadger', :path => '../'
-    gem 'better_errors', :require => false
+    gem 'better_errors', '~> 1.0', :require => false
     gem 'rack-mini-profiler', :require => false
     gem 'capistrano', '~> 2.0'
   end
@@ -72,7 +72,7 @@ if RUBY_VERSION > '1.9'
       gem 'rails', '~> 4.0.3'
       gem 'honeybadger', :path => '../'
       gem 'capistrano', '~> 3.0'
-      gem 'better_errors', :require => false
+    gem 'better_errors', '~> 1.0', :require => false
       gem 'rack-mini-profiler', :require => false
     end
 
@@ -80,7 +80,7 @@ if RUBY_VERSION > '1.9'
       gem 'rails', '~> 4.1.0.beta1'
       gem 'honeybadger', :path => '../'
       gem 'capistrano', '~> 3.0'
-      gem 'better_errors', :require => false
+      gem 'better_errors', '~> 1.0', :require => false
       gem 'rack-mini-profiler', :require => false
     end
   end

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Honeybadger 1.16.4 ##
+
+* Include a portion of longer queries with traces.
+
+  *Benjamin Curtis*
+
+* Aggregate short queries when sending traces.
+
+  *Benjamin Curtis*
+
 ## Honeybadger 1.16.3 ##
 
 * Handle `nil` session in Rails controllers (i.e., when the `session_off` gem is

data/Gemfile

@@ -1,2 +1,6 @@
 source 'https://rubygems.org'
 gemspec
+
+unless RUBY_VERSION < '2.1'
+  gem 'allocation_stats'
+end

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    honeybadger (1.16.3)
+    honeybadger (1.16.4)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
+    allocation_stats (0.1.5)
     appraisal (0.5.1)
       bundler
       rake
@@ -109,6 +110,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  allocation_stats
   appraisal
   aruba
   capistrano (~> 2.0)

data/gemfiles/binding_of_caller.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "binding_of_caller"
 gem "honeybadger", :path=>"../"
 

data/gemfiles/delayed_job.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "delayed_job"
 gem "honeybadger", :path=>"../"
 

data/gemfiles/rack.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "rack"
 gem "honeybadger", :path=>"../"
 

data/gemfiles/rails.gemfile

@@ -2,10 +2,11 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "rails", "~> 4.0.3"
 gem "honeybadger", :path=>"../"
 gem "capistrano", "~> 3.0"
-gem "better_errors", :require=>false
+gem "better_errors", "~> 1.0", :require=>false
 gem "rack-mini-profiler", :require=>false
 
 gemspec :path=>"../"

data/gemfiles/rails2.3.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "rails", "~> 2.3.18"
 gem "rake", "0.9.5"
 gem "honeybadger", :path=>"../"

data/gemfiles/rails3.0.gemfile

@@ -2,9 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "rails", "~> 3.0.17"
 gem "honeybadger", :path=>"../"
-gem "better_errors", :require=>false
+gem "better_errors", "~> 1.0", :require=>false
 gem "rack-mini-profiler", "~>0.1.31 ", :require=>false
 gem "capistrano", "~> 2.0"
 

data/gemfiles/rails3.1.gemfile

@@ -2,9 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "rails", "~> 3.1.12"
 gem "honeybadger", :path=>"../"
-gem "better_errors", :require=>false
+gem "better_errors", "~> 1.0", :require=>false
 gem "rack-mini-profiler", :require=>false
 gem "capistrano", "~> 2.0"
 

data/gemfiles/rails3.2.gemfile

@@ -2,9 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "rails", "~> 3.2.12"
 gem "honeybadger", :path=>"../"
-gem "better_errors", :require=>false
+gem "better_errors", "~> 1.0", :require=>false
 gem "rack-mini-profiler", :require=>false
 gem "capistrano", "~> 2.0"
 

data/gemfiles/rails4.1.gemfile

@@ -2,10 +2,11 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "rails", "~> 4.1.0.beta1"
 gem "honeybadger", :path=>"../"
 gem "capistrano", "~> 3.0"
-gem "better_errors", :require=>false
+gem "better_errors", "~> 1.0", :require=>false
 gem "rack-mini-profiler", :require=>false
 
 gemspec :path=>"../"

data/gemfiles/rake.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "rake"
 gem "honeybadger", :path=>"../"
 

data/gemfiles/sinatra.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "sinatra"
 gem "honeybadger", :path=>"../"
 

data/gemfiles/standalone.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "honeybadger", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/thor.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "allocation_stats"
 gem "thor"
 gem "honeybadger", :path=>"../"
 

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.16.3'
-  s.date              = '2014-07-21'
+  s.version           = '1.16.4'
+  s.date              = '2014-08-26'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'
@@ -136,6 +136,7 @@ Gem::Specification.new do |s|
     resources/README.md
     resources/ca-bundle.crt
     script/integration_test.rb
+    spec/allocation_stats.rb
     spec/honeybadger/backtrace_spec.rb
     spec/honeybadger/capistrano_spec.rb
     spec/honeybadger/configuration_spec.rb

data/lib/honeybadger.rb

@@ -19,7 +19,7 @@ require 'honeybadger/railtie' if defined?(Rails::Railtie)
 require 'honeybadger/monitor'
 
 module Honeybadger
-  VERSION = '1.16.3'.freeze
+  VERSION = '1.16.4'.freeze
   LOG_PREFIX = "** [Honeybadger] ".freeze
 
   HEADERS = {

data/lib/honeybadger/monitor/railtie.rb

@@ -10,7 +10,7 @@ module Honeybadger
 
           ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
             event = ActiveSupport::Notifications::Event.new(*args)
-            Monitor.worker.trace.add(event) if Monitor.worker.trace and event.name != 'SCHEMA'
+            Monitor.worker.trace.add_query(event) if Monitor.worker.trace and event.name != 'SCHEMA'
           end
 
           ActiveSupport::Notifications.subscribe(/^render_(template|action|collection)\.action_view/) do |*args|

data/lib/honeybadger/monitor/trace.rb

@@ -24,6 +24,7 @@ module Honeybadger
         @id = id
         @events = []
         @meta = {}
+        @fast_queries = {}
         @duration = 0
       end
 
@@ -32,6 +33,22 @@ module Honeybadger
         @events << ce.to_a if ce.render?
       end
 
+      def add_query(event)
+        if event.duration < 6
+          ce = clean_event(event)
+          return unless ce.render?
+          query = ce.to_s
+          if @fast_queries[query]
+            @fast_queries[query][:duration] += ce.event.duration
+            @fast_queries[query][:count] += 1
+          else
+            @fast_queries[query] = { :duration => ce.event.duration, :count => 1 }
+          end
+        else
+          add(event)
+        end
+      end
+
       def complete(event)
         @meta = clean_event(event).to_h
         @duration = event.duration
@@ -53,7 +70,7 @@ module Honeybadger
       end
 
       def to_h
-        @meta.merge({ :events => @events, :key => @key })
+        @meta.merge({ :events => @events, :key => @key, :fast_queries => @fast_queries.map {|k,v| [ k, v[:duration], v[:count] ] } })
       end
 
       protected
@@ -127,11 +144,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.bytesize < 1024 ? sql : sql[0..1023] + '...'
         end
       end
 

data/spec/allocation_stats.rb

@@ -0,0 +1,32 @@
+require 'allocation_stats'
+require 'honeybadger'
+require 'benchmark'
+require 'sham_rack'
+
+ShamRack.at('api.honeybadger.io', 443).stub.tap do |app|
+  app.register_resource('/v1/notices/', %({"id":"123456789"}), "application/json")
+  app.register_resource('/v1/ping/', %({"features":{"notices":true,"feedback":true}, "limit":null}), "application/json")
+end
+
+group_by = if ENV['GROUP']
+             ENV['GROUP'].split(',').lazy.map(&:strip).map(&:to_sym).freeze
+           else
+             [:sourcefile, :sourceline, :class].freeze
+           end
+
+puts Benchmark.measure {
+  stats = AllocationStats.trace do
+    Honeybadger.configure do |config|
+      config.api_key = 'badgers'
+      config.environment_name = 'production'
+      config.development_environments = []
+    end
+
+    1000.times do
+      Honeybadger.notify(error_class: 'AllocationStats', error_message: 'Profiling Honeybadger -- this should never actually be reported.')
+    end
+  end
+
+  puts stats.allocations(alias_paths: true).group_by(*group_by).to_text
+  puts "\n\n"
+}

metadata

@@ -1,222 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.16.3
-  prerelease: 
+  version: 1.16.4
 platform: ruby
 authors:
 - Joshua Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: sham_rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Make managing application errors a more pleasant experience.
@@ -324,6 +297,7 @@ files:
 - resources/README.md
 - resources/ca-bundle.crt
 - script/integration_test.rb
+- spec/allocation_stats.rb
 - spec/honeybadger/backtrace_spec.rb
 - spec/honeybadger/capistrano_spec.rb
 - spec/honeybadger/configuration_spec.rb
@@ -357,30 +331,26 @@ files:
 - spec/support/helpers.rb
 homepage: http://www.honeybadger.io
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
-- --markup tomdoc
+- "--charset=UTF-8"
+- "--markup tomdoc"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3175357828774041606
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: Error reports you can be happy about.