scout_rails 0.0.2 → 0.0.3.pre

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 0.0.3.pre
+
+* Removed dynamic ActiveRecord caller instrumentation
+* Fixed issue that prevents the app from loading if ActiveRecord isn't used.
+
 # 0.0.2
 
 Doesn't prevent app from loading if no configuration exists for the current environment.

data/lib/scout_rails/agent.rb

@@ -22,10 +22,6 @@ module ScoutRails
     attr_accessor :options # options passed to the agent when +#start+ is called.
     attr_accessor :metric_lookup # Hash used to lookup metric ids based on their name and scope
     
-    # Hash of class (values are Sets of method names) that should be instrumented by examining 
-    # the ActiveRecord call stack.
-    attr_accessor :dynamic_instruments
-    
     # All access to the agent is thru this class method to ensure multiple Agent instances are not initialized per-Ruby process. 
     def self.instance(options = {})
       @@instance ||= self.new(options)
@@ -40,7 +36,6 @@ module ScoutRails
       @store = ScoutRails::Store.new
       @layaway = ScoutRails::Layaway.new
       @config = ScoutRails::Config.new(options[:config_path])
-      @dynamic_instruments = Hash.new
       @metric_lookup = Hash.new
       @process_cpu=ScoutRails::Instruments::Process::ProcessCpu.new(1) # TODO: the argument is the number of processors
       @process_memory=ScoutRails::Instruments::Process::ProcessMemory.new
@@ -134,22 +129,6 @@ module ScoutRails
       60
     end
     
-    # Every time the worker thread completes, it calls this method 
-    # to add instruments to selected methods in the AR call stack.
-    def add_dynamic_instruments
-      dynamic_instruments.each do |class_name,to_instrument|
-        klass = class_name.constantize
-        klass.class_eval do 
-          if !klass.respond_to?(:instrument_method)
-            include ::ScoutRails::Tracer
-          end
-          to_instrument.each do |m|
-            self.instrument_method(m)
-          end
-        end
-      end
-    end
-    
     # Creates the worker thread. The worker thread is a loop that runs continuously. It sleeps for +Agent#period+ and when it wakes,
     # processes data, either saving it to disk or reporting to Scout.
     def start_worker_thread(connection_options = {})
@@ -166,7 +145,6 @@ module ScoutRails
               now = Time.now
             end
             process_metrics
-            add_dynamic_instruments
             while next_time <= now
               next_time += period
             end

data/lib/scout_rails/instruments/active_record_instruments.rb

@@ -20,29 +20,9 @@ module ScoutRails::Instruments
       end
     end
     
-    # Searches for the first AR model in the call stack. If found, adds it to a Hash of 
-    # classes and methods to later instrument. Used to provide a better breakdown.
-    def scout_instrument_caller(called)
-      model_call = called.find { |call| call =~ /\/app\/models\/(.+)\.rb:\d+:in `(.+)'/ }
-      if model_call and !model_call.include?("without_scout_instrument")
-       set=ScoutRails::Agent.instance.dynamic_instruments[$1.camelcase] || Set.new
-       ScoutRails::Agent.instance.dynamic_instruments[$1.camelcase] = (set << $2)
-      end
-    end
-    
-    # Only instrument the caller if dynamic_instruments isn't disabled. By default, it is enabled.
-    def scout_dynamic?
-      dynamic=ScoutRails::Agent.instance.config.settings['dynamic_instruments']
-      dynamic.nil? or dynamic
-    end
-    
     def scout_ar_metric_name(sql,name)
       if name && (parts = name.split " ") && parts.size == 2
         model = parts.first
-        # samples 10% of calls
-        if scout_dynamic? and rand*10 < 1
-          scout_instrument_caller(caller(10)[0..9]) # for performance, limits the number of call stack items to examine
-        end
         operation = parts.last.downcase
         metric_name = case operation
                       when 'load' then 'find'
@@ -74,7 +54,6 @@ def add_instruments
     ActiveRecord::Base.class_eval do
        include ::ScoutRails::Tracer
     end
-    ScoutRails::Agent.instance.logger.debug "Dynamic instrumention is #{ActiveRecord::Base.connection.scout_dynamic? ? 'enabled' : 'disabled'}"
   end
 end
 

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "0.0.2"
+  VERSION = "0.0.3.pre"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-16 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.
@@ -60,9 +60,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout_rails
 rubygems_version: 1.8.10