newrelic_rpm 3.5.8.70 → 3.5.8.72

data/lib/new_relic/agent/cross_app_tracing.rb

@@ -33,8 +33,11 @@ module NewRelic
         return yield unless NewRelic::Agent.is_execution_traced?
 
         t0, segment = start_trace( http, request )
-        response = yield
-        finish_trace( t0, segment, request, response, http ) if t0
+        begin
+          response = yield
+        ensure
+          finish_trace( t0, segment, request, response, http ) if t0
+        end
 
         return response
       end
@@ -60,24 +63,28 @@ module NewRelic
       # +response+ and the given +http+ connection.
       def finish_trace( t0, segment, request, response, http )
         t1 = Time.now
-
-        # Figure out which metrics we need to report based on the request and response
-        # The last (most-specific) one is scoped.
-        metrics = metrics_for( http, request, response )
-        scoped_metric = metrics.pop
-
-        # Report the metrics
         duration = t1.to_f - t0.to_f
-        metrics.each { |metric| get_metric(metric).trace_call(duration) }
-        get_scoped_metric( scoped_metric ).trace_call( duration )
 
-        # Add TT custom parameters
-        stats_engine.rename_scope_segment( scoped_metric )
-        extract_custom_parameters( response ) if response_is_crossapp?( response )
+        begin
+          if request && response && http
+            # Figure out which metrics we need to report based on the request and response
+            # The last (most-specific) one is scoped.
+            metrics = metrics_for( http, request, response )
+            scoped_metric = metrics.pop
 
-        # Change the name of the segment to the scoped metric and then pop it.
-        stats_engine.pop_scope( segment, duration, t1 )
+            # Report the metrics
+            metrics.each { |metric| get_metric(metric).trace_call(duration) }
+            get_scoped_metric( scoped_metric ).trace_call( duration )
 
+            # Add TT custom parameters
+            stats_engine.rename_scope_segment( scoped_metric )
+            extract_custom_parameters( response ) if response_is_crossapp?( response )
+          end
+        ensure
+          # We always need to pop the scope stack to avoid an inconsistent
+          # state, which will prevent tracing of the whole transaction.
+          stats_engine.pop_scope( segment, duration, t1 )
+        end
       rescue NewRelic::Agent::CrossAppTracing::Error => err
         NewRelic::Agent.logger.debug "while cross app tracing", err
       rescue => err

data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb

@@ -30,7 +30,6 @@ class Net::HTTPResponse
     end
   end
 end
-    
 
 class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation,
@@ -449,4 +448,14 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
     assert_equal res, CANNED_RESPONSE.instance_variable_get( :@body )
   end
 
+  def test_scope_stack_integrity_maintained_on_request_failure
+    @socket.stubs(:write).raises('fake network error')
+    with_config(:"cross_application_tracer.enabled" => true) do
+      assert_nothing_raised do
+        expected = @engine.push_scope('dummy')
+        Net::HTTP.get(URI.parse('http://www.google.com/index.html')) rescue nil
+        @engine.pop_scope(expected, 42)
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.8.70
+  version: 3.5.8.72
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,