raygun-apm-rails 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc8275346199de493a2f17471d627e1b09cbe8ddebd5d61985e3d532eb95b440
-  data.tar.gz: c219ea0ec08978efda1ca62b5b483d032288d90f13b777d77ebe40e49572c90a
+  metadata.gz: 274ea9a538eec6a7f3b33798485bb8a34e125d6b7656f6da6190b137d2a50667
+  data.tar.gz: e3083172f595177fbcca74e9206bb241c17f703e532ffb7c16d18322b75218a8
 SHA512:
-  metadata.gz: 3733122e03f98a8daaff55d0bc04a8edb2ce1f0c9c9a4e74325bbec9467650250530a2dfb695be36d823dc24398f3ab468939e20d7d8040dadaaba25575a9e96
-  data.tar.gz: c95b95fccb7f7c60181fe56683d1862899d111fbecac33c875f94a7ccda49d73df7e90e2a8376d881dc2b0f7ef61d30f307b17e1a51299ab6c867e47b3491f43
+  metadata.gz: 7ab24ef63ac928dc823e96181a1b1f5be51839f4b13646b07571686680eea2482dbedd0134e4959bcd4233d07ca8e6f80883308ba67922e11a2e77f3a9a9c9b5
+  data.tar.gz: '0988caffa77325919b9fb2d3d31bbc90229ecf424bc52686980f3c5a6953d9e67f54407f02550acc8073e118296512a372ffb476e032bdc471cd02b0b3d17322'

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = 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

data/lib/raygun/apm/rails.rb

@@ -75,6 +75,10 @@ module Raygun
           +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

@@ -29,7 +29,11 @@ module Raygun
               begin
                 res = @app.call(env)
               rescue => e
-                Ruby_APM_request_error { exceptional_http_in_handler(env, 500) }
+                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
@@ -37,6 +41,7 @@ module Raygun
             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)

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.19"
+      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.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm