raygun-apm-rails 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af287b2e3dedf67b7ccd3c0a3db9e0ee0c4344f5301943d70cb725a5a5b9f156
-  data.tar.gz: f1eccad409e86cfe8ce71e3328f0197c5c1569f8852a2b5c4967309f05f34a2c
+  metadata.gz: 56652e1a7f4025972adeff71e48d15e0c9de9160b594c317a0542cbbb755dd68
+  data.tar.gz: 9d5ecc225f6ff015b355847336b536a6c753b86b376f7a0122d31beaa1501103
 SHA512:
-  metadata.gz: cf350bb96e85aae63395c8091fa6535d520c28da4a389faa1bd3b309e791c94afc57e98c51a22e0308e9e14373ab350922d267a208aa375277d23ff5b4dd4eb6
-  data.tar.gz: 446a35a75b08293a172e4dbab7d434e176a00c761ea4696c8524537238816dc2403a758e847734179ebe737a43193631bc15e97eb7c6b70956737b167d56de5e
+  metadata.gz: 9920374e2efa710d18f2bd877ef3a9a583eda90fb3b6e5cb1f0cfc2f6cf4c84ea0876c67a0cc4714488d6658db3865e5d8716755941b15abe2cfe73cd5f92371
+  data.tar.gz: a5da42a667bf6affb31abb3d9e9390ed1dd9bb7164b6d1d63e7dd263d218377228ff98e955617fb3eea10c25d194339cd34e01c98d2d8a458f317f866232f653

data/lib/raygun/apm/rails.rb

@@ -63,6 +63,10 @@ module Raygun
           Zeitwerk
           SassC
           Webpacker
+          DidYouMean
+          Nokogiri
+          Loofah
+          WebConsole
           +Raygun::Apm::Rails::Middleware::Ruby_APM_profiler_trace
         }
     end

data/lib/raygun/apm/rails/middleware.rb

@@ -23,6 +23,7 @@ module Raygun
             @http_in_subscriber = ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
               http_in_handler(args)
             end
+
             @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
               sql_handler(args)
             end
@@ -39,10 +40,15 @@ module Raygun
             @tracer_initialized ||= initialize_tracer
             # Can be nil if we had a fatal error
             if @tracer
+              # For the exceptional HTTP IN handler
+              @request_started = @tracer.now
               Thread.current.thread_variable_set(:_raygun_apm_tracer, @tracer)
               @tracer.start_trace
             end
             res = Ruby_APM_profiler_trace{ @app.call(env) }
+            if (status = res.first) >= 400 && status < 500 || status >= 500 && status < 600
+              exceptional_http_in_handler(env, status)
+            end
             # Can be nil if we had a fatal error
             @tracer.end_trace if @tracer
             res
@@ -51,7 +57,7 @@ module Raygun
           end
 
           def raygun_shutdown_handler(exception)
-            warn "[Raygun APM] shutting down due to error - #{exception.message}",
+            warn "[Raygun APM] shutting down due to error - #{exception.message} #{exception.backtrace.join("\n")}",
             # Kill extended event subcriptions
             ActiveSupport::Notifications.unsubscribe(@http_in_subscriber)
             ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
@@ -64,10 +70,6 @@ module Raygun
   
           def http_in_handler(args)
             notification = ActiveSupport::Notifications::Event.new *args
-            if notification.payload[:exception]
-              warn "[Raygun APM] exception in HTTP IN event: #{notification.payload[:exception]}"
-              return
-            end
             req = Rack::Request.new notification.payload[:headers].env
             event = http_in_event
             event[:url] = req.url
@@ -83,6 +85,22 @@ module Raygun
             raygun_shutdown_handler(e)
           end
 
+          # For middleware chain halts that does not trigger 'process_action.action_controller'
+          def exceptional_http_in_handler(env, status)
+            req = Rack::Request.new env
+            event = http_in_event
+            event[:url] = req.url
+            event[:verb] = req.request_method
+            event[:status] = status
+            event[:duration] = @tracer.now - @request_started
+            event[:timestamp] = @tracer.now
+            event[:tid] = @tracer.get_thread_id(Thread.current)
+            @tracer.emit(event)
+          rescue => e
+            warn "[Raygun APM] error reporting exceptional HTTP IN event"
+            raygun_shutdown_handler(e)
+          end
+
           def http_in_event
             @http_in_event ||= begin
               event = Raygun::Apm::Event::HttpIn.new

data/lib/raygun/apm/rails/version.rb

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "1.0.13"
+      VERSION = "1.0.14"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Raygun application performance monitoring for Rails