raygun-apm-rails 1.0.10 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 477de1c6c1324d9e29972fea02bf4b237f2c21d2709a1db75957f5c1a6063dde
-  data.tar.gz: 6f8931ecc7176d8e59edb608dc980f720dca9a56e3b353007b2156894943db7d
+  metadata.gz: 79c1cf537ee9e8f781c49e3c2cc6cc74b8b38225e50e34bca773cae3cfdbc6b1
+  data.tar.gz: 5bd799bfa20772be1aa736220be6bb9efbfdc0aeb07d6b5c84a24b9d3bda0ac5
 SHA512:
-  metadata.gz: 78c34e90d2b77e0f5f9d905c28f862c44207b79f3603b31df1d10737514114ac1de7143ffcff17f54e0ef7bbcadbf29d2598c36adfe06c0ef49df2fa8460001f
-  data.tar.gz: ddad0b9826e634c8f6d2dd041ee812f7eb3aa2879274cb91ab69075006dbf0799f07443a1a7c0d6465bcb05f397bb2682a1a482bb228b6ae776d943a9729cf61
+  metadata.gz: a9770fa4db4c1b7d7bdb1a3a404a84d57587f61fe68466cff9c11440396ce59d21a05fe26184b2e4ed5b229eaf6d50af6b801f72353a746d2e044624ea58686d
+  data.tar.gz: a2282067547e6e0d0928f2c9269d97331ba98224d6f6078ded343a4e953ebc874f74aa9e5374fde64a4294958e5e4f16d939405f4fe4c7b60a5032fb8cf72330

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,17 +4,6 @@ module Raygun
         class Middleware
           def initialize(app)
             @app = app
-            @tracer_initialized = nil
-          end
-
-          def call(env)
-            @status, @headers, @response = instrument(env)
-            [@status, @headers, @response]
-          end
-
-          private
-
-          def initialize_tracer
             @tracer = Raygun::Apm::Tracer.new
             @tracer.udp_sink!
             @tracer.process_started
@@ -23,26 +12,37 @@ 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
 
             GC.stress = true if ENV['RAYGUN_STRESS_GC']
-
             # If any fatal errors on init, shutdown the tracer
           rescue Raygun::Apm::FatalError => e
             raygun_shutdown_handler(e)
           end
+
+          def call(env)
+            @status, @headers, @response = instrument(env)
+            [@status, @headers, @response]
+          end
+
+          private
   
           def instrument(env)
             res = nil
-            @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 < 600
+              exceptional_http_in_handler(env, status)
+            end
             # Can be nil if we had a fatal error
             @tracer.end_trace if @tracer
             res
@@ -51,13 +51,11 @@ 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)
             warn "[Raygun APM] notification hooks unsubscribed"
-            # Shutdown the tracepoints if enabled to reduce any overhead and stall emission
-            @tracer.stop_tracepoints
             # Let the GC clean up the sink thread through the finalizer below
             @tracer = nil
             Thread.current.thread_variable_set(:_raygun_apm_tracer, nil)
@@ -66,10 +64,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
@@ -85,6 +79,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.10"
+      VERSION = "1.0.15"
     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.10
+  version: 1.0.15
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-02 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