raygun-apm-rails 1.0.39 → 1.0.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f6a07ee4fbe4f294919714c6f1858d5c63dc4eb10afa5fef80127e5daccc783
-  data.tar.gz: 6a7c96aefe0dc6fc3555264224a6eaa854bd7792ce3b14c11350bfddeed039d3
+  metadata.gz: 77b2cb6b362699a84104a6482f78b07e048cfe4078f6e9c8bb4c3ccb3f68790d
+  data.tar.gz: 87841e971bf4b9c11bd307425d3a4c3fcd8a64c3146ecf6d5da31c8f21f507ce
 SHA512:
-  metadata.gz: 18d47aae61e21982516f288ba2908eb61be218a7cdfc7acf2ab351496fcf2fde62a10fd721a593800ea205f62d5b7e36a6ca01a409dcb338492e9434b9e7ed66
-  data.tar.gz: 331f005adb478052aa4970dca6ecf0f891f6e56cb198ce1fa333a2f998d26a258e8a4839b980ed1e6362facdf74e836006e51638f58346f51dfe63f2179839f2
+  metadata.gz: 7f08c270b6bb5d837f582a17f64750839042a38218895ae842f7541e18563893703ace59900c7ba6faf6cc9a030a523f19c9c11a8c8c8e9efaca11a8dc2bc51f
+  data.tar.gz: daaa001d451f0f7d01c8133021ff1735a645324f55aabb1b1108252f9d1a8bd48a4593e2037e7709832d5d3b18340e9089f8691ed78dd4e10c6d1c44333c2b99

data/lib/raygun/apm/rails/middleware.rb

@@ -2,8 +2,10 @@ module Raygun
     module Apm
       module Rails
         class Middleware
+          POSTGRESQLSTRING = "postgresql"
           def initialize(app)
             @app = app
+            @mutex = Mutex.new
             @tracer = nil
           end
 
@@ -15,9 +17,14 @@ module Raygun
           private
   
           def instrument(env)
-            res = nil
-            # Can be nil if we had a fatal error
-            @tracer = Raygun::Apm::Tracer.instance || init_tracer
+            # Ignore asset requests
+            if env['REQUEST_PATH'].match(/^\/assets\//)
+              return @app.call(env)
+            end
+            @mutex.synchronize do
+              # Can be nil if we had a fatal error
+              @tracer = Raygun::Apm::Tracer.instance || init_tracer
+            end
             if @tracer
               # For the exceptional HTTP IN handler
               @request_started = @tracer.now
@@ -28,25 +35,16 @@ module Raygun
             Ruby_APM_profiler_trace do
               begin
                 res = @app.call(env)
-                if res && (status = res.first) >= 400 && status < 600
-                  message = Rack::Utils::HTTP_STATUS_CODES[status]
-                  begin
-                    raise "HTTP #{status} #{message}"
-                  rescue => e
-                    crash_report_exception(e)
-                  end
-                  exceptional_http_in_handler(env, status) if @tracer
-                end
               rescue => e
-                crash_report_exception(e)
-                exceptional_http_in_handler(env, 500) if @tracer
+                crash_report_exception(e, env)
+                exceptional_http_in_handler(env) if @tracer
                 exception = e
               end
             end
             # Can be nil if we had a fatal error
             if @tracer
-              @tracer.end_trace
               @tracer.diagnostics if ENV['PROTON_DIAGNOSTICS']
+              @tracer.end_trace
             end
             raise exception if exception
             res
@@ -105,7 +103,7 @@ module Raygun
             event[:pid] = Process.pid
             event[:url] = url
             event[:verb] = verb
-            event[:status] = notification.payload[:status]
+            event[:status] = notification.payload[:status] || notification.payload[:headers]["action_controller.instance"].status
             # XXX constant milliseconds to microseconds
             event[:duration] = notification.duration * 1000
             event[:timestamp] = @tracer.now
@@ -117,13 +115,13 @@ module Raygun
           end
 
           # For middleware chain halts that does not trigger 'process_action.action_controller'
-          def exceptional_http_in_handler(env, status)
+          def exceptional_http_in_handler(env)
             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
+            event[:status] = 500
             event[:duration] = @tracer.now - @request_started
             event[:timestamp] = @tracer.now
             event[:tid] = @tracer.get_thread_id(Thread.current)
@@ -150,7 +148,7 @@ module Raygun
   
             # XXX this is hacky
             if config = connection.instance_variable_get('@config')
-              event[:provider] = config[:adapter]
+              event[:provider] = get_sql_provider_name(config)
               event[:host] = config[:host]
               event[:database] = config[:database]
             end
@@ -165,6 +163,14 @@ module Raygun
             raygun_shutdown_handler(e)
           end
 
+          #This function adjusts the provider name for PostgreSQL to Postgres because all other Raygun profilers use Postgres and this will keep the UI consistent across supported languages
+          def get_sql_provider_name(config)
+            if config[:adapter] == POSTGRESQLSTRING 
+              return "postgres"
+            end
+            config[:adapter]
+          end
+
           def sql_event
             @sql_event ||= Raygun::Apm::Event::Sql.new
           end
@@ -177,9 +183,10 @@ module Raygun
             yield
           end
 
-          def crash_report_exception(exception)
+          def crash_report_exception(exception, env = {})
             if Raygun::Apm::Rails.raygun4ruby?
-              Raygun.track_exception(exception, correlation_id: exception.instance_variable_get(:@__raygun_correlation_id))
+              env.merge!(correlation_id: exception.instance_variable_get(:@__raygun_correlation_id))
+              Raygun.track_exception(exception, env)
             end
           end
 

data/lib/raygun/apm/rails/version.rb

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "1.0.39"
+      VERSION = "1.0.57"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.39
+  version: 1.0.57
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Raygun application performance monitoring for Rails