raygun-apm-rails 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c94e26072a3cc6fa28f93a282ff4959ee65af938385bfc9e92ff9b9579b272
-  data.tar.gz: e443936f063325a320242f10b8c586b8149c7f5d7db8f36ccba1f800ff5eaed7
+  metadata.gz: b32dbda41f5ec97d4087eeb129cf4e931c8c836a028aac5aa44d3f1d7d4f8107
+  data.tar.gz: c31b24a26171d71c30fa745a74a749ab72c98275aa26f736bb4d67fe8b927f33
 SHA512:
-  metadata.gz: 6137d60a60f974f4722b274db2c14ff6455927563f870daf9586b998ab12d97f75436bf13d3ff105e2e2a14835bfb0f652825124b3b42e9ef280786b127f3bdc
-  data.tar.gz: 332eb53c2cc736afde6b0b66cb1edfa775679574538c662b8911186f3b5cdbdc5654a2cf49699263864be443f2c1ec61821234b95941748a82b676f11bb71989
+  metadata.gz: 7a7ee9fab13361fa65fc5eb18d24e39bad80497c9c46255a1bc8b105ba903d81dfa7b2a0eccbc34a7000f274b3ec443a32926c5d2c6029bd969d1e6c28cd5455
+  data.tar.gz: 5b51e1e1b60bdca91f7faa8be9f7ab4eea2237e17d3bc6e37afcac77f7bd7e205118c6470af3353792d6bfb5c39a5892e714220d66b5583d6c82ebf5b79bb9fb

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

@@ -41,17 +41,17 @@ module Raygun
             raygun_shutdown_handler(e)
           end
 
-          def start_of_trace
-            yield
-          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)
@@ -70,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
@@ -109,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
@@ -119,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/version.rb

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "0.1.17"
+      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.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Erkki Eilonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm