raygun-apm-rails 1.0.19 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc8275346199de493a2f17471d627e1b09cbe8ddebd5d61985e3d532eb95b440
-  data.tar.gz: c219ea0ec08978efda1ca62b5b483d032288d90f13b777d77ebe40e49572c90a
+  metadata.gz: b1947daa3dde5ecae7057bc878855cb674650ce9e7fc01ebb36486299f829116
+  data.tar.gz: 5e17a60724c045590729a95eb9b3774551a811743f55bf8540b1fce37d39383b
 SHA512:
-  metadata.gz: 3733122e03f98a8daaff55d0bc04a8edb2ce1f0c9c9a4e74325bbec9467650250530a2dfb695be36d823dc24398f3ab468939e20d7d8040dadaaba25575a9e96
-  data.tar.gz: c95b95fccb7f7c60181fe56683d1862899d111fbecac33c875f94a7ccda49d73df7e90e2a8376d881dc2b0f7ef61d30f307b17e1a51299ab6c867e47b3491f43
+  metadata.gz: 41ca05fb4218a8a11f5953ab064ade337d50cec736768adea381f9c29b707e4b763d64d8817064a2ebd5fffb3d8bc66bc23c35e87fe6d350165e045cb3639516
+  data.tar.gz: 4f4f6cf16b00b4db422b3055dd445253f400493edf683a721e592b08c7eae23b73934293fb8641a90ada5431bd629587861c115e60931d4c3ff6071482317705

data/CHANGELOG.rdoc

@@ -1,5 +1,27 @@
 = Changelog
 
+== 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
+
 == 1.0.19 (March 16, 2020)
 
 * Improve trace emission of unhandled exceptions in a request context

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
@@ -75,6 +84,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)
+                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 { exceptional_http_in_handler(env, 500) }
+                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 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
             res
           rescue Raygun::Apm::FatalError => e
             raygun_shutdown_handler(e)
@@ -48,10 +62,12 @@ 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)
             end
 
+            ActiveSupport::Notifications.unsubscribe(@sql_subscriber) if @sql_subscriber
             @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
               sql_handler(args)
             end
@@ -81,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]
@@ -98,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
@@ -111,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)
@@ -126,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
@@ -146,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/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.24"
     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.19
+  version: 1.0.24
 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-04-01 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