raygun-apm-rails 1.0.15 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79c1cf537ee9e8f781c49e3c2cc6cc74b8b38225e50e34bca773cae3cfdbc6b1
-  data.tar.gz: 5bd799bfa20772be1aa736220be6bb9efbfdc0aeb07d6b5c84a24b9d3bda0ac5
+  metadata.gz: 274ea9a538eec6a7f3b33798485bb8a34e125d6b7656f6da6190b137d2a50667
+  data.tar.gz: e3083172f595177fbcca74e9206bb241c17f703e532ffb7c16d18322b75218a8
 SHA512:
-  metadata.gz: a9770fa4db4c1b7d7bdb1a3a404a84d57587f61fe68466cff9c11440396ce59d21a05fe26184b2e4ed5b229eaf6d50af6b801f72353a746d2e044624ea58686d
-  data.tar.gz: a2282067547e6e0d0928f2c9269d97331ba98224d6f6078ded343a4e953ebc874f74aa9e5374fde64a4294958e5e4f16d939405f4fe4c7b60a5032fb8cf72330
+  metadata.gz: 7ab24ef63ac928dc823e96181a1b1f5be51839f4b13646b07571686680eea2482dbedd0134e4959bcd4233d07ca8e6f80883308ba67922e11a2e77f3a9a9c9b5
+  data.tar.gz: '0988caffa77325919b9fb2d3d31bbc90229ecf424bc52686980f3c5a6953d9e67f54407f02550acc8073e118296512a372ffb476e032bdc471cd02b0b3d17322'

data/CHANGELOG.rdoc

@@ -0,0 +1,18 @@
+= Changelog
+
+== 1.0.20 (March 18, 2020)
+
+* Introduce support for detecting the presence of raygun4ruby and integrate better with the exception tracker
+
+== 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,8 +67,18 @@ 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
         }
+
+        def self.raygun4ruby?
+          defined?(Raygun) && Raygun.respond_to?(:configured?) && Raygun.configured?
+        end
     end
   end
 end

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

@@ -4,23 +4,7 @@ module Raygun
         class Middleware
           def initialize(app)
             @app = app
-            @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)
+            @tracer = nil
           end
 
           def call(env)
@@ -33,23 +17,57 @@ module Raygun
           def instrument(env)
             res = nil
             # 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 < 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 do
+                  Raygun.track_exception(e, env) if Raygun::Apm::Rails.raygun4ruby?
+                  exceptional_http_in_handler(env, 500)
+                end
+                exection = e
+              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
+            raise exception if exception
             res
           rescue Raygun::Apm::FatalError => e
             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
@@ -57,13 +75,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
@@ -142,6 +162,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/railtie.rb

@@ -6,6 +6,10 @@ module Raygun
           require "raygun/apm"
           require "raygun/apm/rails/middleware"
           Raygun::Apm::Blacklist.extend_with Raygun::Apm::Rails::BLACKLIST
+          if Raygun::Apm::Rails.raygun4ruby?
+            # Remove the exception notifier because we handle it in the APM middleware now instead
+            app.middleware.delete Raygun::Middleware::RackExceptionInterceptor
+          end
           app.middleware.use Raygun::Apm::Rails::Middleware
           # Explictly enable instrumenting HTTP until a good control API is figured out
           require "raygun/apm/hooks/net_http"

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "1.0.15"
+      VERSION = "1.0.20"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.20
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-03-18 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