raygun-apm-rails 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd31011f4f5de4837ecfef0df69e423cc384426b2cf96cfe3082a2971876d471
-  data.tar.gz: 53071a97e84fcf57d671b770ad9e62d6b6eb782e152f82620a1f6b17a1fabefa
+  metadata.gz: fa53ae0598b0601ba844ef77ff80a042e8628b9551a590e265e82e9c2bf0cd78
+  data.tar.gz: c95e195db693817411f1805be7d85b4a271352fe88c6e73bb72dc57d69e98c93
 SHA512:
-  metadata.gz: 75cbb063baca64e0d45dd781bc8a05fbed2cd4034825076b6750ba373925ae4283e322ee6f001262f7f77b72f84a437be88db703da4e96663c51fc691ae88136
-  data.tar.gz: 5c5b77df34b33f099b306d49a914cb128475845c94e70d0bf3bba81b6525e8377666df19c10a15b95d1158b1743d4bd4e6726fe12d00790eedf2a133ec30ec70
+  metadata.gz: d89a784f58917e98401d808c035353f0ce3139946570f16ae192cb27fd83483498a0cf273db4e53ea7a4d441b5435f0b71ac34d9d18a3e22c01e5cd48b71cf74
+  data.tar.gz: 7b73837c1567d65b35d2190aff6c29044fde13d292b73eb379407bf6e94322c4cfb669d0a4d654cf6e3db07a6e1a7878f4fdff23f1e8e2db89abb854a694627c

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    raygun-apm-rails (0.1.4)
-      raygun-apm (~> 0.0.10)
+    raygun-apm-rails (0.1.0)
+      raygun-apm (~> 0.0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.13.0)
     rake (10.5.0)
-    raygun-apm (0.0.17-universal-darwin)
+    raygun-apm (0.0.8-x86-linux)
 
 PLATFORMS
   ruby

data/lib/raygun/apm/rails.rb

@@ -59,10 +59,17 @@ module Raygun
           RequestStore
           WEBrick
           Puma
+          PG
+          EnabledModule
         }
 
+        BOUNDARY = %w{
+          +RequestStore::Middleware::call
+        }
     end
   end
 end
 
-require "raygun/apm/rails/railtie" if defined?(::Rails)
+if defined?(::Rails) && !ENV['RAYGUN_SKIP_MIDDLEWARE']
+  require "raygun/apm/rails/railtie"
+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] = notification.time.to_f * 1000000
-            event[:pid] = Process.pid
             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
@@ -90,13 +101,20 @@ module Raygun
             # XXX constant milliseconds to microseconds
             event[:duration] = notification.duration * 1000
             event[:timestamp] = notification.time.to_f * 1000000
-            event[:pid] = Process.pid
             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

@@ -6,7 +6,10 @@ 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
+          # 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.4"
+      VERSION = "0.1.9"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Erkki Eilonen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm