newrelic_rpm 3.6.2.90.beta → 3.6.2.96

data/CHANGELOG

@@ -10,6 +10,11 @@
   recording slow SQL calls. See https://newrelic.com/docs/ruby/sequel-instrumentation
   for full details.
 
+  * Thread profiling fix
+
+  The prior release of the agent (version 3.6.1) broke thread profiling. A
+  profile would appear to run, but return no data. This has been fixed.
+
   * Fix for over-counted Net::HTTP calls
 
   Under some circumstances, calls into Net::HTTP were being counted twice in

data/lib/new_relic/agent/configuration/server_source.rb

@@ -28,20 +28,25 @@ module NewRelic
         # the user's subscription level precludes its use. The server is the
         # ultimate authority regarding subscription levels, so we expect it to
         # do the real enforcement there.
-        def apply_feature_gates(hash, existing_config)
+        def apply_feature_gates(server_config, existing_config)
           gated_features = {
             :'transaction_tracer.enabled' => 'collect_traces',
             :'slow_sql.enabled'           => 'collect_traces',
             :'error_collector.enabled'    => 'collect_errors'
           }
           gated_features.each do |feature, gate_key|
-            unless hash[gate_key].nil?
-              existing_value = existing_config[feature]
-              allowed_by_server = hash[gate_key]
-              hash[feature] = (allowed_by_server && existing_value)
+            if server_config.has_key?(gate_key)
+              allowed_by_server = server_config[gate_key]
+              requested_value = ungated_value(feature, existing_config)
+              effective_value = (allowed_by_server && requested_value)
+              server_config[feature] = effective_value
             end
           end
         end
+
+        def ungated_value(key, existing_config)
+          self.has_key?(key) ? self[key] : existing_config[key]
+        end
       end
     end
   end

data/lib/new_relic/agent/stats_engine/metric_stats.rb

@@ -74,15 +74,13 @@ module NewRelic
         end
 
         # Helper method for timing supportability metrics
-        def record_supportability_metrics_timed(metrics)
+        def record_supportability_metrics_timed(metric)
           start_time = Time.now
           yield
           end_time = Time.now
           duration = (end_time - start_time).to_f
         ensure
-          record_metrics(metrics) do |stat|
-            stat.record_data_point(duration)
-          end
+          ::NewRelic::Agent.record_metric(metric, duration)
         end
 
         # Helper for recording a straight value into the count

data/lib/new_relic/agent/thread.rb

@@ -15,8 +15,9 @@ module NewRelic
       def self.bucket_thread(thread, profile_agent_code)
         if thread.key?(:newrelic_label)
           return profile_agent_code ? :agent : :ignore
-        elsif !thread[:newrelic_transaction].nil?
-          thread[:newrelic_transaction].request.nil? ? :background : :request
+        elsif thread[:newrelic_transaction].respond_to?(:last) &&
+            thread[:newrelic_transaction].last
+          thread[:newrelic_transaction].last.request.nil? ? :background : :request
         else
           :other
         end

data/test/multiverse/suites/agent_only/thread_profiling_test.rb

@@ -21,10 +21,14 @@ class ThreadProfilingTest < Test::Unit::TestCase
 
     @agent = NewRelic::Agent.instance
     @thread_profiler = @agent.thread_profiler
+    @threads = []
   end
 
   def teardown
     $collector.reset
+
+    @threads.each { |t| t.kill }
+    @threads = nil
   end
 
   START_COMMAND = [[666,{
@@ -35,7 +39,7 @@ class ThreadProfilingTest < Test::Unit::TestCase
         "duration" => 0.5,
         "only_runnable_threads" => false,
         "only_request_threads" => false,
-        "profile_agent_code" => false
+        "profile_agent_code" => true
       }
     }]]
 
@@ -57,13 +61,20 @@ class ThreadProfilingTest < Test::Unit::TestCase
   def test_thread_profiling
     @agent.send(:check_for_agent_commands)
 
+    run_thread { NewRelic::Agent::Transaction.start(:controller, :request => stub) }
+    run_thread { NewRelic::Agent::Transaction.start(:task) }
+
     let_it_finish
 
     profile_data = $collector.calls_for('profile_data')[0]
     assert_equal('666', profile_data.run_id)
 
-    poll_count = profile_data[1][0][3]
-    assert poll_count > 25, "Expected poll_count > 25, but was #{poll_count}"
+    assert profile_data.poll_count > 25, "Expected poll_count > 25, but was #{profile_data.poll_count}"
+
+    assert_saw_traces(profile_data, "OTHER")
+    assert_saw_traces(profile_data, "AGENT")
+    assert_saw_traces(profile_data, "REQUEST")
+    assert_saw_traces(profile_data, "BACKGROUND")
   end
 
   def test_thread_profiling_can_stop
@@ -77,10 +88,16 @@ class ThreadProfilingTest < Test::Unit::TestCase
     profile_data = $collector.calls_for('profile_data')[0]
     assert_equal('666', profile_data.run_id)
 
-    poll_count = profile_data[1][0][3]
-    assert poll_count < 10, "Expected poll_count < 10, but was #{poll_count}"
+    assert profile_data.poll_count < 10, "Expected poll_count < 10, but was #{profile_data.poll_count}"
   end
 
