newrelic_rpm 3.6.0.74.beta → 3.6.0.78

data/test/new_relic/license_test.rb

@@ -81,12 +81,10 @@ class LicenseTest < Test::Unit::TestCase
       File.expand_path(__FILE__) == path ||
       # skip rpm_test_app and other stuff that ends up in tmp
       path.include?(gem_root + '/tmp/') ||
-      # skip tags file
-      path.include?(gem_root + '/tags')||
       # skip the auto-generated build.rb file
       path =~ %r{lib/new_relic/build\.rb} ||
       # skip tags file
-      path =~ %r{/tags$}
+      path =~ %r{/tags$}i
     )
   end
 

data/test/new_relic/load_test.rb

@@ -5,7 +5,11 @@
 # require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 require 'test/unit'
 require 'resolv'
-require 'mocha'
+begin
+  require 'mocha/setup'
+rescue LoadError
+  require 'mocha'
+end
 
 class LoadTest < Test::Unit::TestCase
   def test_loading_agent_when_disabled_does_not_resolv_addresses

data/test/new_relic/local_environment_test.rb

@@ -51,33 +51,6 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     Object.send(:remove_const, :PhusionPassenger)
   end
 
-  def test_snapshot
-    e = NewRelic::LocalEnvironment.new
-    s = e.snapshot
-    assert_equal 0, s.size
-    e.gather_environment_info
-    s = e.snapshot
-    assert_match /1\.8\.[67]|1\.9\.|2\.0/, s.assoc('Ruby version').last, s.inspect
-    assert_equal 'test', s.assoc('Framework').last, s.inspect
-    # Make sure the processor count is determined on linux systems
-    if File.exists? '/proc/cpuinfo'
-      assert s.assoc('Processors').last.to_i > 0
-    end
-  end
-
-  def test_gather_cpu_info_successful
-    e = NewRelic::LocalEnvironment.new
-    e.gather_cpu_info(File.expand_path(File.join(File.dirname(__FILE__),'..', 'fixtures', 'proc_cpuinfo.txt')))
-    s = e.snapshot
-    assert_equal 24, s.assoc('Processors').last.to_i
-  end
-
-  def test_gather_cpu_info_failure
-    e = NewRelic::LocalEnvironment.new
-    e.gather_cpu_info(File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper.rb')))
-    s = e.snapshot
-    assert_equal 1, s.assoc('Processors').last.to_i    
-  end
 
   def test_default_port
     e = NewRelic::LocalEnvironment.new

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -5,6 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..',
                                    'test_helper'))
 require 'rack/test'
+require 'new_relic/agent/instrumentation/rack'
 require 'new_relic/rack/browser_monitoring'
 
 ENV['RACK_ENV'] = 'test'

data/test/script/ci.sh

@@ -6,16 +6,16 @@
 #
 # It relies on 2 environment variables:
 #
-# RUBY - The rbenv ruby you want to use (e.g. 1.8.7, ree, jruby)
+# RUBY_VERSION - The rbenv ruby you want to use (e.g. 1.8.7, ree, jruby)
 #
 # BRANCH - The rpm_test_app branch you want to use (e.g. rails20, rails31)
 #
 # Example usage:
-# RUBY=ree BRANCH=rails20 test/script/ci.sh
+# RUBY_VERSION=ree BRANCH=rails20 test/script/ci.sh
 #
-# RUBY=ree BRANCH=rails20 test/script/ci.sh
+# RUBY_VERSION=ree BRANCH=rails20 test/script/ci.sh
 #
-# RUBY=jruby BRANCH=rails22 test/script/ci.sh
+# RUBY_VERSION=jruby BRANCH=rails22 test/script/ci.sh
 
 echo "Executing $0"
 echo "Running in $(pwd)"
@@ -26,10 +26,10 @@ echo "Running in $(pwd)"
 set -e
 
 # check for require environment variables
-if [ "x$RUBY" == "x" ]; then
-  echo '$RUBY is undefined'
+if [ "x$RUBY_VERSION" == "x" ]; then
+  echo '$RUBY_VERSION is undefined'
   echo 'defaulting to 1.9.3'
-  export RUBY=1.9.3-p374
+  export RUBY_VERSION=1.9.3-p374
 fi
 if [ "x$BRANCH" == "x" ]; then
   echo '$BRANCH is undefined'
@@ -42,22 +42,22 @@ if [ "x$JOB_NAME" == "x" ]; then
   echo 'defaulting to clrun'
   export PROJECT_NAME=clrun
 else
-  CLEANSED_NAME=`echo $JOB_NAME  | sed "s/label//" | sed "s/Portland//" | sed "s/BRANCH//" | sed "s/RUBY//" | sed "s/[=\/,\._]//g" | sed "s/ReleaseCandidate/RC/"`
+  CLEANSED_NAME=`echo $JOB_NAME  | sed "s/label//" | sed "s/Portland//" | sed "s/BRANCH//" | sed "s/RUBY_VERSION//" | sed "s/[=\/,\._]//g" | sed "s/ReleaseCandidate/RC/"`
   echo "setting PROJECT_NAME to $CLEANSED_NAME"
   export PROJECT_NAME="$CLEANSED_NAME"
 fi
 
 eval "$(rbenv init -)" || true
-rbenv shell $RUBY
-if [ "x$(rbenv version-name)" = "x$RUBY" ]; then
-  echo "switched to ruby $RUBY"
+rbenv shell $RUBY_VERSION
+if [ "x$(rbenv version-name)" = "x$RUBY_VERSION" ]; then
+  echo "switched to ruby $RUBY_VERSION"
 else
-  rbenv install $RUBY
-  rbenv shell $RUBY
-  if [ "x$(rbenv version-name)" = "x$RUBY" ]; then
-    echo "switched to ruby $RUBY"
+  rbenv install $RUBY_VERSION
+  rbenv shell $RUBY_VERSION
+  if [ "x$(rbenv version-name)" = "x$RUBY_VERSION" ]; then
+    echo "switched to ruby $RUBY_VERSION"
   else
-    echo "failed to install ruby $RUBY"
+    echo "failed to install ruby $RUBY_VERSION"
     exit 1
   fi
 fi
@@ -93,7 +93,7 @@ cd rpm_test_app
 git fetch || true
 git checkout -t origin/$BRANCH || git checkout $BRANCH
 if [ -x $HOME/.rbenv/plugins/rbenv-gemsets ]; then
-  echo "$RUBY-$BRANCH" > .rbenv-gemsets
+  echo "$RUBY_VERSION-$BRANCH" > .rbenv-gemsets
 fi
 
 # Re-write database.yml to this here doc
@@ -144,13 +144,14 @@ else
   perl -p -i'.bak' -e 's#gem .newrelic_rpm.*$#gem "newrelic_rpm", :path => "\.\.\/\.\.\/"#' Gemfile
 fi
 
-if [ "x$RUBY" == "x1.8.6" ]; then
+if [ "x$RUBY_VERSION" == "x1.8.6" ]; then
   # Bundler 1.1 dropped support for ruby 1.8.6
   bundle -h > /dev/null || gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
 else
   bundle -h > /dev/null || gem install bundler --no-rdoc --no-ri
 fi
 
+bundle -v
 
 export RAILS_ENV=test
 bundle --local || bundle

data/test/test_helper.rb

@@ -21,10 +21,18 @@ require 'rake'
 begin
   require 'config/environment'
 #   require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
+
+  # we need 'rails/test_help' for Rails 4
+  # we need 'test_help' for Rails 2
+  # we need neither for Rails 3
   begin
-    require 'test_help'
+    require 'rails/test_help'
   rescue LoadError
-    # ignore load problems on test help - it doesn't exist in rails 3
+    begin
+      require 'test_help'
+    rescue LoadError
+      # ignore load problems on test help - it doesn't exist in rails 3
+    end
   end
   require 'newrelic_rpm'
 rescue LoadError => e
@@ -48,7 +56,11 @@ end
 
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+begin
+  require 'mocha/setup'
+rescue LoadError
+  require 'mocha'
+end
 
 begin # 1.8.6
   require 'mocha/integration/test_unit'

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.0.74.beta
-  prerelease: 9
+  version: 3.6.0.78
+  prerelease: 
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -114,6 +114,7 @@ files:
 - lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record.rb
+- lib/new_relic/agent/instrumentation/active_record_helper.rb
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
 - lib/new_relic/agent/instrumentation/authlogic.rb
 - lib/new_relic/agent/instrumentation/browser_monitoring_timings.rb
@@ -135,6 +136,8 @@ files:
 - lib/new_relic/agent/instrumentation/rails3/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails3/errors.rb
 - lib/new_relic/agent/instrumentation/rails4/action_controller.rb
+- lib/new_relic/agent/instrumentation/rails4/action_view.rb
+- lib/new_relic/agent/instrumentation/rails4/active_record.rb
 - lib/new_relic/agent/instrumentation/rails4/errors.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/resque.rb
@@ -144,6 +147,7 @@ files:
 - lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb
 - lib/new_relic/agent/method_tracer.rb
 - lib/new_relic/agent/new_relic_service.rb
+- lib/new_relic/agent/null_logger.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
 - lib/new_relic/agent/rules_engine.rb
@@ -187,6 +191,7 @@ files:
 - lib/new_relic/control/profiling.rb
 - lib/new_relic/control/server_methods.rb
 - lib/new_relic/delayed_job_injection.rb
+- lib/new_relic/environment_report.rb
 - lib/new_relic/helper.rb
 - lib/new_relic/language_support.rb
 - lib/new_relic/latest_changes.rb
@@ -328,7 +333,10 @@ files:
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
 - test/new_relic/agent/event_listener_test.rb
+- test/new_relic/agent/instrumentation/action_view_subscriber_test.rb
+- test/new_relic/agent/instrumentation/active_record_helper_test.rb
 - test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb
+- test/new_relic/agent/instrumentation/active_record_subscriber_test.rb
 - test/new_relic/agent/instrumentation/browser_monitoring_timings_test.rb
 - test/new_relic/agent/instrumentation/controller_instrumentation_test.rb
 - test/new_relic/agent/instrumentation/instrumentation_test.rb
@@ -374,6 +382,7 @@ files:
 - test/new_relic/control_test.rb
 - test/new_relic/delayed_job_injection_test.rb
 - test/new_relic/dispatcher_test.rb
+- test/new_relic/environment_report_test.rb
 - test/new_relic/fake_collector.rb
 - test/new_relic/framework_test.rb
 - test/new_relic/helper_test.rb
@@ -505,6 +514,26 @@ post_install_message: ! '
   similar to Resque and Delayed::Job tasks.
 
 
+  * Improved thread safety
+
+
+  The primary metrics data structures in the Ruby agent are now thread safe.
+
+  This should provide better reliability for the agent under JRuby and threaded
+
+  scenarios such as Sidekiq or Puma.
+
+
+  * More robust environment report
+
+
+  The agent''s analysis of the local environment (e.g. OS, Processors, loaded
+
+  gems) will now work in a wider variety of app environments, including
+
+  Sinatra.
+
+
   * Experimental Rainbows! support
 
 
@@ -518,6 +547,16 @@ post_install_message: ! '
   Thanks to Joseph Chen for the contribution.
 
 
+  * Fix a potential file descriptor leak in Resque instrumentation
+
+
+  A file descriptor leak that occurred when DontPerform exceptions were used to
+
+  abort processing of a job has been fixed. This should allow the Resque
+
+  instrumentation work correctly with the resque-lonely_job gem.
+
+
   See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
 
   changes.