newrelic_rpm 3.6.8.164 → 3.6.8.168

data/CHANGELOG

@@ -14,6 +14,21 @@
   that platform.  With the bug fixed, the agent can gather those metrics again.
   Thanks Bram de Vries for the contribution!
 
+  * Missing Resque transaction traces (3.6.8.168)
+
+  A bug in 3.6.8.164 prevented transaction traces in Resque jobs from being
+  communicated back to New Relic. 3.6.8.168 fixes this.
+
+  * Retry on initial connect (3.6.8.168)
+
+  Failure to contact New Relic on agent start-up would not properly retry. This
+  has been fixed.
+
+  * Fix potential memory leak on failure to send to New Relic (3.6.8.168)
+
+  3.6.8.164 introduced a potential memory leak when transmission of some kinds
+  of data to New Relic servers failed. 3.6.8.168 fixes this.
+
 ## v3.6.7 ##
 
   * Resque-pool support

data/lib/new_relic/agent/agent.rb

@@ -602,13 +602,6 @@ module NewRelic
             disconnect
           end
 
-          # there is a problem with connecting to the server, so we
-          # stop trying to connect and shut down the agent
-          def handle_server_connection_problem(error)
-            ::NewRelic::Agent.logger.error "Unable to establish connection with the server.", error
-            disconnect
-          end
-
           # Handles an unknown error in the worker thread by logging
           # it and disconnecting the agent, since we are now in an
           # unknown state.
@@ -630,8 +623,6 @@ module NewRelic
             retry
           rescue NewRelic::Agent::ForceDisconnectException => e
             handle_force_disconnect(e)
-          rescue NewRelic::Agent::ServerConnectionException => e
-            handle_server_connection_problem(e)
           rescue => e
             handle_other_error(e)
           end
@@ -913,7 +904,7 @@ module NewRelic
           handle_license_error(e)
         rescue NewRelic::Agent::UnrecoverableAgentException => e
           handle_unrecoverable_agent_error(e)
-        rescue Timeout::Error => e
+        rescue Timeout::Error, NewRelic::Agent::ServerConnectionException => e
           log_error(e)
           if opts[:keep_retrying]
             note_connect_failure

data/lib/new_relic/agent/new_relic_service.rb

@@ -147,7 +147,7 @@ module NewRelic
 
       # Send fine-grained analytic data to the collector.
       def analytic_event_data(data)
-        data.collect! {|hash| [hash] }
+        data = data.map { |hash| [hash] }
         invoke_remote(:analytic_event_data, @agent_id, data)
       end
 

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: 2af3914786d2a12b3cda44aa4f5f453ea1f845f8
-module NewRelic; module VERSION; BUILD='164'; end; end
+# GITSHA: 7a5180e239c03f1d4e3692394a6032c819ccf663
+module NewRelic; module VERSION; BUILD='168'; end; end

data/lib/new_relic/transaction_sample.rb

@@ -190,6 +190,7 @@ module NewRelic
       sample.params.merge! self.params
       sample.guid = self.guid
       sample.force_persist = self.force_persist if self.force_persist
+      sample.threshold = self.threshold
       sample.xray_session_id = self.xray_session_id
 
       build_segment_for_transfer(sample, @root_segment, sample.root_segment, options)

data/test/multiverse/suites/rails/request_statistics_test.rb

@@ -62,6 +62,33 @@ class RequestStatsTest < ActionController::TestCase
     end
   end
 
+  def test_request_samples_should_be_preserved_upon_failure
+    with_config(:'analytics_events.enabled' => true) do
+      5.times { get :stats_action }
+
+      # fail once
+      $collector.stub('analytic_event_data', {}, 503)
+      assert_raises(NewRelic::Agent::ServerConnectionException) do
+        NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+      end
+
+      # recover
+      $collector.stub('analytic_event_data', {'return_value'=>nil}, 200)
+      NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+
+      post = $collector.calls_for('analytic_event_data').last
+
+      samples = post.body
+      assert_equal(5, samples.size)
+      samples.each do |sample|
+        # undo the extra layer of wrapping that the collector wants
+        sample = sample.first
+        assert_kind_of Hash, sample
+        assert_kind_of Float, sample['duration']
+        assert_kind_of Float, sample['timestamp']
+      end
+    end
+  end
 
 
   #

data/test/new_relic/agent/agent/start_worker_thread_test.rb

@@ -54,13 +54,6 @@ class NewRelic::Agent::Agent::StartWorkerThreadTest < Test::Unit::TestCase
     handle_force_disconnect(error)
   end
 
-  def test_handle_server_connection_problem
-    error = StandardError.new('a message')
-
-    self.expects(:disconnect)
-    handle_server_connection_problem(error)
-  end
-
   def test_handle_other_error
     error = StandardError.new('a message')
 

data/test/new_relic/agent/agent_test.rb

@@ -242,13 +242,15 @@ module NewRelic
 
       def test_connect_retries_on_timeout
         service = @agent.service
-        def service.connect(opts={})
-          unless @tried
-            @tried = true
-            raise Timeout::Error
-          end
-          nil
-        end
+        service.stubs(:connect).raises(Timeout::Error).then.returns(nil)
+        @agent.stubs(:connect_retry_period).returns(0)
+        @agent.send(:connect)
+        assert(@agent.connected?)
+      end
+
+      def test_connect_retries_on_server_connection_exception
+        service = @agent.service
+        service.stubs(:connect).raises(ServerConnectionException).then.returns(nil)
         @agent.stubs(:connect_retry_period).returns(0)
         @agent.send(:connect)
         assert(@agent.connected?)

data/test/new_relic/transaction_sample_test.rb

@@ -184,6 +184,12 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     assert_equal(123, s.xray_session_id)
   end
 
+  def test_threshold
+    @t.threshold = 4.2
+    s = @t.prepare_to_send
+    assert_equal(4.2, s.threshold)
+  end
+
 
   def test_count_segments
     transaction = run_sample_trace_on(NewRelic::Agent::TransactionSampler.new) do |sampler|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.8.164
+  version: 3.6.8.168
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -930,8 +930,15 @@ post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.6.8 ##\
   sessions\n  documentation at https://newrelic.com/docs/site/xray-sessions.\n\n*
   CPU metrics re-enabled for JRuby >= 1.7.0\n\n  To work around a JRuby bug, the Ruby
   agent stopped gathering CPU metrics on\n  that platform.  With the bug fixed, the
-  agent can gather those metrics again.\n  Thanks Bram de Vries for the contribution!\n\nSee
-  https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of\nchanges.\n"
+  agent can gather those metrics again.\n  Thanks Bram de Vries for the contribution!\n\n*
+  Missing Resque transaction traces (3.6.8.168)\n\n  A bug in 3.6.8.164 prevented
+  transaction traces in Resque jobs from being\n  communicated back to New Relic.
+  3.6.8.168 fixes this.\n\n* Retry on initial connect (3.6.8.168)\n\n  Failure to
+  contact New Relic on agent start-up would not properly retry. This\n  has been fixed.\n\n*
+  Fix potential memory leak on failure to send to New Relic (3.6.8.168)\n\n  3.6.8.164
+  introduced a potential memory leak when transmission of some kinds\n  of data to
+  New Relic servers failed. 3.6.8.168 fixes this.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
+  for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers
 - --inline-source