scout_apm 1.2.0.pre7 → 1.2.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3abc250d198c2c94554f6977fdcb04e03be40bed
-  data.tar.gz: ddea53a31392514870dc61ef93fde2f8a9a2e9a2
+  metadata.gz: 9b5272cb3adff0eda6e90f8b9e25aedec12fc44a
+  data.tar.gz: a2548f87f76ab5d4d815fad9c4d4d768a247894d
 SHA512:
-  metadata.gz: c452fd04a51d42b00ad0ff8fa13f913d9943917f4e7adf1a19826c092690c34ef2cfaea2637ff6ce2850d564c6eb49609d5f4305f1b4f5f111a6d21716a52e55
-  data.tar.gz: 9f21f4c8ab460f6c41147a14f465dd6a8fdfb6700691fbb05977f9c32575769a8bd2034551b48b5aff8ca9e1f596103deeaa4b597568629dfbf59af7605ca497
+  metadata.gz: 34d61872e85d43f679c1cc50713fd73ed7d9f23ad01491d0d1202a14ece674773b5afb0357e1dc57baf72837699d9456df7fac74a9624de0ef12d51fc594a23a
+  data.tar.gz: ecc854b429e7ef8c920fc8209d7c71023426b4b85bacdd64debbcbe00cb9b460f99ae0321d0ca246fe563eb0044f98842538a74b2eb45c1b0ab024e7554e6c5a

data/lib/scout_apm/agent.rb

@@ -212,6 +212,7 @@ module ScoutApm
         when :rails3_or_4 then
           install_instrument(ScoutApm::Instruments::ActionControllerRails3)
           install_instrument(ScoutApm::Instruments::Middleware)
+          install_instrument(ScoutApm::Instruments::RailsRouter)
         when :sinatra     then install_instrument(ScoutApm::Instruments::Sinatra)
         end
       end

data/lib/scout_apm/instruments/rails_router.rb

@@ -0,0 +1,36 @@
+module ScoutApm
+  module Instruments
+    class RailsRouter
+      def initalize(logger=ScoutApm::Agent.instance.logger)
+        @logger = logger
+        @installed = false
+      end
+
+      def installed?
+        @installed
+      end
+
+      def install
+        @installed = true
+
+        if defined?(ActionDispatch) && defined?(ActionDispatch::Routing) && defined?(ActionDispatch::Routing::RouteSet)
+          ActionDispatch::Routing::RouteSet.class_eval do
+            def call_with_scout_instruments(*args)
+              req = ScoutApm::RequestManager.lookup
+              req.start_layer(ScoutApm::Layer.new("Router", "Rails"))
+
+              begin
+                call_without_scout_instruments(*args)
+              ensure
+                req.stop_layer
+              end
+            end
+
+            alias call_without_scout_instruments call
+            alias call call_with_scout_instruments
+          end
+        end
+      end
+    end
+  end
+end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.0.pre7"
+  VERSION = "1.2.0.pre8"
 end
 

data/lib/scout_apm.rb

@@ -66,6 +66,7 @@ require 'scout_apm/instruments/active_record'
 require 'scout_apm/instruments/action_controller_rails_2'
 require 'scout_apm/instruments/action_controller_rails_3'
 require 'scout_apm/instruments/middleware'
+require 'scout_apm/instruments/rails_router'
 require 'scout_apm/instruments/sinatra'
 require 'scout_apm/instruments/process/process_cpu'
 require 'scout_apm/instruments/process/process_memory'
@@ -107,7 +108,7 @@ require 'scout_apm/serializers/deploy_serializer'
 
 require 'scout_apm/middleware'
 
-if defined?(Rails) && defined?(Rails::VERSION) && defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR >= 3
+if defined?(Rails) && defined?(Rails::VERSION) && defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR >= 3 && defined?(Rails::Railtie)
   module ScoutApm
     class Railtie < Rails::Railtie
       initializer "scout_apm.start" do |app|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre7
+  version: 1.2.0.pre8
 platform: ruby
 authors:
 - Derek Haynes
@@ -98,6 +98,7 @@ files:
 - lib/scout_apm/instruments/net_http.rb
 - lib/scout_apm/instruments/process/process_cpu.rb
 - lib/scout_apm/instruments/process/process_memory.rb
+- lib/scout_apm/instruments/rails_router.rb
 - lib/scout_apm/instruments/sinatra.rb
 - lib/scout_apm/layaway.rb
 - lib/scout_apm/layaway_file.rb