raygun-apm-rails 1.0.20 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 274ea9a538eec6a7f3b33798485bb8a34e125d6b7656f6da6190b137d2a50667
-  data.tar.gz: e3083172f595177fbcca74e9206bb241c17f703e532ffb7c16d18322b75218a8
+  metadata.gz: e1ed60ffbe45aae39cb1950c0c264018437c3c144ec7bbe178a5c172c062b72d
+  data.tar.gz: 01f3aec28f93c40c6339187270b4bf2ca0fddbcd64a6dab67bd6af2040c20e4e
 SHA512:
-  metadata.gz: 7ab24ef63ac928dc823e96181a1b1f5be51839f4b13646b07571686680eea2482dbedd0134e4959bcd4233d07ca8e6f80883308ba67922e11a2e77f3a9a9c9b5
-  data.tar.gz: '0988caffa77325919b9fb2d3d31bbc90229ecf424bc52686980f3c5a6953d9e67f54407f02550acc8073e118296512a372ffb476e032bdc471cd02b0b3d17322'
+  metadata.gz: 2eb362b074e81d3c2f9c149c040f6c328f6c1adbe567382edddf2f683517fc01e4d56f43540603683af2d5092f62749076985dac92f33f0c5cc6b71b3e16afd6
+  data.tar.gz: 2c3887fcfdf1b57008bca5a4f7ff9e9f41e8c0ec787895fea293fae073b9f044180438a0f3b20819c037ae0c453135e76ba2c8f97ba1f50c5f92d91c2c52bf96

data/CHANGELOG.rdoc

@@ -1,5 +1,27 @@
 = Changelog
 
+== 1.0.25 (April 11, 2020)
+
+* Only ever attempt to emit extended events if a tracer instance is alive
+
+== 1.0.24 (April 1, 2020)
+
+* Blacklist Enumeration
+* Unsubscribe from previously registered AS::Notifications subscribers as child processes emit double HTTP IN and SQL events otherwise
+
+== 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

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    raygun-apm-rails (0.1.0)
-      raygun-apm (~> 0.0.8)
+    raygun-apm-rails (1.0.24)
+      raygun-apm (~> 1.0.15)
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.13.0)
     rake (10.5.0)
-    raygun-apm (0.0.8-x86-linux)
+    raygun-apm (1.0.23-universal-darwin)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2.1.4)
   minitest (~> 5.0)
   rake (~> 10.0)
   raygun-apm-rails!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/lib/raygun/apm/rails.rb

@@ -68,6 +68,15 @@ module Raygun
           Loofah
           WebConsole
           HTTParty
+          TZInfo
+          Devise
+          Marginalia
+          FastGettext
+          Lograge
+          Warden
+          Grape
+          Mustermann
+          Enumeration
           Raygun::Breadcrumbs
           Raygun::Configuration
           Raygun::config

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,17 +28,26 @@ module Raygun
             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) if @tracer
+                  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)
+                  exceptional_http_in_handler(env, 500) if @tracer
                 end
-                exection = e
+                exception = e
               end
             end
-            if res && (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
@@ -53,12 +62,14 @@ module Raygun
             tracer.process_started
             ObjectSpace.define_finalizer(self, self.class.finalize(tracer))
 
+            ActiveSupport::Notifications.unsubscribe(@http_in_subscriber) if @http_in_subscriber
             @http_in_subscriber = ActiveSupport::Notifications.subscribe('process_action.action_controller') do |*args|
-              http_in_handler(args)
+              http_in_handler(args) if @tracer
             end
 
+            ActiveSupport::Notifications.unsubscribe(@sql_subscriber) if @sql_subscriber
             @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-              sql_handler(args)
+              sql_handler(args) if @tracer
             end
 
             GC.stress = true if ENV['RAYGUN_STRESS_GC']
@@ -86,6 +97,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]
@@ -103,6 +115,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
@@ -116,11 +129,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)
@@ -131,6 +140,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
@@ -151,11 +161,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/version.rb

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "1.0.20"
+      VERSION = "1.0.25"
     end
   end
 end

data/raygun-apm-rails.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "raygun-apm", "~> 1.0.15"
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.25
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement