raygun-apm-rails 1.0.11 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7343414b67d3d4f27334368be9a0e12293ffb50e737e821f91149a32f9785e28
-  data.tar.gz: 7767a300addc7517ca0f30fa4250dd83aa240ece8f0832daf59e4dde100d21e5
+  metadata.gz: 910685e3adfe69c88e8386cb97c52b39cfee2bea3d24749e8fab7c6a8a1103cf
+  data.tar.gz: b53ff2418459434687b85c3a09bef529bb326b6e01823945452baa5c32d71262
 SHA512:
-  metadata.gz: 8f00178423b80f710f92a1fb97d3867c1c8a32d3b63cb0fb09143e9df33043e1d83ea5766c45380d90eca398886654ec6e37de8656c81c717022755360986621
-  data.tar.gz: 658e2b8948f7622e1cd168be6a1bbfcb7e66efe80848d2cebd8028867a337fdd5c174a2db8c748010cebcd78745f2a1a4ad31a38cc1f3589197911da513c78d0
+  metadata.gz: 68661256cec7214dde186391a088d81e88ac4c978e6837b3eeeee2cd87b1b39b77fdc2aaa8e5a0fa85776d2c81ebc86d1a0f798fe6fff47120c19763b4add0f5
+  data.tar.gz: 4298329b5444c9ec7869a53a2ed111e92847b75eb0288edcd13e219eb0716bc8de5bf84edde6c7a55daba70be0b084f5fda5577937f90be4ed6f6cf991bc6e7d

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)
@@ -64,10 +71,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 +86,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.11"
+      VERSION = "1.0.16"
     end
   end
 end

data/raygun-apm-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "raygun-apm", "~> 1.0.8"
+  spec.add_dependency "raygun-apm", "~> 1.0.15"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.16
 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-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.15
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement