scout_rails 0.0.4 → 0.0.5.debug1.pre

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 0.0.5.pre
+
+* Support for custom categories
+* Not raising an exception w/an unbalanced stack
+
 # 0.0.4
 
 * Transaction Sampling

data/lib/scout_rails/instruments/rails3/action_controller_instruments.rb

@@ -4,6 +4,7 @@ module ScoutRails::Instruments
     # Instruments the action and tracks errors.
     def process_action(*args)
       scout_controller_action = "Controller/#{controller_path}/#{action_name}"
+      ScoutRails::Agent.instance.logger.debug "Processing #{scout_controller_action}"
       self.class.trace(scout_controller_action, :uri => request.fullpath) do
         begin
           super

data/lib/scout_rails/store.rb

@@ -20,8 +20,10 @@ class ScoutRails::Store
   # Called when the last stack item completes for the current transaction to clear
   # for the next run.
   def reset_transaction!
+    Thread::current[:scout_stack_unbalanced] = nil
     Thread::current[:scout_scope_name] = nil
     @transaction_hash = Hash.new
+    @stack = Array.new
   end
   
   # Called at the start of Tracer#instrument:
@@ -38,7 +40,17 @@ class ScoutRails::Store
   def stop_recording(sanity_check_item, options={})
     item = stack.pop
     stack_empty = stack.empty?
-    raise "items not equal: #{item.inspect} / #{sanity_check_item.inspect}" if item != sanity_check_item
+    # unbalanced stack - if it's unbalanced, the item is popped but nothing happens. 
+    if Thread::current[:scout_stack_unbalanced]
+      return
+    end
+    # unbalanced stack check - unreproducable cases have seen this occur. when it does, sets a Thread variable 
+    # so we ignore further recordings. +Store#reset_transaction!+ resets this. 
+    if item != sanity_check_item
+      ScoutRails::Agent.instance.logger.warn "Scope [#{Thread::current[:scout_scope_name]}] Popped off stack: #{item.inspect} Expected: #{sanity_check_item.inspect}. Aborting."
+      Thread::current[:scout_stack_unbalanced] = true
+      return
+    end
     duration = Time.now - item.start_time
     if last=stack.last
       last.children_time += duration
@@ -56,9 +68,11 @@ class ScoutRails::Store
     transaction_hash[meta] = stat   
     
     if stack_empty
+      ScoutRails::Agent.instance.logger.debug "Stop Recording: #{meta.metric_name}"
+      
       aggs=aggregate_calls(transaction_hash.dup,meta)
       store_sample(options[:uri],transaction_hash.dup.merge(aggs),meta,stat)  
-      # ugly attempt to see if deep dup is the issue  
+      # deep duplicate  
       duplicate = aggs.dup
       duplicate.each_pair do |k,v|
         duplicate[k.dup] = v.dup
@@ -67,9 +81,21 @@ class ScoutRails::Store
     end
   end
   
+  # Returns the top-level category names used in the +metrics+ hash.
+  def categories(metrics)
+    cats = Set.new
+    metrics.keys.each do |meta|
+      next if meta.scope.nil? # ignore controller
+      if match=meta.metric_name.match(/\A([\w|\d]+)\//)
+        cats << match[1]
+      end
+    end # metrics.each
+    cats
+  end
+  
   # Takes a metric_hash of calls and generates aggregates for ActiveRecord and View calls.
   def aggregate_calls(metrics,parent_meta)
-    categories = %w(ActiveRecord View)
+    categories = categories(metrics)
     aggregates = {}
     categories.each do |cat|
       agg_meta=ScoutRails::MetricMeta.new("#{cat}/all")

data/lib/scout_rails/tracer.rb

@@ -21,12 +21,16 @@ module ScoutRails::Tracer
     def trace(metric_name, options = {}, &block)
       ScoutRails::Agent.instance.store.reset_transaction!      
       instrument(metric_name, options) do
+        ScoutRails::Agent.instance.logger.debug "Instrumenting #{metric_name}"
         Thread::current[:scout_scope_name] = metric_name
         yield
         Thread::current[:scout_scope_name] = nil
       end
     end
     
+    # Options:
+    # - :scope => If specified, sets the sub-scope for the metric. We allow additional scope level. This is used
+    # when rendering the transaction tree in the UI. 
     def instrument(metric_name, options={}, &block)
       if options.delete(:scope)
         Thread::current[:scout_sub_scope] = metric_name 
@@ -41,6 +45,7 @@ module ScoutRails::Tracer
     end
     
     def instrument_method(method,options = {})
+      ScoutRails::Agent.instance.logger.info "Instrumenting #{method}"
       metric_name = options[:metric_name] || default_metric_name(method)
       return if !instrumentable?(method) or instrumented?(method,metric_name)
       class_eval instrumented_method_string(method, {:metric_name => metric_name, :scope => options[:scope]}), __FILE__, __LINE__

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "0.0.4"
+  VERSION = "0.0.5.debug1.pre"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5.debug1.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-21 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.
@@ -61,9 +61,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