+  # Runs a thread we expect to span entire test and be killed at the end
+  def run_thread
+    Thread.new do
+      yield
+      sleep(10)
+    end
+  end
 
   def let_it_finish
     Timeout.timeout(5) do
@@ -91,6 +108,11 @@ class ThreadProfilingTest < Test::Unit::TestCase
 
     NewRelic::Agent.shutdown
   end
+
+  def assert_saw_traces(profile_data, type)
+    assert !profile_data.traces[type].empty?, "Missing #{type} traces"
+  end
+
 end
 end
 

data/test/new_relic/agent/configuration/server_source_test.rb

@@ -98,5 +98,40 @@ module NewRelic::Agent::Configuration
       assert !@source[:'slow_sql.enabled']
       assert !@source[:'transaction_tracer.enabled']
     end
+
+    def test_should_enable_gated_features_when_server_says_yes_and_existing_says_no
+      rsp = {
+        'collect_errors' => true,
+        'collect_traces' => true,
+        'agent_config' => {
+          'transaction_tracer.enabled' => true,
+          'slow_sql.enabled'           => true,
+          'error_collector.enabled'    => true
+        }
+      }
+      existing_config = {
+        :'error_collector.enabled'    => false,
+        :'slow_sql.enabled'           => false,
+        :'transaction_tracer.enabled' => false
+      }
+      @source = ServerSource.new(rsp, existing_config)
+      assert @source[:'error_collector.enabled']
+      assert @source[:'slow_sql.enabled']
+      assert @source[:'transaction_tracer.enabled']
+    end
+
+    def test_should_not_gate_when_gating_keys_absent
+      rsp = {
+        'agent_config' => {
+          'transaction_tracer.enabled' => true,
+          'slow_sql.enabled'           => true,
+          'error_collector.enabled'    => true
+        }
+      }
+      @source = ServerSource.new(rsp, {})
+      assert @source[:'error_collector.enabled']
+      assert @source[:'slow_sql.enabled']
+      assert @source[:'transaction_tracer.enabled']
+    end
   end
 end

data/test/new_relic/agent/thread_test.rb

@@ -26,7 +26,7 @@ class ThreadTest < Test::Unit::TestCase
     t = ::Thread.new {}
     txn = NewRelic::Agent::Transaction.new
     txn.request = "has a request"
-    t[:newrelic_transaction] = txn
+    t[:newrelic_transaction] = [txn]
 
     assert_equal :request, NewRelic::Agent::AgentThread.bucket_thread(t, DONT_CARE)
   end
@@ -34,14 +34,14 @@ class ThreadTest < Test::Unit::TestCase
   def test_bucket_thread_as_background
     t = ::Thread.new {}
     txn = NewRelic::Agent::Transaction.new
-    t[:newrelic_transaction] = txn
+    t[:newrelic_transaction] = [txn]
 
     assert_equal :background, NewRelic::Agent::AgentThread.bucket_thread(t, DONT_CARE)
   end
 
   def test_bucket_thread_as_other_if_nil_txn
     t = ::Thread.new {}
-    t[:newrelic_transaction] = nil
+    t[:newrelic_transaction] = []
 
     assert_equal :other, NewRelic::Agent::AgentThread.bucket_thread(t, DONT_CARE)
   end

data/test/new_relic/fake_collector.rb

@@ -218,9 +218,12 @@ module NewRelic
     end
 
     class ProfileDataPost < AgentPost
+      attr_accessor :poll_count, :traces
       def initialize(opts={})
         super
+        @poll_count = @body[1][0][3]
         @body[1][0][4] = unblob(@body[1][0][4]) if @format == :json
+        @traces = @body[1][0][4]
       end
     end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.2.90.beta
-  prerelease: 9
+  version: 3.6.2.96
+  prerelease: 
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -516,13 +516,15 @@ post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.6.2 #
   Sequel support\n\n  The Ruby agent now supports Sequel, a database toolkit for Ruby.
   This\n  includes capturing SQL calls and model operations in transaction traces,
   and\n  recording slow SQL calls. See https://newrelic.com/docs/ruby/sequel-instrumentation\n
-  \ for full details.\n\n* Fix for over-counted Net::HTTP calls\n\n  Under some circumstances,
-  calls into Net::HTTP were being counted twice in\n  metrics and transaction traces.
-  This has been fixed.\n\n* Missing traced errors for Resque applications\n\n  Traced
-  errors weren't displaying for some Resque workers, although the errors\n  were factored
-  into the overall count graphs. This has been fixed, and traced\n  errors should
-  be available again after upgrading the agent.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
-  for a full list of\nchanges.\n"
+  \ for full details.\n\n* Thread profiling fix\n\n  The prior release of the agent
+  (version 3.6.1) broke thread profiling. A\n  profile would appear to run, but return
+  no data. This has been fixed.\n\n* Fix for over-counted Net::HTTP calls\n\n  Under
+  some circumstances, calls into Net::HTTP were being counted twice in\n  metrics
+  and transaction traces. This has been fixed.\n\n* Missing traced errors for Resque
+  applications\n\n  Traced errors weren't displaying for some Resque workers, although
+  the errors\n  were factored into the overall count graphs. This has been fixed,
+  and traced\n  errors should be available again after upgrading the agent.\n\nSee
+  https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers
 - --inline-source