raygun-apm-rails 1.0.17 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2d3d33cf58103bfd89b13c63cab3519fdade4b62c2201945296ca0b5ce3ff9
-  data.tar.gz: '0439759d0352745d3a1493eab01f39160a1ead9b82d09ed19ed652c3df1fc88d'
+  metadata.gz: f02b24c73e81c0e61e03ba065bfcc8ee32e03ca8e5a035734f65aa7f67db986c
+  data.tar.gz: a0f88c3268b2f082038f44dd28e4af67087d08b56713885cd4f92fe58db12119
 SHA512:
-  metadata.gz: 3f05e571751ed3bb771041d9d67ba805d556338d56bb6b65c6142f86102e4c9a52938005642381562e461d75f7250ccd7e808927189ced46c3b8882e487750ac
-  data.tar.gz: 6f59d3c5523145e84917412dde20ae1a289a338a97af072cbbf2e2590f8afdf04052a59f409ff882ac959d134a7f13bce70cde005e41f6130352aced3cc681cf
+  metadata.gz: a103e44784bd63d622633c124d0d073ad860d414add2a46842cc2949620391284fbad5907b24d89e28ca8541756d4ccde779e63f12abd3f1b8ea8f9e0b83c0a7
+  data.tar.gz: a197d265464e0f65337d480038729878d995b41b86d11fe639656c79e51bfb0d4d7357a8a3e10ef5a3e1c833ad55492333999fe708c4473be31e2bb3db70c2d2

data/CHANGELOG.rdoc

@@ -0,0 +1,27 @@
+= Changelog
+
+== 1.0.22 (March 24, 2020)
+
+* Fix local variable typo in the Rails middleware
+* Blacklist TZInfo
+
+== 1.0.21 (March 19, 2020)
+
+* Further improvements of emitting exceptions and other error status codes for apps with and without raygun4ruby installed
+
+== 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,19 @@ module Raygun
           Nokogiri
           Loofah
           WebConsole
+          HTTParty
+          TZinfo
+          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

@@ -17,30 +17,50 @@ module Raygun
           def instrument(env)
             res = nil
             # Can be nil if we had a fatal error
-            @tracer ||= init_tracer
+            @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)
+                if res && (status = res.first) >= 400 && status < 600
+                  Ruby_APM_request_error do
+                    message = Rack::Utils::HTTP_STATUS_CODES[status]
+                    begin
+                      raise "HTTP #{status} #{message}"
+                    rescue => e
+                      Raygun.track_exception(e, env) if Raygun::Apm::Rails.raygun4ruby?
+                    end
+                    exceptional_http_in_handler(env, status)
+                  end
+                end
+              rescue => e
+                Ruby_APM_request_error do
+                  raise e rescue nil
+                  Raygun.track_exception(e, env) if Raygun::Apm::Rails.raygun4ruby?
+                  exceptional_http_in_handler(env, 500)
+                end
+                exception = e
+              end
             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
-            return @tracer if @tracer
-            @tracer = Raygun::Apm::Tracer.new
-            @tracer.udp_sink!
-            @tracer.process_started
-            ObjectSpace.define_finalizer(self, self.class.finalize(@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)
@@ -51,7 +71,7 @@ module Raygun
             end
 
             GC.stress = true if ENV['RAYGUN_STRESS_GC']
-            @tracer
+            Raygun::Apm::Tracer.instance = tracer
             # If any fatal errors on init, shutdown the tracer
           rescue Raygun::Apm::FatalError => e
             raygun_shutdown_handler(e)
@@ -64,15 +84,13 @@ 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]
-              warn "[Raygun APM] exception in HTTP IN event: #{notification.payload[:exception]}"
               return
             end
             req = Rack::Request.new notification.payload[:headers].env
@@ -153,6 +171,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.17"
+      VERSION = "1.0.22"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.22
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-03-24 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.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Raygun application performance monitoring for Rails