scout_rails 1.0.6 → 1.0.7

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 1.0.7
+
+* Sinatra 1.3+ compatibility (alias dispatch! instead of route_eval)
+* Requiring libraries that may not be present in bare-bones Sinatra apps
+
 # 1.0.6
 
 * More filtering on transaction sample backtraces

data/lib/scout_rails/instruments/sinatra_instruments.rb

@@ -1,33 +1,41 @@
 module ScoutRails::Instruments
   module SinatraInstruments
-    def route_eval_with_scout_instruments(&blockarg)
-      path = unescape(@request.path_info)
-      name = path
-      # Go through each route and look for a match
-      if routes = self.class.routes[@request.request_method]
-        routes.detect do |pattern, keys, conditions, block|
-          if blockarg.equal? block
-            name = pattern.source
-          end
+    def dispatch_with_scout_instruments!
+      scout_controller_action = "Controller/Sinatra/#{scout_sinatra_controller_name(@request)}"
+      self.class.trace(scout_controller_action, :uri => @request.path_info) do
+        dispatch_without_scout_instruments!
+      end
+    end
+    
+    # Iterates through the app's routes, returning the matched route that the request should be 
+    # grouped under for the metric name. 
+    #
+    # If not found, "unknown" is returned. This prevents a metric explosion.
+    #
+    # Nice to have: substitute the param pattern (([^/?#]+)) w/the named key (the +key+ param of the block).
+    def scout_sinatra_controller_name(request)
+      name = 'unknown'
+      verb = request.request_method if request && request.respond_to?(:request_method) 
+      Array(self.class.routes[verb]).each do |pattern, keys, conditions, block|
+        if pattern = process_route(pattern, keys, conditions) { pattern.source }
+          name = pattern
         end
       end
       name.gsub!(%r{^[/^]*(.*?)[/\$\?]*$}, '\1')
-      name = 'root' if name.empty?
-      name = @request.request_method + ' ' + name if @request && @request.respond_to?(:request_method)      
-      scout_controller_action = "Controller/Sinatra/#{name}"
-      self.class.trace(scout_controller_action, :uri => @request.path_info) do
-        route_eval_without_scout_instruments(&blockarg)    
+      if verb
+        name = [verb,name].join(' ')
       end
-    end # route_eval_with_scout_instrumentss
+      name
+    end
   end # SinatraInstruments
 end # ScoutRails::Instruments
 
-if defined?(::Sinatra) && defined?(::Sinatra::Base)
+if defined?(::Sinatra) && defined?(::Sinatra::Base) && Sinatra::Base.private_method_defined?(:dispatch!)
   ScoutRails::Agent.instance.logger.debug "Instrumenting Sinatra"
   ::Sinatra::Base.class_eval do
     include ScoutRails::Tracer
     include ::ScoutRails::Instruments::SinatraInstruments
-    alias route_eval_without_scout_instruments route_eval
-    alias route_eval route_eval_with_scout_instruments
+    alias dispatch_without_scout_instruments! dispatch!
+    alias dispatch! dispatch_with_scout_instruments!
   end
 end

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/scout_rails.rb

@@ -3,6 +3,9 @@ end
 require 'socket'
 require 'set'
 require 'net/http'
+require 'logger'
+require 'yaml'
+require 'cgi'
 require File.expand_path('../scout_rails/version.rb', __FILE__)
 require File.expand_path('../scout_rails/agent.rb', __FILE__)
 require File.expand_path('../scout_rails/agent/logging.rb', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Monitors a Ruby on Rails application and reports detailed metrics on
   performance to Scout, a hosted monitoring service.