honeycomb-rails 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d63f54aff8e75b9dc23176de419708a641c7ffa9feb6acc2ceea77ff9750093
-  data.tar.gz: 028d64690d7bbdc8bc071b75ae999683c3b28c9fd41406cd30ddaa1a082dbb19
+  metadata.gz: 5269a0de1a6d47dd7c0ff92bdd5e2a954369ad0f49b09ca5c23a7c3e1d4d0214
+  data.tar.gz: 79a58361d5f1a334f9d58f48be31f13779d243130a7ea74951547baf4147f0c5
 SHA512:
-  metadata.gz: 553739e9285b2fd043288f91336d90d782015b465a7f1e2aa8f572ccc3ea425c766508e995c4f591dc9a74c81f327c8c9731c3a2df9bd429a8bb571333e6ec2b
-  data.tar.gz: 58663a163b9b813cee39dd0bcc64990a238827e87cc331d74216a702eb38e7a03653bdfb92e4e0fef8560c0fb6db096c2da05c90a568467fe3d7d3c442737de7
+  metadata.gz: 396f9cc14e318d1795a4883b54f1906a08692d98d6040219cf1726adb418fc4793c504859da5113e2a81f9fd18a12c89e2b8b87e2ef598d90714fbac61dddeee
+  data.tar.gz: d472468f60e3d33fffa15b31b259edb1fdcbc0d08462a0eaf5853c61ec2cfae05b742134ab16e96ff061c0519c25c8cc1f6adfec304fdd68ce3d85fd84c434c2

data/lib/honeycomb-rails/config.rb

@@ -8,7 +8,6 @@ module HoneycombRails
       @db_dataset = 'active_record'
       @record_flash = true
       @record_user = :detect
-      @logger = Rails.logger
       @capture_exceptions = true
       @capture_exception_backtraces = true
       @sample_rate = 1

data/lib/honeycomb-rails/overrides/action_controller_instrumentation.rb

@@ -81,24 +81,5 @@ module HoneycombRails
         end
       end
     end
-    module ActionControllerFilters
-      def self.included(controller_class)
-        controller_class.around_action :honeycomb_attach_exception_metadata
-      end
-
-      def honeycomb_attach_exception_metadata
-        begin
-          yield
-        rescue StandardError => exception
-          honeycomb_metadata[:exception_class] = exception.class.to_s
-          honeycomb_metadata[:exception_message] = exception.message
-          if HoneycombRails.config.capture_exception_backtraces
-            honeycomb_metadata[:exception_source] = Rails.backtrace_cleaner.clean(exception.backtrace)
-          end
-
-          raise
-        end
-      end
-    end
   end
 end

data/lib/honeycomb-rails/railtie.rb

@@ -17,6 +17,8 @@ module HoneycombRails
     # set up libhoney after application initialization so that any config in
     # the app's config/initializers has taken effect.
     config.after_initialize do
+      HoneycombRails.config.logger ||= ::Rails.logger
+
       writekey = HoneycombRails.config.writekey
       if writekey.blank?
         HoneycombRails.config.logger.warn("No write key defined! (Check your config's `writekey` value in config/initializers/honeycomb.rb) No events will be sent to Honeycomb.")
@@ -26,10 +28,6 @@ module HoneycombRails
         writekey: writekey,
         user_agent_addition: HoneycombRails::USER_AGENT_SUFFIX,
       )
-
-      if HoneycombRails.config.capture_exceptions
-        ::ActionController::Base.include(Overrides::ActionControllerFilters)
-      end
     end
 
     config.after_initialize do

data/lib/honeycomb-rails/subscribers/process_action.rb

@@ -21,13 +21,42 @@ module HoneycombRails
 
         # These are the keys we're interested in! Skipping noisy keys (:headers, :params) for now.
         data = event.payload.slice(:controller, :action, :method, :path, :format,
-                                  :status, :db_runtime, :view_runtime)
+                                  :status, :db_runtime, :view_runtime,
+                                  :exception, :exception_object)
 
         # Massage data to return "all" as the :format if not set
         if !data[:format] || data[:format] == "format:*/*"
           data[:format] = "all"
         end
 
+        # strip off exception fields for more friendly formatting
+        exception_info = data.delete(:exception)
+        exception = data.delete(:exception_object)
+
+        if exception_info
+          exception_class, exception_message = exception_info
+
+          # Apparently these notifications don't include the `status` field if
+          # an exception occurred while handling the request, even though the
+          # response certainly does end up with a status code set. We'd like to
+          # report that status code, so we reuse the same status code lookup
+          # table that ActionController uses. This looks janky, but it's how the
+          # standard Rails logging does it too... :|
+          #
+          # https://github.com/rails/rails/blob/37b373a8d2a1cd132bbde51cd5a3abd4ecee433b/actionpack/lib/action_controller/log_subscriber.rb#L27
+          data[:status] ||= ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class)
+
+          if HoneycombRails.config.capture_exceptions
+            data[:exception_class] = exception_class
+            data[:exception_message] = exception_message
+
+            if exception && HoneycombRails.config.capture_exception_backtraces
+              data[:exception_source] = ::Rails.backtrace_cleaner.clean(exception.backtrace)
+            end
+
+          end
+        end
+
         # Pull top-level attributes off of the ActiveSupport Event.
         data[:duration_ms] = event.duration
 

data/lib/honeycomb-rails/version.rb

@@ -1,7 +1,7 @@
 module HoneycombRails
   GEM_NAME = 'honeycomb-rails'
 
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 
   USER_AGENT_SUFFIX = "#{GEM_NAME}/#{VERSION}".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeycomb-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Sam Stokes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libhoney