raygun-apm-rails 1.0.18 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 715626f8f9976fa6af04de7e06b2977e1dc261f48e50e27b01edd4772af08be9
-  data.tar.gz: a25c402d9238165a0664047bfe15a5074e3c4c7088ccb28af2fddb5cdacc09b8
+  metadata.gz: 9c01afbb158b12686bc5f07ef0898e963c6d7c3419a7fd990bcd19c46081d8ca
+  data.tar.gz: 067553cff98ea3b72bb142d69e6877697998f5ad632a5e4b5c2d95fb17e5210c
 SHA512:
-  metadata.gz: 6d86b7b853a306a61b9993f417abce9a861b2c41ac2a68129e003b2e4d9f5e7cd90d1dfb4027bd1ceee5ed9cc2df98ef652e9abf98045cd13169cc95061dcb28
-  data.tar.gz: 610ff0610f8b9176fa747b97c9bf6e6db312c8fc9df06e4e87cd55e94c16939a9e6c11d4889a3c0561984e4dd90ae565b48e98a636a9da9fcef912d06565e55e
+  metadata.gz: fd5dc7e6043bd9bd7923f867d804205fc437aae4f5edfeeee61740ac0915c3bb111b5f6f9d2e1ae864f580f3da99892a883c803065a6d797d14af494eddf6be7
+  data.tar.gz: d21f5e5f0e336636aabc9037c938106b981152f092921c582fe210d8f179bfd875cfb1f3cf3a202d59330aa82f612c8751581b0ba3f29fc681bdb0415cf2aea0

data/CHANGELOG.rdoc

@@ -1,5 +1,26 @@
 = Changelog
 
+== 1.0.23 (March 25, 2020)
+
+* Do not cache PID on HTTP IN and SQL event initializers
+
+== 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

data/lib/raygun/apm/rails.rb

@@ -68,6 +68,14 @@ module Raygun
           Loofah
           WebConsole
           HTTParty
+          TZInfo
+          Devise
+          Marginalia
+          FastGettext
+          Lograge
+          Warden
+          Grape
+          Mustermann
           Raygun::Breadcrumbs
           Raygun::Configuration
           Raygun::config
@@ -75,6 +83,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

@@ -17,7 +17,7 @@ module Raygun
           def instrument(env)
             res = nil
             # Can be nil if we had a fatal error
-            @tracer ||= Raygun::Apm::Tracer.instance || init_tracer
+            @tracer = Raygun::Apm::Tracer.instance || init_tracer
             if @tracer
               # For the exceptional HTTP IN handler
               @request_started = @tracer.now
@@ -28,15 +28,29 @@ module Raygun
             Ruby_APM_profiler_trace do
               begin
                 res = @app.call(env)
-              rescue
-                exceptional_http_in_handler(env, 500)
+                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
-            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
+            raise exception if exception
             res
           rescue Raygun::Apm::FatalError => e
             raygun_shutdown_handler(e)
@@ -81,6 +95,7 @@ module Raygun
             end
             req = Rack::Request.new notification.payload[:headers].env
             event = http_in_event
+            event[:pid] = Process.pid
             event[:url] = req.url
             event[:verb] = req.request_method
             event[:status] = notification.payload[:status]
@@ -98,6 +113,7 @@ module Raygun
           def exceptional_http_in_handler(env, status)
             req = Rack::Request.new env
             event = http_in_event
+            event[:pid] = Process.pid
             event[:url] = req.url
             event[:verb] = req.request_method
             event[:status] = status
@@ -111,11 +127,7 @@ module Raygun
           end
 
           def http_in_event
-            @http_in_event ||= begin
-              event = Raygun::Apm::Event::HttpIn.new
-              event[:pid] = Process.pid
-              event
-            end
+            @http_in_event ||= Raygun::Apm::Event::HttpIn.new
           end
 
           def sql_handler(args)
@@ -126,6 +138,7 @@ module Raygun
               ObjectSpace._id2ref(notification.payload[:connection_id])
             end
             event = sql_event
+            event[:pid] = Process.pid
             event[:query] = notification.payload[:sql]
   
             # XXX this is hacky
@@ -146,11 +159,7 @@ module Raygun
           end
 
           def sql_event
-            @sql_event ||= begin
-              event = Raygun::Apm::Event::Sql.new
-              event[:pid] = Process.pid
-              event
-            end
+            @sql_event ||= Raygun::Apm::Event::Sql.new
           end
 
           def Ruby_APM_profiler_trace

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.18"
+      VERSION = "1.0.23"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.23
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm