failbot 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8cb2311ae811089adcbf1e9c9fbecd099f5d9f
-  data.tar.gz: 6d66e03bfb51972d2353b33351ec875f67a975f3
+  metadata.gz: 90628071f00b062ad9f21fae9244d905c2f38ceb
+  data.tar.gz: d54bf144087e7a9bac861e838faa7e64ccc7deb8
 SHA512:
-  metadata.gz: 1876d1ff886d036124b734c89c99eeb83b1edc551cfa7ad1420255e4ae579171f6947c6df8575574a59646d4dd7c3bce5f808b333e381dddeaed2021d90289ce
-  data.tar.gz: 9cea110b67d819c02d461061e8939f108d493d5e793da64d7cbfa60b094ba95db956551ca7858bc0a1b755a34691eaa0b14b876421db4867f3ee72204dd2da30
+  metadata.gz: 851ec7c6a661593e9edc3ffee53799c3ceab8cde34c14a0109f8ecbdb84e95f38a304600f1671d9b2a720ccf2e09a8857d75426bff3d5197fd9d5b71182f2759
+  data.tar.gz: f47a0e5f9f083b44380f76818392e8e98bc61fc19d7871c71d205c0e92006598b3283c58ab868c243b41efc858e2fb620d566a046f177d14497b76223deeaf35

data/lib/failbot.rb

@@ -251,8 +251,8 @@ module Failbot
   # e - The exception object to turn into a Hash.
   #
   # Returns a Hash including a 'class', 'message', 'backtrace', and 'rollup'
-  #   keys. The rollup value is a MD5 hash of the exception class, file, and line
-  #   number and is used to group exceptions.
+  #   keys. The rollup value is an MD5 hash of the exception class and the
+  #   raising file, line, and method.
   def exception_info(e)
     backtrace = Array(e.backtrace)[0, 500]
 
@@ -261,7 +261,7 @@ module Failbot
       'message'    => e.message,
       'backtrace'  => backtrace.join("\n"),
       'ruby'       => RUBY_DESCRIPTION,
-      'rollup'     => Digest::MD5.hexdigest("#{e.class}#{backtrace[0]}"),
+      'rollup'     => rollup(e),
       'created_at' => Time.now.utc.iso8601(6)
     }
 
@@ -300,6 +300,22 @@ module Failbot
     Failbot.instrumenter.instrument(name, payload) if Failbot.instrumenter
   end
 
+  # Generate a 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.
+  #
+  # e - The exception object
+  #
+  # Returns a String.
+  def rollup(e)
+    backtrace_line = Array(e.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("#{e.class}#{cleaned_line}")
+  end
+
   extend self
 
   # If the library was lazy loaded due to failbot/exit_hook.rb and a delayed

data/lib/failbot/version.rb

@@ -1,3 +1,3 @@
 module Failbot
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: failbot
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - "@rtomayko"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby