raygun-apm-rails 1.1.2 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37bbd014edd21ac021ef27ce2c2c1237b4929fa7ab97932eb846f0ed95a741bb
-  data.tar.gz: d727c1e6fb3a93d242aa0331c9db3cba4e1e827d823895bef83152c526a10390
+  metadata.gz: 985a5c6277614425022e771885d60774cedc3adf7e6b984c72ab9492365ea98d
+  data.tar.gz: 69bd21d60eef2a3d224ee432b013c31e9907f008b80be5dd43256b0fbd135e47
 SHA512:
-  metadata.gz: 7ee47a2ac3b3b92c3794c872b7117a0d7dd3139915bdb472cd6f22656f18215a69602ccfbc880585a7da4a3d4c69a64fa825bd9db7588c8f93b513af14c3a77f
-  data.tar.gz: d3763e1a6ed7ab227c07bb131355c3a1fe2639f94dfe7b9173e5c3cc3d857acb2d42a97562a08560b0a5c75dc745d2e6c929ecb53194592cdbcacc2a7af79858
+  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
@@ -54,7 +56,7 @@ module Raygun
 
           def init_tracer
             tracer = Raygun::Apm::Tracer.new
-            tracer.udp_sink!
+            tracer.enable_sink!
             ObjectSpace.define_finalizer(self, self.class.finalize(tracer))
 
             ActiveSupport::Notifications.unsubscribe(@http_in_subscriber) if @http_in_subscriber
@@ -78,11 +80,14 @@ 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
+            @tracer.end_trace if @tracer
             # Let the GC clean up the sink thread through the finalizer below
             @tracer = Raygun::Apm::Tracer.instance = nil
+            crash_report_exception(exception)
             raise(exception) unless (Raygun::Apm::FatalError === exception)
           end
   
@@ -129,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)
@@ -139,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)
@@ -179,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/railtie.rb

@@ -11,9 +11,6 @@ module Raygun
             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"
-          require "raygun/apm/hooks/redis" if defined?(Redis::Client)
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "1.1.2"
+      VERSION = "1.1.5"
     end
   end
 end

data/raygun-apm-rails.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "raygun-apm"
+  spec.add_dependency "raygun-apm", "~> 1.1.11"
   spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.5
 platform: ruby
 authors:
 - Raygun Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.11
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement