raygun-apm-rails 0.1.15 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e83c0d7b1594e131f9cea114fbb80ffa98e1057232cc3c50ffcacad7d47cf4b
-  data.tar.gz: 3d2a8030c87933798bc3525cdf6fb4274611208d06b47007d6d7e04e406d5841
+  metadata.gz: 2b75a889dba518fef1ad8ffef121b278e62445caf67ed2dafd6477f3a6ba95e2
+  data.tar.gz: 23d6c1e974f9700b502e2083f1cc0dcaca584b2de7b4927ecad5ea31385d8efd
 SHA512:
-  metadata.gz: 3cc3503b747983b891ed2490fe1b3e20f75465c0dd940d12a4d2d26f73f323c330333116216579fa57b2da15f200993e114f578c79f92258f3f8e1b5a481c516
-  data.tar.gz: b05c8af3ccdc740d759d96d7b238c4125920d011571e2c273d31779a8b42402c28d84a244eec153a51cb05f8d92dae9527be6994d9eb78083636d88fc34c8f73
+  metadata.gz: aa987252a5b280b13f64a3b8a386d1faa444a04e9e3a351c7dd85af3efced122b0d8de4d70d1f3fef57479228ff2c6b2ae1e0473415e263c0a41eda5fd1ab1f6
+  data.tar.gz: 15704c84f498cbe2e4a54569990a39a38329a107c5b84b3ab9dbb65541c4a52bcd4ab359986965bbc23926cc40f720604ef3a25ee4c9788846e897b832042437

data/lib/raygun/apm/rails.rb

@@ -57,6 +57,8 @@ module Raygun
           Puma
           PG
           EnabledModule
+          ConnectionPool
+          +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,7 +6,7 @@ module Raygun
           require "raygun/apm"
           require "raygun/apm/rails/middleware"
           Raygun::Apm::Blacklist.extend_with Raygun::Apm::Rails::BLACKLIST
-          app.middleware.insert 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.15"
+      VERSION = "1.0.1"
     end
   end
 end

data/raygun-apm-rails.gemspec

@@ -23,7 +23,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", "~> 0.0.10"
+  spec.add_dependency "raygun-apm", "~> 1.0.0"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 1.0.1
 platform: ruby
 authors:
 - Erkki Eilonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement