raygun-apm-rails 0.1.13 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feedfb6825f3dbe8893072208bc6904f1a838fb785b0b771aa39276a7bf6c60a
-  data.tar.gz: 8e3ba8a42d36bbeb70ca0cd7666e0275620e3f14f65b0f1f9ab7f32104842f8f
+  metadata.gz: b32dbda41f5ec97d4087eeb129cf4e931c8c836a028aac5aa44d3f1d7d4f8107
+  data.tar.gz: c31b24a26171d71c30fa745a74a749ab72c98275aa26f736bb4d67fe8b927f33
 SHA512:
-  metadata.gz: 44ddcc5ac107e35f6ef4ca34200cae8253f988847d325f8a96456f03a9d6a8e903e68af259d5091efbcb931a9590e4910f953d8e2597ef073e5516b6f5351cd6
-  data.tar.gz: aaa9672094ac627d4f5cf2d8c52d193e1928e2d02713f000a748c8b6529737acd46228eed2d6aa1490ac6df8c33b5848c9f85d3bf62e43431485f32944194487
+  metadata.gz: 7a7ee9fab13361fa65fc5eb18d24e39bad80497c9c46255a1bc8b105ba903d81dfa7b2a0eccbc34a7000f274b3ec443a32926c5d2c6029bd969d1e6c28cd5455
+  data.tar.gz: 5b51e1e1b60bdca91f7faa8be9f7ab4eea2237e17d3bc6e37afcac77f7bd7e205118c6470af3353792d6bfb5c39a5892e714220d66b5583d6c82ebf5b79bb9fb

data/lib/raygun/apm/rails.rb

@@ -7,10 +7,8 @@ module Raygun
 
         # from https://api.rubyonrails.org/ , to automate
         BLACKLIST = %w{
-          #<Class:
-          #<Module:
-          #<ActiveRecord:
-          #<ActiveModel:
+          #<ActiveRecord
+          #<ActiveModel
           Benchmark
           BigDecimal
           Concurrent
@@ -59,10 +57,7 @@ module Raygun
           Puma
           PG
           EnabledModule
-        }
-
-        BOUNDARY = %w{
-          +RequestStore::Middleware::call
+          +Raygun::Apm::Rails::Middleware::start_of_trace
         }
     end
   end

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

@@ -33,21 +33,25 @@ module Raygun
               Thread.current.thread_variable_set(:_raygun_apm_tracer, @tracer)
               @tracer.start_trace
             end
-            res = @app.call(env)
+            res = start_of_trace{ @app.call(env) }
             # Can be nil if we had a fatal error
             @tracer.end_trace if @tracer
             res
           rescue Raygun::Apm::FatalError => e
             raygun_shutdown_handler(e)
           end
-  
+
           def raygun_shutdown_handler(exception)
-            warn "Raygun APM shutting down due to error - %s", e.message
+            warn "[Raygun APM] shutting down due to error - #{exception.message}",
             # Kill extended event subcriptions
             ActiveSupport::Notifications.unsubscribe(@http_in_subscriber)
             ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
+            warn "[Raygun APM] notification hooks unsubscribed"
             # Shutdown the tracepoint if enabled to reduce any overhead and stall emission
-            @tracer.tracepoint.stop if @tracer.tracepoint.enabled?
+            if @tracer.tracepoint.enabled?
+              @tracer.tracepoint.stop
+              warn "[Raygun APM] tracepoint stopped"
+            end
             # Let the GC clean up the sink thread through the finalizer below
             @tracer = nil
             Thread.current.thread_variable_set(:_raygun_apm_tracer, nil)
@@ -66,11 +70,12 @@ module Raygun
             event[:status] = notification.payload[:status]
             # XXX constant milliseconds to microseconds
             event[:duration] = notification.duration * 1000
-            event[:timestamp] = notification.time.to_f * 1000000
+            event[:timestamp] = @tracer.now
             event[:tid] = @tracer.get_thread_id(Thread.current)
             @tracer.emit(event)
           rescue => e
             warn "[Raygun APM] error reporting HTTP IN event"
+            raygun_shutdown_handler(e)
           end
 
           def http_in_event
@@ -105,6 +110,7 @@ module Raygun
             @tracer.emit(event)
           rescue => e
             warn "[Raygun APM] error reporting SQL event"
+            raygun_shutdown_handler(e)
           end
 
           def sql_event
@@ -115,6 +121,10 @@ module Raygun
             end
           end
 
+          def start_of_trace
+            yield
+          end
+
           def self.finalize(tracer)
             proc {tracer.process_ended}
           end

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

@@ -6,8 +6,7 @@ module Raygun
           require "raygun/apm"
           require "raygun/apm/rails/middleware"
           Raygun::Apm::Blacklist.extend_with Raygun::Apm::Rails::BLACKLIST
-          Raygun::Apm::Blacklist.extend_with Raygun::Apm::Rails::BOUNDARY
-          app.middleware.insert_before Rack::Sendfile, Raygun::Apm::Rails::Middleware
+          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"
         end

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "0.1.13"
+      VERSION = "0.1.18"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.18
 platform: ruby
 authors:
 - Erkki Eilonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm