raygun-apm-rails 1.0.12 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b809f73931f3e372c8a33c6f00ee240e690dd754422b8d90e825c13e364c8f43
-  data.tar.gz: 0c7ae3fbca4daf6bc547dce1d5e6c4eacf7702392fc64395bbdfcd1324503a2c
+  metadata.gz: ee2d3d33cf58103bfd89b13c63cab3519fdade4b62c2201945296ca0b5ce3ff9
+  data.tar.gz: '0439759d0352745d3a1493eab01f39160a1ead9b82d09ed19ed652c3df1fc88d'
 SHA512:
-  metadata.gz: 4d4034d8d1226046c88511a428431283ce6792816d00db5f21801c4880ed0bd76f8985925500e8f39526090e21dbf733dcbeb74beb9c0f0fecc0f8573b961977
-  data.tar.gz: b011dbda620fb61c43caf495bff72bfb68d4c8fede30cd39e5a96013e4de98b2dd4d49293e7ec541f8ddcb4541e3d5bb66771e0fde5d3e63a46f840786f16d2b
+  metadata.gz: 3f05e571751ed3bb771041d9d67ba805d556338d56bb6b65c6142f86102e4c9a52938005642381562e461d75f7250ccd7e808927189ced46c3b8882e487750ac
+  data.tar.gz: 6f59d3c5523145e84917412dde20ae1a289a338a97af072cbbf2e2590f8afdf04052a59f409ff882ac959d134a7f13bce70cde005e41f6130352aced3cc681cf

data/lib/raygun/apm/rails.rb

@@ -60,6 +60,13 @@ module Raygun
           ConnectionPool
           CoffeeScript
           ApplicationRecord
+          Zeitwerk
+          SassC
+          Webpacker
+          DidYouMean
+          Nokogiri
+          Loofah
+          WebConsole
           +Raygun::Apm::Rails::Middleware::Ruby_APM_profiler_trace
         }
     end

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

@@ -4,7 +4,7 @@ module Raygun
         class Middleware
           def initialize(app)
             @app = app
-            @tracer_initialized = nil
+            @tracer = nil
           end
 
           def call(env)
@@ -13,45 +13,52 @@ module Raygun
           end
 
           private
+  
+          def instrument(env)
+            res = nil
+            # Can be nil if we had a fatal error
+            @tracer ||= init_tracer
+            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 < 600
+              exceptional_http_in_handler(env, status)
+            end
+            # Can be nil if we had a fatal error
+            @tracer.end_trace if @tracer
+            res
+          rescue Raygun::Apm::FatalError => e
+            raygun_shutdown_handler(e)
+          end
 
-          def initialize_tracer
+          def init_tracer
+            return @tracer if @tracer
             @tracer = Raygun::Apm::Tracer.new
             @tracer.udp_sink!
             @tracer.process_started
             ObjectSpace.define_finalizer(self, self.class.finalize(@tracer))
-  
+
             @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
 
             GC.stress = true if ENV['RAYGUN_STRESS_GC']
-
+            @tracer
             # If any fatal errors on init, shutdown the tracer
           rescue Raygun::Apm::FatalError => e
             raygun_shutdown_handler(e)
           end
-  
-          def instrument(env)
-            res = nil
-            @tracer_initialized ||= initialize_tracer
-            # Can be nil if we had a fatal error
-            if @tracer
-              Thread.current.thread_variable_set(:_raygun_apm_tracer, @tracer)
-              @tracer.start_trace
-            end
-            res = Ruby_APM_profiler_trace{ @app.call(env) }
-            # Can be nil if we had a fatal error
-            @tracer.end_trace if @tracer
-            res
-          rescue Raygun::Apm::FatalError => e
-            raygun_shutdown_handler(e)
-          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)
@@ -83,6 +90,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.12"
+      VERSION = "1.0.17"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.17
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-09 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.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Raygun application performance monitoring for Rails