raygun-apm-rails 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20f7f7435a8a195b4b71ff5214d82b0d6c36c01d450be352db7d78bbf256838
-  data.tar.gz: 9ab514ebf6e2e45593f6180fb054ef052c5099d3757cdd46ee4751028e942345
+  metadata.gz: a2d31d0ad976f35bdac2a42c3ae4b0da985291ab2a36e60982de8e04e2d34e7c
+  data.tar.gz: 582ec4542445a59adc1f33e76353c667153cc5e7af889a8f34a55213ef6e4564
 SHA512:
-  metadata.gz: e659e34dab54a4255f63eba7e63743842eb6c6ef743597a4aad73ab4df5c3d7dbfa5243fd12b165cd55053d1b8ecbcf7f80dc8362d4967e0155b9b74f7985947
-  data.tar.gz: b76504129b9507ea3f415627215e0006a7a379e3232aa3730d2057595a1be96596f5793e961caf46b03a8316287a37b1a756c7bdeebcc96dddbe67b83cb1c30a
+  metadata.gz: 757a3a0f926195c155aabaea9c29ee716b6d408d1c401440db9348fde89209c4bf919284752d715674ecd5b163b3f330706156aa215d2c8d5a167741a468bd41
+  data.tar.gz: e390eee50d733103fef5b025f6f8710689bf4235e956800ecd73791355e318452799eb43d87be4e825c11e1cc6768fa2c23b781614439c3a9d7d89053d112df7

data/lib/raygun/apm/rails.rb

@@ -59,8 +59,13 @@ module Raygun
           RequestStore
           WEBrick
           Puma
+          PG
+          EnabledModule
         }
 
+        BOUNDARY = %w{
+          +RequestStore::Middleware::call
+        }
     end
   end
 end

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

@@ -29,12 +29,15 @@ module Raygun
           def instrument(env)
             res = nil
             # Can be nil if we had a fatal error
-            @tracer.start_trace if @tracer
+            if @tracer
+              Thread.current[:_raygun_apm_tracer] = @tracer
+              @tracer.start_trace
+            end
             res = @app.call(env)
             # Can be nil if we had a fatal error
             @tracer.end_trace if @tracer
             res
-          rescue Raygun::APM::FatalError => e
+          rescue Raygun::Apm::FatalError => e
             raygun_shutdown_handler(e)
           end
   
@@ -46,30 +49,37 @@ module Raygun
             # Shutdown the tracepoint if enabled to reduce any overhead and stall emission
             @tracer.tracepoint.stop if @tracer.tracepoint.enabled?
             # Let the GC clean up the sink thread through the finalizer below
-            @tracer = nil
+            @tracer = Thread.current[:_raygun_apm_tracer] = nil
           end
   
           def http_in_handler(args)
             notification = ActiveSupport::Notifications::Event.new *args
             if notification.payload[:exception]
-              # XXX notify?
+              warn "[Raygun APM] exception in HTTP IN event: #{notification.payload[:exception]}"
               return
             end
             req = Rack::Request.new notification.payload[:headers].env
-            event = Raygun::Apm::Event::HttpIn.new
+            event = http_in_event
             event[:url] = req.url
             event[:verb] = req.request_method
             event[:status] = notification.payload[:status]
             # XXX constant milliseconds to microseconds
             event[:duration] = notification.duration * 1000
-            event[:timestamp] = Time.now.to_f*1000000
-            event[:pid] = Process.pid
+            event[:timestamp] = notification.time.to_f * 1000000
             event[:tid] = @tracer.get_thread_id(Thread.current)
             @tracer.emit(event)
           rescue => e
-            # XXX report
+            warn "[Raygun APM] error reporting HTTP IN event"
           end
-  
+
+          def http_in_event
+            @http_in_event ||= begin
+              event = Raygun::Apm::Event::HttpIn.new
+              event[:pid] = Process.pid
+              event
+            end
+          end
+
           def sql_handler(args)
             notification = ActiveSupport::Notifications::Event.new *args
             connection = if notification.payload[:connection]
@@ -77,7 +87,7 @@ module Raygun
             else
               ObjectSpace._id2ref(notification.payload[:connection_id])
             end
-            event = Raygun::Apm::Event::Sql.new
+            event = sql_event
             event[:query] = notification.payload[:sql]
   
             # XXX this is hacky
@@ -89,14 +99,21 @@ module Raygun
   
             # XXX constant milliseconds to microseconds
             event[:duration] = notification.duration * 1000
-            event[:timestamp] = Time.now.to_f*1000000
-            event[:pid] = Process.pid
+            event[:timestamp] = notification.time.to_f * 1000000
             event[:tid] = @tracer.get_thread_id(Thread.current)
             @tracer.emit(event)
           rescue => e
-            # XXX report
+            warn "[Raygun APM] error reporting SQL event"
           end
-  
+
+          def sql_event
+            @sql_event ||= begin
+              event = Raygun::Apm::Event::Sql.new
+              event[:pid] = Process.pid
+              event
+            end
+          end
+
           def self.finalize(tracer)
             proc {tracer.process_ended}
           end

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

@@ -3,10 +3,14 @@ module Raygun
     module Rails
       class Railtie < ::Rails::Railtie
         initializer "raygun.apm" do |app|
+          return if ENV['RAYGUN_SKIP_MIDDLEWARE']
           require "raygun/apm"
           require "raygun/apm/rails/middleware"
           Raygun::Apm::Blacklist.extend_with Raygun::Apm::Rails::BLACKLIST
-          app.middleware.use Raygun::Apm::Rails::Middleware
+          Raygun::Apm::Blacklist.extend_with Raygun::Apm::Rails::BOUNDARY
+          app.middleware.insert_before Rack::Sendfile, Raygun::Apm::Rails::Middleware
+          # Explictly enable instrumenting HTTP until a good control API is figured out
+          require "raygun/apm/hooks/net_http"
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "0.1.2"
+      VERSION = "0.1.7"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Erkki Eilonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Raygun application performance monitoring for Rails