raygun-apm-rails 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f1cfc377ee4a15c8160f23bac1bdff917d2e6b685fa865cce7450d2cdb99966
-  data.tar.gz: 90f0af8896b520cc25d5fe0edc2e5561c1add0cc4dfbd8809a843557caae985b
+  metadata.gz: 5bded6633ee12299036cbbc4335ab2d2332375299aa2746c507801791cc0b886
+  data.tar.gz: 5e4e99d585dfe5e1b970c4857088ad2fec161f7935677e9b3545b947b7164ee6
 SHA512:
-  metadata.gz: a1976c28914986dceffd77e17b15b5fbcecab3d81e4c2f90b12c334ecf115ce270b72c831f6243026ec7bec133b4c97fd116e9c18cb6eeb252959b9a91d2befc
-  data.tar.gz: b69a00664ffd1d149fc228e136cddc06f5f9bfe4f8c4e9171896c4a5b5595bc21c68c8c448cea233907d9887bf60e822da27755090fdbd9801086bbf7f003b8c
+  metadata.gz: 18a5b450114214cfb18be5de0091e5cf93ef8c59e0f5d37103d3e641b650e6855fac6c59668170b0b6b3888aa6d51d4f5c466912e050331c0f10f7ef7c1c2610
+  data.tar.gz: 2439fa20850563b3be76f8ffab6c362250d452388cd309c8f5d6a0cd62261a56c9620a022a60bda54db405be97a5e41af6e8f2153206b2982d22a6ec068c23a4

data/lib/raygun/apm/rails.rb

@@ -56,8 +56,16 @@ module Raygun
           Mysql2
           Erubi
           ApplicationController
+          RequestStore
+          WEBrick
+          Puma
+          PG
+          EnabledModule
         }
 
+        BOUNDARY = %w{
+          +RequestStore::Middleware::call
+        }
     end
   end
 end

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

@@ -34,7 +34,7 @@ module Raygun
             # 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
   
@@ -52,22 +52,22 @@ module Raygun
           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[:url] = req.url
-            event[:verb] = req.request_method
-            event[:status] = notification.payload[:status]
+            @http_in_event ||= Raygun::Apm::Event::HttpIn.new
+            @http_in_event[:url] = req.url
+            @http_in_event[:verb] = req.request_method
+            @http_in_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[:tid] = @tracer.get_thread_id(Thread.current)
-            @tracer.emit(event)
+            @http_in_event[:duration] = notification.duration * 1000
+            @http_in_event[:timestamp] = notification.time.to_f * 1000000
+            @http_in_event[:pid] = Process.pid
+            @http_in_event[:tid] = @tracer.get_thread_id(Thread.current)
+            @tracer.emit(@http_in_event)
           rescue => e
-            # XXX report
+            warn "[Raygun APM] error reporting HTTP IN event"
           end
   
           def sql_handler(args)
@@ -77,24 +77,24 @@ module Raygun
             else
               ObjectSpace._id2ref(notification.payload[:connection_id])
             end
-            event = Raygun::Apm::Event::Sql.new
-            event[:query] = notification.payload[:sql]
+            @sql_event ||= Raygun::Apm::Event::Sql.new
+            @sql_event[:query] = notification.payload[:sql]
   
             # XXX this is hacky
             if config = connection.instance_variable_get('@config')
-              event[:provider] = config[:adapter]
-              event[:host] = config[:host]
-              event[:database] = config[:database]
+              @sql_event[:provider] = config[:adapter]
+              @sql_event[:host] = config[:host]
+              @sql_event[:database] = config[:database]
             end
   
             # XXX constant milliseconds to microseconds
-            event[:duration] = notification.duration * 1000
-            event[:timestamp] = Time.now.to_f*1000000
-            event[:pid] = Process.pid
-            event[:tid] = @tracer.get_thread_id(Thread.current)
-            @tracer.emit(event)
+            @sql_event[:duration] = notification.duration * 1000
+            @sql_event[:timestamp] = notification.time.to_f * 1000000
+            @sql_event[:pid] = Process.pid
+            @sql_event[:tid] = @tracer.get_thread_id(Thread.current)
+            @tracer.emit(@sql_event)
           rescue => e
-            # XXX report
+            warn "[Raygun APM] error reporting SQL event"
           end
   
           def self.finalize(tracer)

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

@@ -6,7 +6,8 @@ module Raygun
           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
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Rails
-      VERSION = "0.1.1"
+      VERSION = "0.1.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Erkki Eilonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2019-12-09 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