scout_rails 1.0.4 → 1.0.5.pre

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 1.0.5.pre
+
+* Removing duplicate Enviornment#unicorn? method 
+* Removing logging when not instrumenting unscoped method (confusing - looks like an error)
+* Recording ActiveRecord exists queries as MODEL#exists vs. SQL#UNKNOWN
+
 # 1.0.4
 
 * Added Mongo + Moped instrumentation. Mongo is used for Mongoid < 3.

data/lib/scout_rails/environment.rb

@@ -70,14 +70,6 @@ module ScoutRails
       end
     end
     
-    def unicorn?
-      if defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
-        # Ensure Unicorn is actually initialized. It could just be required and not running.
-        ObjectSpace.each_object(::Unicorn::HttpServer) { |x| return true }
-        false
-      end
-    end
-    
     # Called via +#forking?+ since Passenger forks. Adds an event listener to start the worker thread
     # inside the passenger worker process.
     # Background: http://www.modrails.com/documentation/Users%20guide%20Nginx.html#spawning%5Fmethods%5Fexplained
@@ -91,7 +83,7 @@ module ScoutRails
     
     def unicorn?
       if defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
-        # ensure Unicorn is actually initialized. 
+        # Ensure Unicorn is actually initialized. It could just be required and not running.
         ObjectSpace.each_object(::Unicorn::HttpServer) { |x| return true }
       end
     end

data/lib/scout_rails/instruments/active_record_instruments.rb

@@ -21,13 +21,15 @@ module ScoutRails::Instruments
     end
     
     def scout_ar_metric_name(sql,name)
+      # sql: SELECT "places".* FROM "places"  ORDER BY "places"."position" ASC
+      # name: Place Load
       if name && (parts = name.split " ") && parts.size == 2
         model = parts.first
         operation = parts.last.downcase
         metric_name = case operation
                       when 'load' then 'find'
                       when 'indexes', 'columns' then nil # not under developer control
-                      when 'destroy', 'find', 'save', 'create' then operation
+                      when 'destroy', 'find', 'save', 'create', 'exists' then operation
                       when 'update' then 'save'
                       else
                         if model == 'Join'

data/lib/scout_rails/tracer.rb

@@ -29,7 +29,6 @@ module ScoutRails::Tracer
     def instrument(metric_name, options={}, &block)
       # don't instrument if (1) NOT inside a transaction and (2) NOT a Controller metric.
       if !Thread::current[:scout_scope_name] and metric_name !~ /\AController\//
-        ScoutRails::Agent.instance.logger.debug "Not instrumenting [#{metric_name}] - no scope."
         return yield
       end
       if options.delete(:scope)

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.0.4"
+  VERSION = "1.0.5.pre"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.0.5.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-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.
@@ -64,9 +64,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