raygun-apm-rails 1.0.22 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f02b24c73e81c0e61e03ba065bfcc8ee32e03ca8e5a035734f65aa7f67db986c
-  data.tar.gz: a0f88c3268b2f082038f44dd28e4af67087d08b56713885cd4f92fe58db12119
+  metadata.gz: 260710ffbf3750e8dbcff40981aa042d6513c95ddd737c457b5c18a62c04d14f
+  data.tar.gz: 354e9620e863868d9cefa2693a271b1c260592bc162325d086cfd54884865efe
 SHA512:
-  metadata.gz: a103e44784bd63d622633c124d0d073ad860d414add2a46842cc2949620391284fbad5907b24d89e28ca8541756d4ccde779e63f12abd3f1b8ea8f9e0b83c0a7
-  data.tar.gz: a197d265464e0f65337d480038729878d995b41b86d11fe639656c79e51bfb0d4d7357a8a3e10ef5a3e1c833ad55492333999fe708c4473be31e2bb3db70c2d2
+  metadata.gz: 75d8c4ff6cb0c65182aa6db99abdef0da3c02da9cf8781157de4a596948abe3f39b739d30f70c72bb0b2763f18d27e576cbf8ab360a2d04956b9d895449548e4
+  data.tar.gz: 22e9a61b8c53a5a89e62fad4d0de5bbbce38cf43e26340d5b70f9fb0455df3744ed9a97c28667f2f9d961297eda09dcb41f25efc2261ee9e95d39dca63e49d86

data/CHANGELOG.rdoc

@@ -1,5 +1,26 @@
 = Changelog
 
+== 1.0.27 (April 11, 2020)
+
+* Restore Rails 4 support with caveat that HTTP IN paths are not fully qualified with protocol, host and port
+
+== 1.0.26 (April 11, 2020)
+
+* Remove Rails 4 support (no headers element in the notifications hash for HTTP in)
+
+== 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

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.27)
+      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.29-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/README.rdoc

@@ -25,9 +25,8 @@ The profiler only supports CRuby, also known as Matz's Ruby Interpreter (MRI).
 
 == Supported Rails versions
 
-Rails 4 and up.
+Rails 5 and up.
 
-* Rails 4.x
 * Rails 5.x
 * Rails 6.x
 

data/lib/raygun/apm/rails.rb

@@ -68,7 +68,15 @@ module Raygun
           Loofah
           WebConsole
           HTTParty
-          TZinfo
+          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
@@ -36,14 +36,14 @@ module Raygun
                     rescue => e
                       Raygun.track_exception(e, env) if Raygun::Apm::Rails.raygun4ruby?
                     end
-                    exceptional_http_in_handler(env, status)
+                    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
                 exception = e
               end
@@ -62,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']
@@ -93,8 +95,16 @@ module Raygun
             if notification.payload[:exception]
               return
             end
-            req = Rack::Request.new notification.payload[:headers].env
+            if headers = notification.payload[:headers]
+              req = Rack::Request.new headers.env
+              url = req.url
+              verb = req.request_method
+            else
+              url = notification.payload[:path]
+              verb = notification.payload[:method].to_s.upcase
+            end
             event = http_in_event
+            event[:pid] = Process.pid
             event[:url] = req.url
             event[:verb] = req.request_method
             event[:status] = notification.payload[:status]
@@ -112,6 +122,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
@@ -125,11 +136,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)
@@ -140,6 +147,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
@@ -160,11 +168,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.22"
+      VERSION = "1.0.27"
     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.22
+  version: 1.0.27
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 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