scout_rails 0.0.5 → 1.0.0

data/CHANGELOG.markdown

@@ -1,3 +1,12 @@
+# 1.0.0
+
+Release!
+
+# 0.0.6.pre
+
+* Rails 2 - Not collecting traces when an exception occurs
+* Increased Transaction Sample Storage to 2 seconds from 1 second to decrease noise in UI
+
 # 0.0.5
 
 * Support for custom categories

data/README.markdown

@@ -1,14 +1,8 @@
 # ScoutRails
 
-A Ruby gem for detailed Rails application performance analysis. Metrics are reported to [Scout](https://scoutapp.com), a hosted server and application monitoring service. For general server monitoring, see our [server monitoring agent](https://github.com/highgroove/scout-client).
+A Ruby gem for detailed Rails application performance analysis. Metrics are reported to [Scout](https://scoutapp.com), a hosted server and application monitoring service. For general server monitoring, see our [server monitoring agent](https://github.com/scoutapp/scout-client).
 
-## Invite-Only BETA
-
-Rails Monitoring is only available to existing Scout customers. [Contact us](mailto:support@scoutapp.com) if you'd like to be in our BETA group.
-
-## Screenshot
-
-![Scout Rails Monitoring](http://dl.dropbox.com/u/468982/scout_rails_screenshot_gem.gif)
+![Scout Rails Monitoring](https://img.skitch.com/20120714-frkr9i1pyjgn58uqrwqh55yfb8.jpg)
 
 ## Getting Started
 
@@ -26,6 +20,7 @@ Signup for a [Scout](https://scoutapp.com) account and copy the config file to R
 
 * Ruby 1.8.7
 * Ruby 1.9.2
+* Ruby 1.9.3
 
 ## Supported Application Servers
 
@@ -33,5 +28,6 @@ Signup for a [Scout](https://scoutapp.com) account and copy the config file to R
 * Thin
 * WEBrick
 
+## Help
 
-  
+See our [troubleshooting tips](https://scoutapp.com/info/support_app_monitoring) and/or email support@scoutapp.com if you need a hand.

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

@@ -30,6 +30,7 @@ if defined?(ActionController) && defined?(ActionController::Base)
 
     def rescue_action_with_scout(exception)
       ScoutRails::Agent.instance.store.track!("Errors/Request",1, :scope => nil)
+      ScoutRails::Agent.instance.store.ignore_transaction!
       rescue_action_without_scout exception
     end
 

data/lib/scout_rails/store.rb

@@ -20,12 +20,16 @@ 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[:ignore_transaction] = nil
     Thread::current[:scout_scope_name] = nil
     @transaction_hash = Hash.new
     @stack = Array.new
   end
   
+  def ignore_transaction!
+    Thread::current[:ignore_transaction] = true
+  end
+  
   # Called at the start of Tracer#instrument:
   # (1) Either finds an existing MetricStats object in the metric_hash or 
   # initialize a new one. An existing MetricStats object is present if this +metric_name+ has already been instrumented.
@@ -40,15 +44,15 @@ class ScoutRails::Store
   def stop_recording(sanity_check_item, options={})
     item = stack.pop
     stack_empty = stack.empty?
-    # unbalanced stack - if it's unbalanced, the item is popped but nothing happens. 
-    if Thread::current[:scout_stack_unbalanced]
+    # if ignoring the transaction, the item is popped but nothing happens. 
+    if Thread::current[:ignore_transaction]
       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
+      ignore_transaction!
       return
     end
     duration = Time.now - item.start_time
@@ -113,7 +117,7 @@ class ScoutRails::Store
   # Stores the slowest transaction. This will be sent to the server.
   def store_sample(uri,transaction_hash,parent_meta,parent_stat,options = {})    
     @transaction_sample_lock.synchronize do
-      if parent_stat.total_call_time > 1 and (@sample.nil? or (@sample and parent_stat.total_call_time > @sample.total_call_time))
+      if parent_stat.total_call_time >= 2 and (@sample.nil? or (@sample and parent_stat.total_call_time > @sample.total_call_time))
         @sample = ScoutRails::TransactionSample.new(uri,parent_meta.metric_name,parent_stat.total_call_time,transaction_hash.dup)
       end
     end

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "0.0.5"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-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.