newrelic_rpm 3.16.1.320 → 3.16.2.321

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec626b83799ad14fe3e3534083621d692bfbd138
-  data.tar.gz: 0593104dbbfb3f5faa967043e7025e42991ce168
+  metadata.gz: d5fbd063ff6696e5f6ca06468d904efd894895f0
+  data.tar.gz: ce04df3458e79da8fd0dcb30d5b5c5b9163013ca
 SHA512:
-  metadata.gz: 3caec728f33c30b9149c5c01e27d9c573562268f19cc69a06416af69634e622c25e11cb2a9267082615b063b8f3963cb62de03ab97b9d6ddfb6aa721b18d7d66
-  data.tar.gz: 688803e2468ece921d1c4b18dd3f81bb3d7c5ddc41d6ecf0ebb24fef10db0fcfe8ca85d8f329f71a8126769e7bd6c036a9fe2234bee373eed29852dfbf71245f
+  metadata.gz: 728c1d9a90c3dacd41feb973c580fe65ac6be12a6373601fcd016ffe80deeb42c35ef48ebeda9db851a1e6016295ee86dfce599a2c79ef3eb7b4157a107ec88c
+  data.tar.gz: 7d16bb5da40a84b1ba4def5d9b7cafc82d65c0afe66b48d9b7ef6e37c1b1742c839e2b385d3ef7985ab72172c8ebb6966263837b0a29b37899a4b787ac8b78fe

data/CHANGELOG

@@ -1,6 +1,14 @@
 # New Relic Ruby Agent Release Notes #
 
-## v3.16.1
+## v3.16.2 ##
+
+  * Fix for "Unexpected frame in traced method stack" errors
+
+  Our ActiveRecord 4.x instrumentation could have generated "Unexpected frame in
+  traced method stack" errors when used outside of an active transaction (for
+  example, in custom background job handlers). This has been fixed.
+
+## v3.16.1 ##
 
   * Internal datastore instrumentation rewrites
 

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

@@ -97,7 +97,9 @@ module NewRelic
           # See comment for start_segment as we continue to work around limitations of the
           # current tracer in this method.
           def finish
-            state.traced_method_stack.push_segment state, @segment
+            if state.current_transaction
+              state.traced_method_stack.push_segment state, @segment
+            end
             @segment.finish
           end
 

data/lib/new_relic/agent/transaction/abstract_segment.rb

@@ -46,6 +46,15 @@ module NewRelic
           raise NotImplementedError, "Subclasses must implement record_metrics"
         end
 
+        INSPECT_IGNORE = [:@transaction, :@transaction_state].freeze
+
+        def inspect
+          ivars = (instance_variables - INSPECT_IGNORE).inject([]) do |memo, var_name|
+            memo << "#{var_name}=#{instance_variable_get(var_name).inspect}"
+          end
+          sprintf('#<%s:0x%x %s>', self.class.name, object_id, ivars.join(', '))
+        end
+
         private
 
         # callback for subclasses to override

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 16
-    TINY  = 1
+    TINY  = 2
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/test/multiverse/suites/active_record/active_record_test.rb

@@ -571,6 +571,15 @@ class ActiveRecordInstrumentationTest < Minitest::Test
       })
   end
 
+  def test_segment_skips_traced_method_stack_outside_txn
+    state = NewRelic::Agent::TransactionState.tl_get
+    stack = state.traced_method_stack
+    stack.expects(:push_segment).never
+
+    Order.create(:name => 'bob')
+  end
+
+
   ## helpers
 
   def adapter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.16.1.320
+  version: 3.16.2.321
 platform: ruby
 authors:
 - Tim Krajcar
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake