raygun-apm-rails 1.0.16 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 910685e3adfe69c88e8386cb97c52b39cfee2bea3d24749e8fab7c6a8a1103cf
-  data.tar.gz: b53ff2418459434687b85c3a09bef529bb326b6e01823945452baa5c32d71262
+  metadata.gz: f48a149b559692c6a57fa6b207562fbb1f601f2e5680165902fbc1e6f5d6a247
+  data.tar.gz: 8d06e52aa1eed0a84316fa74e156cbfe7471d9a200585daad8734d2c4c268f4a
 SHA512:
-  metadata.gz: 68661256cec7214dde186391a088d81e88ac4c978e6837b3eeeee2cd87b1b39b77fdc2aaa8e5a0fa85776d2c81ebc86d1a0f798fe6fff47120c19763b4add0f5
-  data.tar.gz: 4298329b5444c9ec7869a53a2ed111e92847b75eb0288edcd13e219eb0716bc8de5bf84edde6c7a55daba70be0b084f5fda5577937f90be4ed6f6cf991bc6e7d
+  metadata.gz: 98eafd87b1d591426d08b1e4c3cc73ba1022cbc92509c5316e260e404274f9e792452a4544e51160c05e7a1c05acc4856f4f50830280b9db18f62027ec787234
+  data.tar.gz: f37a4deb0f9dad5c71704f4e74eca6b357314ee4099d8bc3f3e61e3de288b7e52d4a829cbb85e2688ed24571648ec3ddb79222c0584bbe250dd9983ac76a27ac

data/CHANGELOG.rdoc

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

@@ -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
+                exection = 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,13 +84,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
@@ -149,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.16"
+      VERSION = "1.0.21"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.21
 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-20 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