newrelic_rpm 3.6.0.78 → 3.6.0.83

data.tar.gz.sig

@@ -1 +1 @@
-!�3��ԑ#$��q{�+�Ŏt�jC����3�(��O���H6KDHe	��b0��].}�2���`�TrIt��"��Q���}#Ŷ��Pq���w5Z&n��]N�X�)ULxH��e�L-)J��l��>f��1@ͮ18#�t@j�9��u{��38���U�`&*�uaL<�^~a�"��T{;���s$9���U� ~PD���
+:lח��*W'��Z�?��C
G����U�g����~�!��я�?茆�ƣHZ��/0|�Q1�%���=�b���k�_#=}>c�*]�	�������@=�%Tګ�t��v�,�&���ڈ��5��� ��9^���*���Z!m���/�:#�sF��S�TJ��S�+���
(3�NP~����xO�+[��|Jz����Jݘצ�6H��������{v��~�p@hm�4s1����ĤiyQ�

data/lib/new_relic/agent/agent.rb

@@ -1016,6 +1016,9 @@ module NewRelic
 
             check_for_agent_commands
           end
+        rescue EOFError => e
+          ::NewRelic::Agent.logger.warn("EOFError after #{Time.now - now}s when transmitting data to New Relic Service.")
+          ::NewRelic::Agent.logger.debug(e)
         rescue => e
           retry_count ||= 0
           retry_count += 1

data/lib/new_relic/agent/new_relic_service.rb

@@ -316,7 +316,7 @@ module NewRelic
             response = http.request(request)
           end
         rescue Timeout::Error
-          ::NewRelic::Agent.logger.warn "Timed out trying to post data to New Relic (timeout = #{@request_timeout} seconds)" unless @request_timeout < 30
+          ::NewRelic::Agent.logger.warn "Timed out trying to post data to New Relic (timeout = #{@request_timeout} seconds)"
           raise
         end
         case response

data/test/multiverse/suites/resque/Envfile

@@ -3,12 +3,15 @@ suite_condition("Resque tests not compatible with 1.8.6, JRuby") do
 end
 
 gemfile <<-RB
-  gem 'resque'
+  gem 'resque', '1.23.0'
+  gem 'json'
+  gem 'rake'
+RB
+
+gemfile <<-RB
+  gem 'resque', '~>1.24.1'
   gem 'json'
   gem 'rake'
-  if (RUBY_PLATFORM == 'java')
-    gem "jruby-openssl"
-  end
 RB
 
 before_suite do
@@ -20,5 +23,3 @@ end
 after_suite do
   system("redis-cli -p #{ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]} shutdown")
 end
-
-execute_mode 'spawn'

data/test/multiverse/suites/resque/Rakefile

@@ -1,8 +1,3 @@
 require File.join(File.dirname(__FILE__), 'resque_setup')
 require 'resque/tasks'
 
-task "resque:setup" do
-  if ENV['BROKEN_AFTER_FORK']
-    Resque.before_fork = Proc.new { 'doot de doo' }
-  end
-end

data/test/multiverse/suites/resque/instrumentation_test.rb

@@ -45,7 +45,7 @@ class ResqueTest < Test::Unit::TestCase
   end
 
   def start_worker_child(env_vars=nil)
-    worker_cmd = "#{env_vars} QUEUE=* bundle exec rake resque:work"
+    worker_cmd = "#{env_vars} QUEUE=* TERM_CHILD=1 bundle exec rake resque:work"
     @worker_pid = Process.fork
     Process.exec(worker_cmd) if @worker_pid.nil?
   end
@@ -94,7 +94,12 @@ class ResqueTest < Test::Unit::TestCase
   def wait_for_jobs
     time_for_jobs = 5
     begin
-      Timeout.timeout(time_for_jobs) { sleep(0.1) until Resque.info[:processed] == JOB_COUNT }
+      Timeout.timeout(time_for_jobs) do
+        loop do
+          break if Resque.info[:processed] == JOB_COUNT
+          sleep(0.1) 
+        end
+      end
     rescue Timeout::Error => err
       raise err.exception("waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs")
     end
@@ -132,15 +137,6 @@ class ResqueTest < Test::Unit::TestCase
     assert_metric_and_call_count('OtherTransaction/ResqueJob/all', JOB_COUNT)
   end
 
-  def test_log_properly_when_fork_callbacks_are_broken
-    log_path = File.join(File.dirname(__FILE__), 'agent.log', 'newrelic_agent.log')
-    File.delete(log_path)
-
-    run_worker(:env_vars => 'BROKEN_AFTER_FORK=true')
-
-    assert File.read(log_path).include?('No communication channel to parent process')
-  end
-
   if RUBY_VERSION >= '1.9'
     def test_all_jobs_ran_background
       run_worker(:background => true)

data/test/new_relic/agent/agent_test.rb

@@ -69,6 +69,14 @@ module NewRelic
         @agent.instance_eval { transmit_data }
       end
 
+      def test_transmit_data_should_handle_eoferror
+        @agent.service.stubs(:metric_data).raises(EOFError)
+        expects_no_logging(:error)
+        expects_logging(:warn, regexp_matches(/EOFError/))
+        expects_logging(:debug, is_a(EOFError))
+        @agent.instance_eval { transmit_data }
+      end
+
       def test_harvest_transaction_traces
         assert_equal([], @agent.send(:harvest_transaction_traces), 'should return transaction traces')
       end

metadata

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