scout_rails 1.0.3 → 1.0.4.pre

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.0.4
+
+* Added Mongo + Moped instrumentation. Mongo is used for Mongoid < 3.
+
 # 1.0.3
 
 * MetricMeta equality - downcase

data/lib/scout_rails/agent.rb

@@ -291,6 +291,8 @@ module ScoutRails
       end
       require File.expand_path(File.join(File.dirname(__FILE__),'instruments/active_record_instruments.rb'))
       require File.expand_path(File.join(File.dirname(__FILE__),'instruments/net_http.rb'))
+      require File.expand_path(File.join(File.dirname(__FILE__),'instruments/moped_instruments.rb'))
+      require File.expand_path(File.join(File.dirname(__FILE__),'instruments/mongoid_instruments.rb'))
     rescue
       logger.warn "Exception loading instruments:"
       logger.warn $!.message

data/lib/scout_rails/instruments/mongoid_instruments.rb

@@ -0,0 +1,10 @@
+# Mongoid versions that use Moped should instrument Moped.
+if defined?(::Mongoid) and !defined?(::Moped)
+  ScoutRails::Agent.instance.logger.debug "Instrumenting Mongoid"
+  Mongoid::Collection.class_eval do
+    include ScoutRails::Tracer
+    (Mongoid::Collections::Operations::ALL - [:<<, :[]]).each do |method|
+      instrument_method method, :metric_name => "MongoDB/\#{@klass}/#{method}"
+    end
+  end
+end

data/lib/scout_rails/instruments/moped_instruments.rb

@@ -0,0 +1,24 @@
+if defined?(::Moped)
+  ScoutRails::Agent.instance.logger.debug "Instrumenting Moped"
+  Moped::Node.class_eval do
+    include ScoutRails::Tracer
+    def process_with_scout_instruments(operation, &callback)
+      if operation.respond_to?(:collection)
+        collection = operation.collection
+        self.class.instrument("MongoDB/Process/#{collection}/#{operation.class.to_s.split('::').last}", :desc => scout_sanitize_log(operation.log_inspect)) do
+          process_without_scout_instruments(operation, &callback)
+        end
+      end
+    end
+    alias_method :process_without_scout_instruments, :process
+    alias_method :process, :process_with_scout_instruments
+    
+    # replaces values w/ ?
+    def scout_sanitize_log(log)
+      return nil if log.length > 1000 # safeguard - don't sanitize large SQL statements
+      log.gsub(/(=>")((?:[^"]|"")*)"/) do 
+        $1 + '?' + '"'
+      end
+    end
+  end
+end

data/lib/scout_rails/version.rb

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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-08-30 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.
@@ -31,6 +31,8 @@ files:
 - lib/scout_rails/config.rb
 - lib/scout_rails/environment.rb
 - lib/scout_rails/instruments/active_record_instruments.rb
+- lib/scout_rails/instruments/mongoid_instruments.rb
+- lib/scout_rails/instruments/moped_instruments.rb
 - lib/scout_rails/instruments/net_http.rb
 - lib/scout_rails/instruments/process/process_cpu.rb
 - lib/scout_rails/instruments/process/process_memory.rb
@@ -62,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