raygun-apm-rails 1.0.14 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56652e1a7f4025972adeff71e48d15e0c9de9160b594c317a0542cbbb755dd68
-  data.tar.gz: 9d5ecc225f6ff015b355847336b536a6c753b86b376f7a0122d31beaa1501103
+  metadata.gz: dc8275346199de493a2f17471d627e1b09cbe8ddebd5d61985e3d532eb95b440
+  data.tar.gz: c219ea0ec08978efda1ca62b5b483d032288d90f13b777d77ebe40e49572c90a
 SHA512:
-  metadata.gz: 9920374e2efa710d18f2bd877ef3a9a583eda90fb3b6e5cb1f0cfc2f6cf4c84ea0876c67a0cc4714488d6658db3865e5d8716755941b15abe2cfe73cd5f92371
-  data.tar.gz: a5da42a667bf6affb31abb3d9e9390ed1dd9bb7164b6d1d63e7dd263d218377228ff98e955617fb3eea10c25d194339cd34e01c98d2d8a458f317f866232f653
+  metadata.gz: 3733122e03f98a8daaff55d0bc04a8edb2ce1f0c9c9a4e74325bbec9467650250530a2dfb695be36d823dc24398f3ab468939e20d7d8040dadaaba25575a9e96
+  data.tar.gz: c95b95fccb7f7c60181fe56683d1862899d111fbecac33c875f94a7ccda49d73df7e90e2a8376d881dc2b0f7ef61d30f307b17e1a51299ab6c867e47b3491f43

data/CHANGELOG.rdoc

@@ -0,0 +1,14 @@
+= Changelog
+
+== 1.0.19 (March 16, 2020)
+
+* Improve trace emission of unhandled exceptions in a request context
+
+== 1.0.18 (March 15, 2020)
+
+* Ensure a better experience with raygun4ruby with only Raygun::track_exception whitelisted
+* Remove the warning on a HTTP IN event with an exception payload - spams STDOUT and already confused some testers
+* Ensure errors raised during request exception always result in a fully wrapped trace with a 500 status
+* Wrap the exceptional HTTP IN error handler in a fake user code method too to get past the agent gate for that
+* Prefer the singleton interface on the Tracer
+* Blacklist HTTParty

data/lib/raygun/apm/rails.rb

@@ -67,7 +67,13 @@ module Raygun
           Nokogiri
           Loofah
           WebConsole
+          HTTParty
+          Raygun::Breadcrumbs
+          Raygun::Configuration
+          Raygun::config
           +Raygun::Apm::Rails::Middleware::Ruby_APM_profiler_trace
+          +Raygun::Apm::Rails::Middleware::Ruby_APM_request_error
+          +Raygun::track_exception
         }
     end
   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,41 +13,27 @@ module Raygun
           end
 
           private
-
-          def initialize_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']
-
-            # 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
+            @tracer ||= Raygun::Apm::Tracer.instance || 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 < 500 || status >= 500 && status < 600
-              exceptional_http_in_handler(env, status)
+            exception = nil
+            res = nil
+            Ruby_APM_profiler_trace do
+              begin
+                res = @app.call(env)
+              rescue => e
+                Ruby_APM_request_error { exceptional_http_in_handler(env, 500) }
+              end
+            end
+            if res && (status = res.first) >= 400 && status < 600
+              Ruby_APM_request_error { exceptional_http_in_handler(env, status) }
             end
             # Can be nil if we had a fatal error
             @tracer.end_trace if @tracer
@@ -56,6 +42,27 @@ module Raygun
             raygun_shutdown_handler(e)
           end
 
+          def init_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']
+            Raygun::Apm::Tracer.instance = tracer
+            # If any fatal errors on init, shutdown the tracer
+          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} #{exception.backtrace.join("\n")}",
             # Kill extended event subcriptions
@@ -63,13 +70,15 @@ module Raygun
             ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
             warn "[Raygun APM] notification hooks unsubscribed"
             # Let the GC clean up the sink thread through the finalizer below
-            @tracer = nil
-            Thread.current.thread_variable_set(:_raygun_apm_tracer, nil)
+            @tracer = Raygun::Apm::Tracer.instance = nil
             raise(exception) unless (Raygun::Apm::FatalError === exception)
           end
   
           def http_in_handler(args)
             notification = ActiveSupport::Notifications::Event.new *args
+            if notification.payload[:exception]
+              return
+            end
             req = Rack::Request.new notification.payload[:headers].env
             event = http_in_event
             event[:url] = req.url
@@ -148,6 +157,10 @@ module Raygun
             yield
           end
 
+          def Ruby_APM_request_error
+            yield
+          end
+
           def self.finalize(tracer)
             proc {tracer.process_ended}
           end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.19
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -76,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
 - README.rdoc