newrelic_rpm 2.9.6 → 2.9.8

data/CHANGELOG

@@ -1,3 +1,10 @@
+v2.9.8.
+  * Fix bug in Net instrumentation when a block is passed to request calls.
+
+v2.9.7.
+  * Fix External instrumentation so it does not capture Net
+    calls outside of web transactions.
+
 v2.9.6.
   * add instrumentation for Net::HTTP calls, to show up as "External"
   * added support for validating agents in the cloud.

data/lib/new_relic/agent/instrumentation/net.rb

@@ -1,9 +1,21 @@
-# ActiveMerchant Instrumentation.
-
 if defined? Net::HTTP
   Net::HTTP.class_eval do
-    add_method_tracer "request", 'External/#{@address}/Net::HTTP/#{args[0].method}'# + op 
-    add_method_tracer "request", 'External/#{@address}/all', :push_scope => false
-    add_method_tracer "request", 'External/allWeb', :push_scope => false
+    def request_with_newrelic_trace(*args, &block)
+      if Thread::current[:newrelic_scope_stack].nil?
+        request_without_newrelic_trace(*args, &block)
+      else
+        self.class.trace_method_execution_with_scope("External/#{@address}/Net::HTTP/#{args[0].method}",
+                                                     true,
+                                                     true) do
+          self.class.trace_method_execution_no_scope("External/#{@address}/all") do
+            self.class.trace_method_execution_no_scope("External/allWeb") do
+              request_without_newrelic_trace(*args, &block)
+            end
+          end
+        end
+      end
+    end
+    alias request_without_newrelic_trace request
+    alias request request_with_newrelic_trace
   end
 end

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 9
-    TINY  = 6
+    TINY  = 8
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
   

data/newrelic_rpm.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.9.6"
+  s.version = "2.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-18}
   s.description = %q{New Relic Ruby Performance Monitoring Agent}
   s.email = %q{bkayser@newrelic.com}
   s.executables = ["mongrel_rpm", "newrelic_cmd"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.9.6
+  version: 2.9.8
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -08:00
+date: 2009-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency