raygun-apm-rails 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04470e2ef8a971fbd61675b771c0c10a6b95a6edb960526cf91c7ff244741b95
-  data.tar.gz: f312f4010d321dbe54af892983e3438e086472f77855c633dcc8977dc956bbe0
+  metadata.gz: 79129467782cc432e61c5ea57a109612ad3e7e4d286e60e7a86d13d3f7b54df7
+  data.tar.gz: 714b18712b89e3b1b04c133456d7616b9e64fa075206c20407921927f8c97b29
 SHA512:
-  metadata.gz: 4c3e1d70fa2af061757f42b36a9f39547a2086e9a6c09c97cc95d5031f3aadd22bb0083591a66a0331fcb62071bfd5ac4c17d2dca0207d577f3b2363155c1208
-  data.tar.gz: cfe6f36919254d79510ec4eb1ed55e5312298b0cefc89da971a0c0ff7a6b2afe266e0a08cfe728a21f82bde76ba0e8e46180cf6065bc8fc898af39c6861bf3d0
+  metadata.gz: 9e735bf886b0b92a85a621e1456e2d0fc0dab6b4dae4186460449f82fb90cb243cac36fdae4a17731f86ff306d7bed0adcea82a097b11ce962898e8243707715
+  data.tar.gz: 0b1d21a719042151dc3ac53f627c9547c73146fe75fe03a511fbd3f9977f243a9bd0f2f3dc59e6cafa95b379102f65ba6052b376255e93a4184e252201327e88

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,7 +29,10 @@ 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.thread_variable_set(:_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
@@ -47,29 +50,37 @@ module Raygun
             @tracer.tracepoint.stop if @tracer.tracepoint.enabled?
             # Let the GC clean up the sink thread through the finalizer below
             @tracer = nil
+            Thread.current.thread_variable_set(:_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 +88,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 +100,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.3"
+      VERSION = "0.1.8"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Erkki Eilonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-28 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.1.0.pre3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Raygun application performance monitoring for Rails