raygun-apm-rails 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 503c35a65596bf15fe6b21de389379d666ad61285f8d5a1b2e47bd040e79b565
-  data.tar.gz: 7aed892aed451995f1665c32b5a6429fd16e44519eab3b4b0457e8ef4f748e5d
+  metadata.gz: 985a5c6277614425022e771885d60774cedc3adf7e6b984c72ab9492365ea98d
+  data.tar.gz: 69bd21d60eef2a3d224ee432b013c31e9907f008b80be5dd43256b0fbd135e47
 SHA512:
-  metadata.gz: 23158e351ac2293d95887d083764b1b728885926dff2a4fadaff4a49ef63e57421cd820b6abfc4da107e53eb024cb46289f733bc43e34973c4889c917350e7d7
-  data.tar.gz: 433f0aaef732aafa5cfce06b710b73ef629d7e0014193906fba5832fbd1d93eb32fa5903d598c4a20090207298c78a1e558e576eb829ab3ff47345b7a0fc7429
+  metadata.gz: 90ed4a1ed6485598e332867679ec9386e60b0b7b637faeb165a713cc49f54dbcbf77d8291b3eacb23c5b43fc49aaf44782e4ab3827da71c43ef0ee1c6ad70242
+  data.tar.gz: 6024ec51294d4bdf19d664d9e2583013211c8e91ca3908eb594b0301224869de517386a8e4e7666ab35bcf7af7f67ea472442ba6131d718d955d57a191ebbbdf

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

@@ -7,11 +7,13 @@ module Raygun
             @app = app
             @mutex = Mutex.new
             @tracer = nil
+            @http_in_subscriber = nil
+            @sql_subscriber = nil
           end
 
           def call(env)
-            @status, @headers, @response = instrument(env)
-            [@status, @headers, @response]
+            status, headers, response = instrument(env)
+            [status, headers, response]
           end
 
           private
@@ -27,7 +29,7 @@ module Raygun
             end
             if @tracer
               # For the exceptional HTTP IN handler
-              @request_started = @tracer.now
+              Thread.current[:_raygun_request_started] = @tracer.now
               @tracer.start_trace
             end
             exception = nil
@@ -78,7 +80,9 @@ module Raygun
             warn "[Raygun APM] shutting down due to error - #{exception.message} #{exception.backtrace.join("\n")}",
             # Kill extended event subcriptions
             ActiveSupport::Notifications.unsubscribe(@http_in_subscriber)
+            @http_in_subscriber = nil
             ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
+            @sql_subscriber = nil
             warn "[Raygun APM] notification hooks unsubscribed"
             @tracer.end_trace if @tracer
             # Let the GC clean up the sink thread through the finalizer below
@@ -130,7 +134,7 @@ module Raygun
             event[:url] = req.url
             event[:verb] = req.request_method
             event[:status] = 500
-            event[:duration] = @tracer.now - @request_started
+            event[:duration] = @tracer.now - Thread.current[:_raygun_request_started]
             event[:timestamp] = @tracer.now
             event[:tid] = @tracer.get_thread_id(Thread.current)
             @tracer.emit(event)
@@ -140,7 +144,7 @@ module Raygun
           end
 
           def http_in_event
-            @http_in_event ||= Raygun::Apm::Event::HttpIn.new
+            Thread.current[:_raygun_http_in_event] ||= Raygun::Apm::Event::HttpIn.new
           end
 
           def sql_handler(args)
@@ -180,7 +184,7 @@ module Raygun
           end
 
           def sql_event
-            @sql_event ||= Raygun::Apm::Event::Sql.new
+            Thread.current[:_raygun_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.1.4"
+      VERSION = "1.1.5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Raygun Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm