newrelic_rpm 3.6.1.87 → 3.6.1.88

data/lib/new_relic/agent.rb

@@ -103,6 +103,9 @@ module NewRelic
 
     require 'new_relic/agent/instrumentation/controller_instrumentation'
 
+    # this is a shim that's here only for backwards compatibility
+    require 'new_relic/agent/instrumentation/metric_frame'
+
     require 'new_relic/agent/samplers/cpu_sampler'
     require 'new_relic/agent/samplers/memory_sampler'
     require 'new_relic/agent/samplers/object_sampler'

data/lib/new_relic/environment_report.rb

@@ -64,10 +64,10 @@ module NewRelic
     report_on('Ruby patchlevel'){ RUBY_PATCHLEVEL.to_s }
     report_on('JRuby version') { JRUBY_VERSION }
     report_on('Java VM version') { ENV_JAVA['java.vm.version']}
-    report_on('Processors') { SystemInfo.processor_count }
-    report_on('Arch') { SystemInfo.processor_arch }
-    report_on('OS version') { SystemInfo.os_version }
-    report_on('OS') { SystemInfo.ruby_os_identifier }
+    report_on('Processors') { ::NewRelic::Agent::SystemInfo.processor_count }
+    report_on('Arch') { ::NewRelic::Agent::SystemInfo.processor_arch }
+    report_on('OS version') { ::NewRelic::Agent::SystemInfo.os_version }
+    report_on('OS') { ::NewRelic::Agent::SystemInfo.ruby_os_identifier }
     report_on 'Database adapter' do
       ActiveRecord::Base.configurations[NewRelic::Control.instance.env]['adapter']
     end

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

@@ -101,7 +101,8 @@ class ResqueTest < Test::Unit::TestCase
         end
       end
     rescue Timeout::Error => err
-      raise err.exception("waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs")
+      completed = Resque.info[:processed]
+      raise err.exception("waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs - got only #{completed}")
     end
   end
 

data/test/multiverse/suites/sidekiq/config/newrelic.yml

@@ -11,6 +11,7 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
+  sync_startup: true
   port: <%= ENV['NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT'] %>
   transaction_tracer:
     record_sql: obfuscated

data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb

@@ -9,7 +9,7 @@ require 'test/unit'
 require 'newrelic_rpm'
 require 'fake_collector'
 
-class ResqueTest < Test::Unit::TestCase
+class SidekiqTest < Test::Unit::TestCase
   JOB_COUNT = 5
   COLLECTOR_PORT = ENV['NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT']
 
@@ -54,12 +54,16 @@ class ResqueTest < Test::Unit::TestCase
   end
 
   def wait_for_jobs
-    time_for_jobs = 5
+    time_for_jobs = 10
     begin
+      t0 = Time.now
       stats = Sidekiq::Stats.new
       Timeout.timeout(time_for_jobs) { sleep(0.1) until stats.processed == JOB_COUNT }
     rescue Timeout::Error => err
-      raise err.exception("waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs")
+      completed = stats.processed
+      msg = "waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs - only #{completed} completed"
+      msg << "\nstarted waiting at #{t0}, now = #{Time.now}"
+      raise err.exception(msg)
     end
   end
 

data/test/new_relic/environment_report_test.rb

@@ -61,6 +61,20 @@ class EnvironmentReportTest < Test::Unit::TestCase
     assert_equal RUBY_VERSION, @report['Ruby version']
   end
 
+  def test_gathers_system_info
+    NewRelic::Agent::SystemInfo.stubs({
+      :processor_count    => 8,
+      :processor_arch     => 'x86_64',
+      :os_version         => 'WiggleOS 1.1.1',
+      :ruby_os_identifier => 'wiggleos'
+    })
+    report = ::NewRelic::EnvironmentReport.new
+    assert_equal(8, report['Processors'])
+    assert_equal('x86_64', report['Arch'])
+    assert_equal('WiggleOS 1.1.1', report['OS version'])
+    assert_equal('wiggleos', report['OS'])
+  end
+
   def test_has_logic_for_keys
     [
       "Gems",

metadata

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