raygun-apm-rails 1.0.40 → 1.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1affdff67622a0393fa805c03dec12b95a7e96121b912bde7435cefb9d793bb7
-  data.tar.gz: c610f30aeed993d831b154ec53a94f1bd0599990b149f97494bb83234dc332d5
+  metadata.gz: '0960b482d47c77c0448eecb23722f1fb206327b7de89eb2db02e7cc90a51efd4'
+  data.tar.gz: 01537cda34b2134a80fd2eb7fc2d314707756877b17baca4e4818861a7d5e3d6
 SHA512:
-  metadata.gz: 4617790e7b5f6c70c282b63cd35ec6297b7f72e27029d6943ba7b1abb2547176d9ee6ab316d2eb2feb64aaff1a5192cb5515d56277353d5f9085482a1844815b
-  data.tar.gz: db12daeb9f737e308a61a446e683f286b190d1fcea17547d74cbf0ebd1cda9f4a2ca935a86528cd71043a394586e9d062036a590dd56e51453d52e0075914db5
+  metadata.gz: beb414f861e3b325489e5f14a2527d2dac0507106e1bcf187c1d66f60c9a335ec8001dfae20e70873a9c242d47d7926d93367bef231d133e12371062bcbc051b
+  data.tar.gz: 3a81267f8f9fdd3d796c49db6e0a14d10e3b80050d814bd751da1af858d2d387b0f6ec39022ac4e726fc801d8b6590919ef115e28742fb61a0c7e233b742d4fd

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'] || env['REQUEST_URI']).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
@@ -29,15 +36,15 @@ module Raygun
               begin
                 res = @app.call(env)
               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
@@ -96,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
@@ -108,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)
@@ -141,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
@@ -156,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
@@ -168,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.40"
+      VERSION = "1.0.58"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.40
+  version: 1.0.58
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm