scout_rails 1.0.1 → 1.0.2.pre

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.0.2.pre
+
+* Net::HTTP instrumentation
+
 # 1.0.1
 
 * Unicorn support (requires "preload_app true" in unicorn config file)
@@ -6,7 +10,7 @@
 
 # 1.0.0
 
-Release!
+* Release!
 
 # 0.0.6.pre
 
@@ -32,8 +36,8 @@ Release!
 
 # 0.0.2
 
-Doesn't prevent app from loading if no configuration exists for the current environment.
+* Doesn't prevent app from loading if no configuration exists for the current environment.
 
 # 0.0.1
 
-Boom! Initial Release.
+* Boom! Initial Release.

data/lib/scout_rails/agent.rb

@@ -290,6 +290,7 @@ module ScoutRails
         require File.expand_path(File.join(File.dirname(__FILE__),'instruments/sinatra_instruments.rb'))
       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'))
     rescue
       logger.warn "Exception loading instruments:"
       logger.warn $!.message

data/lib/scout_rails/instruments/net_http.rb

@@ -0,0 +1,14 @@
+if defined?(::Net) && defined?(Net::HTTP)
+  ScoutRails::Agent.instance.logger.debug "Instrumenting Net::HTTP"
+  Net::HTTP.class_eval do
+    include ScoutRails::Tracer
+    
+    def request_with_scout_instruments(*args,&block)
+      self.class.instrument("HTTP/request", :desc => "#{(@address+args.first.path.split('?').first)[0..99]}") do
+        request_without_scout_instruments(*args,&block)
+      end
+    end
+    alias request_without_scout_instruments request
+    alias request request_with_scout_instruments
+  end
+end

data/lib/scout_rails/tracer.rb

@@ -27,6 +27,11 @@ module ScoutRails::Tracer
     # - :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)
+      # 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)
         Thread::current[:scout_sub_scope] = metric_name 
       end

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.0.1"
+  VERSION = "1.0.2.pre"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-22 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,7 @@ files:
 - lib/scout_rails/config.rb
 - lib/scout_rails/environment.rb
 - lib/scout_rails/instruments/active_record_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
 - lib/scout_rails/instruments/rails/action_controller_instruments.rb
@@ -61,9 +62,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