raygun-apm-rails 1.0.13 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af287b2e3dedf67b7ccd3c0a3db9e0ee0c4344f5301943d70cb725a5a5b9f156
-  data.tar.gz: f1eccad409e86cfe8ce71e3328f0197c5c1569f8852a2b5c4967309f05f34a2c
+  metadata.gz: 715626f8f9976fa6af04de7e06b2977e1dc261f48e50e27b01edd4772af08be9
+  data.tar.gz: a25c402d9238165a0664047bfe15a5074e3c4c7088ccb28af2fddb5cdacc09b8
 SHA512:
-  metadata.gz: cf350bb96e85aae63395c8091fa6535d520c28da4a389faa1bd3b309e791c94afc57e98c51a22e0308e9e14373ab350922d267a208aa375277d23ff5b4dd4eb6
-  data.tar.gz: 446a35a75b08293a172e4dbab7d434e176a00c761ea4696c8524537238816dc2403a758e847734179ebe737a43193631bc15e97eb7c6b70956737b167d56de5e
+  metadata.gz: 6d86b7b853a306a61b9993f417abce9a861b2c41ac2a68129e003b2e4d9f5e7cd90d1dfb4027bd1ceee5ed9cc2df98ef652e9abf98045cd13169cc95061dcb28
+  data.tar.gz: 610ff0610f8b9176fa747b97c9bf6e6db312c8fc9df06e4e87cd55e94c16939a9e6c11d4889a3c0561984e4dd90ae565b48e98a636a9da9fcef912d06565e55e

data/CHANGELOG.rdoc

@@ -0,0 +1,10 @@
+= Changelog
+
+== 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

@@ -63,7 +63,17 @@ module Raygun
           Zeitwerk
           SassC
           Webpacker
+          DidYouMean
+          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,36 +13,28 @@ 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
-              Thread.current.thread_variable_set(:_raygun_apm_tracer, @tracer)
+              # For the exceptional HTTP IN handler
+              @request_started = @tracer.now
               @tracer.start_trace
             end
-            res = Ruby_APM_profiler_trace{ @app.call(env) }
+            exception = nil
+            res = nil
+            Ruby_APM_profiler_trace do
+              begin
+                res = @app.call(env)
+              rescue
+                exceptional_http_in_handler(env, 500)
+              end
+            end
+            if (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
             res
@@ -50,22 +42,41 @@ 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}",
+            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"
             # 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]
-              warn "[Raygun APM] exception in HTTP IN event: #{notification.payload[:exception]}"
               return
             end
             req = Rack::Request.new notification.payload[:headers].env
@@ -83,6 +94,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
@@ -130,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.13"
+      VERSION = "1.0.18"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.18
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-15 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
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Raygun application performance monitoring for Rails