raygun-apm-rails 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bded6633ee12299036cbbc4335ab2d2332375299aa2746c507801791cc0b886
-  data.tar.gz: 5e4e99d585dfe5e1b970c4857088ad2fec161f7935677e9b3545b947b7164ee6
+  metadata.gz: 5900138251a3565aed5ea97e891612937933fc6332848e67c29b3cb383d5bfd9
+  data.tar.gz: d55c239c8204734478c954f4d1eb771450bc0833a4dd6a47591ca1b1caa3820a
 SHA512:
-  metadata.gz: 18a5b450114214cfb18be5de0091e5cf93ef8c59e0f5d37103d3e641b650e6855fac6c59668170b0b6b3888aa6d51d4f5c466912e050331c0f10f7ef7c1c2610
-  data.tar.gz: 2439fa20850563b3be76f8ffab6c362250d452388cd309c8f5d6a0cd62261a56c9620a022a60bda54db405be97a5e41af6e8f2153206b2982d22a6ec068c23a4
+  metadata.gz: b8cba67519311b80693f8dc5f16564c8556ec9da2d7d3227c5a3e6680ff7882e1fd95c9b0e30df47a18821617ccb2fc06e713d9b1ce4d0cf4e93582d9c5fa015
+  data.tar.gz: 40c4f280a7f1aa7d83587eae23a37114bef346518fbbff9e62f6bb1bd68f0e57aee8ba1c956036bbd27e0cb75756639849a5cf8b3b5ac5084af846fd4a76eca3

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/lib/raygun/apm/rails.rb

@@ -70,4 +70,6 @@ module Raygun
   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,6 +50,7 @@ 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)
@@ -56,20 +60,27 @@ module Raygun
               return
             end
             req = Rack::Request.new notification.payload[:headers].env
-            @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]
+            event = http_in_event
+            event[:url] = req.url
+            event[:verb] = req.request_method
+            event[:status] = notification.payload[:status]
             # XXX constant milliseconds to microseconds
-            @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)
+            event[:duration] = notification.duration * 1000
+            event[:timestamp] = notification.time.to_f * 1000000
+            event[:tid] = @tracer.get_thread_id(Thread.current)
+            @tracer.emit(event)
           rescue => e
             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,26 +88,33 @@ module Raygun
             else
               ObjectSpace._id2ref(notification.payload[:connection_id])
             end
-            @sql_event ||= Raygun::Apm::Event::Sql.new
-            @sql_event[:query] = notification.payload[:sql]
+            event = sql_event
+            event[:query] = notification.payload[:sql]
   
             # XXX this is hacky
             if config = connection.instance_variable_get('@config')
-              @sql_event[:provider] = config[:adapter]
-              @sql_event[:host] = config[:host]
-              @sql_event[:database] = config[:database]
+              event[:provider] = config[:adapter]
+              event[:host] = config[:host]
+              event[:database] = config[:database]
             end
   
             # XXX constant milliseconds to microseconds
-            @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)
+            event[:duration] = notification.duration * 1000
+            event[:timestamp] = notification.time.to_f * 1000000
+            event[:tid] = @tracer.get_thread_id(Thread.current)
+            @tracer.emit(event)
           rescue => e
             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

@@ -8,6 +8,8 @@ module Raygun
           Raygun::Apm::Blacklist.extend_with Raygun::Apm::Rails::BLACKLIST
           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.6"
+      VERSION = "0.1.11"
     end
   end
 end

metadata

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