newrelic_rpm 3.5.1.14 → 3.5.2.17

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - jruby

data/CHANGELOG

@@ -1,10 +1,11 @@
 
 # New Relic Ruby Agent Release Notes #
 
-### Next Up ###
 ## v3.5.2 ##
 
-### current version ###
+ * Simplified process of running agent test suite and documented code
+   contribution process in GUIDELINES_FOR_CONTRIBUTING.
+
 ## v3.5.1 ##
 
  * Enabling Memory Profiling on Lion and Mountain Lion

data/GUIDELINES_FOR_CONTRIBUTING.md

@@ -0,0 +1,52 @@
+# Guidelines for Contributing Code
+
+At New Relic we welcome community code contributions to the Ruby Agent, and have
+taken effort to make this process easy for both contributors and our development
+team.
+
+When contributing keep in mind that the agent runs in a wide variety of ruby
+language implementations (e.g. 1.8.6, 1.8.7, 1.9.x, jruby, etc.) as well as a
+wide variety of application environments (e.g. rails, sinatra, roll-your-own,
+etc., etc.)
+
+Because of this we need to be more defensive in our coding practices than most
+projects.  Syntax must be compatible with all supported ruby implementations
+(e.g. no 1.9 specific hash syntax) and we can't assume the presence of any
+specific libraries such as `ActiveSupport`.
+
+## Testing
+
+The agent includes a suite of unit tests which should be used to verify your
+changes don't break existing functionality.
+
+### Running Tests
+
+Running the test suite is simple.  Just invoke:
+
+    bundle
+    bundle exec rake
+
+This will run the unit tests in standalone mode, bootstrapping a basic Rails
+3.2 environment for the agent to instrument then executing the test suite.
+
+These tests are setup to run automatically in
+[travis-ci](https://travis-ci.org/newrelic/rpm) under several Ruby implementations.
+When you've pushed your changes to github you can confirm that the travis-ci
+build passes for your fork of the codebase.
+
+Additionally, our own CI jobs runs these tests under multiple versions of Rails to
+verify compatibility.
+
+### Writing Tests
+
+For most contributions it is strongly recommended to add additional tests which
+exercise your changes.
+
+This helps us efficiently incorporate your changes into our mainline codebase
+and provides a safeguard that your change won't be broken by future development.
+
+There are some rare cases where code changes do not result in changed
+functionality (e.g. a performance optimization) and new tests are not required.
+In general, including tests with your pull request dramatically increases the
+chances it will be accepted.
+

data/Gemfile

@@ -1,10 +1,16 @@
 source :rubygems
 
 group :development do
-  gem 'rake', '>= 0.9.2.2'
-  gem 'mocha'
-  gem 'shoulda'
+  # require 0.9.2.2.
+  # There's problems with the test task in rake 10
+  # https://github.com/jimweirich/rake/issues/144
+  gem 'rake', '0.9.2.2'
+  gem 'mocha', '~>0.12.0'
+  gem 'shoulda', '~>3.0.1'
   gem 'sdoc-helpers'
   gem 'rdoc', '>= 2.4.2'
-  gem 'rdiscount'
+  gem 'rails', '~>3.2.0'
+  gem 'sqlite3', :platform => 'mri'
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => 'jruby'
+  gem 'jruby-openssl', :platform => 'jruby'
 end

data/{README.rdoc → README.md}

@@ -1,30 +1,30 @@
-= New Relic Ruby Agent
+# New Relic Ruby Agent
 
 New Relic is a performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  It provides you with deep
 information about the performance of your Rails or Ruby
 application as it runs in production. The New Relic Ruby Agent is
 dual-purposed as a either a Rails plugin or a Gem, hosted on
-github[http://github.com/newrelic/rpm/tree/master].
+[github](http://github.com/newrelic/rpm/tree/master).
 
 The New Relic Ruby Agent runs in one of two modes:
 
-==== Production Mode
+#### Production Mode
 
 Low overhead instrumentation that captures detailed information on
 your application running in production and transmits them to
 newrelic.com where you can monitor them in real time.
 
-==== Developer Mode
+#### Developer Mode
 
-A Rack middleware that maps /newrelic to an application for showing
+A Rack middleware that maps `/newrelic` to an application for showing
 detailed performance metrics on a page by page basis.  Installed
 automatically in Rails applications.
 
-== Supported Environments
+## Supported Environments
 
-* Ruby 1.8.7, 1.9.1, or 1.9.2, including REE
-* JRuby 1.4 or higher
+* Ruby 1.8.6, 1.8.7, REE, 1.9.x
+* JRuby 1.6 and 1.7
 * Rails 2.0 or later for Production Mode
 * Rails 2.3 or later for Developer Mode
 * Sinatra
@@ -37,27 +37,42 @@ desired.  Report any problems to support@newrelic.com.
 You can also monitor non-web applications. Refer to the "Other
 Environments" section under "Getting Started".
 
-= Getting Started
+## Contributing Code
 
-Install the Ruby Agent as a gem.  If you are using Rails you can
-install the gem as a plug-in--details below.
+We welcome code contributions (in the form of pull requests) from our user
+community.  Before submitting a pull request please review
+[GUIDELINES_FOR_CONTRIBUTING](https://github.com/newrelic/rpm/blob/master/GUIDELINES_FOR_CONTRIBUTING.md).
 
-   gem install newrelic_rpm
+Following these helps us efficiently review and incorporate your contribution
+and avoid breaking your code with future changes to the agent.
+
+
+## Getting Started
+
+Install the Ruby Agent as a gem.
+
+    gem install newrelic_rpm
+
+Or add it to your project's Gemfile.
+
+    gem 'newrelic_rpm'
 
 To monitor your applications in production, create an account at
 http://newrelic.com/ .  There you can
 sign up for a free Lite account or one of our paid subscriptions.
 
 Once you receive the welcome e-mail with a license key and
-+newrelic.yml+ file, copy the +newrelic.yml+ file into your app config
+`newrelic.yml` file, copy the `newrelic.yml` file into your app config
 directory.
 
-All agent configuration is done in the +newrelic.yml+ file.  This file
-is by default read from the +config+ directory of the application root
+The initial configuration is done in the `newrelic.yml` file.  This file
+is by default read from the `config` directory of the application root
 and is subsequently searched for in the application root directory,
-and then in a <tt>~/.newrelic</tt> directory
+and then in a `~/.newrelic` directory.  Once you're up and running you can
+enable Server Side Config and manage your newrelic configuation from the web
+UI.
 
-=== Rails Installation
+#### Rails Installation
 
 You can install the agent as a Gem:
 
@@ -68,88 +83,87 @@ Add the following line to your Gemfile:
     gem 'newrelic_rpm'
 
 For Rails 2.x without Bundler:
-   
-edit +environment.rb+ and add to the initalizer block:
-
-    config.gem "newrelic_rpm" 
-
-=== Merb Installation
 
-To monitor a merb app install the newrelic_rpm gem and add
+edit `environment.rb` and add to the initalizer block:
 
-    dependency 'newrelic_rpm'
+    config.gem "newrelic_rpm"
 
-to your init.rb file.
-
-=== Sinatra Installation 
+#### Sinatra Installation
 
 To use the Ruby Agent with a Sinatra app, add
+
     require 'newrelic_rpm'
+
 in your Sinatra app, below the Sinatra require directive.
 
-Then make sure you set RACK_ENV to the environment corresponding to the
-configuration definitions in the newrelic.yml file; i.e., development,
+Then make sure you set `RACK_ENV` to the environment corresponding to the
+configuration definitions in the newrelic.yml file; e.g., development,
 staging, production, etc.
 
-To use Developer Mode in Sinatra, add NewRelic::Rack::DeveloperMode to 
-the middleware stack.  See the +config.ru+ sample below.
+To use Developer Mode in Sinatra, add `NewRelic::Rack::DeveloperMode` to
+the middleware stack.  See the `config.ru` sample below.
+
+#### Other Environments
 
-=== Other Environments
+You can use the Ruby Agent to monitor any Ruby application.  Add
 
-You can use the Ruby Agent to monitor any Ruby application.  Add 
     require 'newrelic_rpm'
+
 to your startup sequence and then manually start the agent using
+
     NewRelic::Agent.manual_start
 
 To instrument Rack based applications, refer to the docs in
-NewRelic::Agent::Instrumentation::Rack.
+`NewRelic::Agent::Instrumentation::Rack`.
 
-Refer to the docs in New Relic for details on how to monitor other web
-frameworks, background jobs, and daemons.
+Refer to the [New Relic's Docs](http://newrelic.com/docs) for details on how to
+monitor other web frameworks, background jobs, and daemons.
 
-Also, see if your environment is already supported by the
-rpm_contrib[http://newrelic.github.com/rpm_contrib] gem.
+The Ruby Agent provides an API that allows custom instrumentation of additional
+frameworks.  You can find a list of community created intrumentation plugins
+(e.g. [newrelic-redis](https://github.com/evanphx/newrelic-redis)) in the
+[RPM Contrib README](https://github.com/newrelic/rpm_contrib/blob/master/README.md#new-relic-ruby-agent-plugins-seperate-projects).
 
-== Developer Mode
+## Developer Mode
 
 When running the Developer Mode, the Ruby Agent will track the
 performance of every HTTP request serviced by your application, and
 store in memory this information for the last 100 HTTP transactions.
 
 To view this performance information, including detailed SQL statement
-analysis, open +/newrelic+ in your web application.  For instance if
+analysis, open `/newrelic` in your web application.  For instance if
 you are running mongrel or thin on port 3000, enter the following into
 your browser:
 
     http://localhost:3000/newrelic
 
-Developer Mode is only initialized if the +developer_mode+ setting in
+Developer Mode is only initialized if the `developer_mode` setting in
 the newrelic.yml file is set to true.  By default, it is turned off in
-all environments but +development+.
+all environments but `development`.
 
-==== Developer Mode in Rails
+#### Developer Mode in Rails
 
 Developer Mode is available automatically in Rails Applications based
 on Rails 2.3 and later.  No additional configuration is required. When
-your application starts and +developer_mode+ is enabled, the Ruby
+your application starts and `developer_mode` is enabled, the Ruby
 Agent injects a middleware into your Rails middleware stack.
 
 For earlier versions of Rails that support Rack, you can use
-a +config.ru+ as below.
+a `config.ru` as below.
 
-==== Developer Mode in Rack Applications
+#### Developer Mode in Rack Applications
 
 Developer Mode is available for any Rack based application such as
 Sinatra by installing the NewRelic::Rack::DeveloperMode
 middleware. This middleware passes all requests that do not start with
 /newrelic.
 
-Here's an example entry for Developer Mode in a +config.ru+ file:
+Here's an example entry for Developer Mode in a `config.ru` file:
 
     require 'new_relic/rack/developer_mode'
     use NewRelic::Rack::DeveloperMode
 
-== Production Mode
+## Production Mode
 
 When your application runs in the production environment, the New
 Relic agent runs in production mode. It connects to the New Relic
@@ -157,13 +171,13 @@ service and sends deep performance data to the UI for your
 analysis. To view this data, log in to http://rpm.newrelic.com.
 
 NOTE: You must have a valid account and license key to view this data
-online.  Refer to instructions in *Getting Started*, below.
+online.  Refer to instructions in *Getting Started*.
 
 
-= Support
+## Support
 
 Reach out to us--and to fellow users--at
-support.newrelic.com[http://support.newrelic.com/].
+[support.newrelic.com](http://support.newrelic.com/).
 There you'll find documentation, FAQs, and forums where you can submit
 suggestions and discuss New Relic with staff and other users.
 
@@ -171,9 +185,11 @@ Also available is community support on IRC: we generally use #newrelic
 on irc.freenode.net
 
 Find a bug?  E-mail support@newrelic.com, or post it to
-support.newrelic.com[http://support.newrelic.com/].
 
-Thank you, and may your application scale to infinity plus one.  
+[support.newrelic.com](http://support.newrelic.com/).
+
+Thank you, and may your application scale to infinity plus one.
+
+Lew Cirne, Founder and CEO
 
-Lew Cirne, Founder and CEO<br/>
 New Relic, Inc.

data/Rakefile

@@ -1,12 +1,7 @@
 require 'rubygems'
 require "#{File.dirname(__FILE__)}/lib/new_relic/version.rb"
-require 'rake/testtask'
-
 require "#{File.dirname(__FILE__)}/lib/tasks/all.rb"
 
-task :test => Rake::Task['test:newrelic']
-
-task :default => :test
 
 desc 'Generate gemspec [ build_number, stage ]'
 task :gemspec, [ :build_number, :stage ] do |t, args|

data/config/database.yml

@@ -0,0 +1,5 @@
+# This config is used when setting up a basic rails environment for running the
+# unit tests.
+test:
+  database: ':memory:'
+  adapter: 'sqlite3'

data/lib/new_relic/agent/agent.rb

@@ -364,8 +364,19 @@ module NewRelic
           # doing an at_exit within an at_exit block.
           def install_exit_handler
             if Agent.config[:send_data_on_exit] && !weird_ruby?
-              # Our shutdown handler needs to run after other shutdown handlers
-              at_exit { at_exit { shutdown } }
+              at_exit do
+                # Workaround for MRI 1.9 bug that loses exit codes in at_exit blocks.
+                # This is necessary to get correct exit codes for the agent's
+                # test suites.
+                # http://bugs.ruby-lang.org/issues/5218
+                if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby" && RUBY_VERSION.match(/^1\.9/)
+                  exit_status = $!.status if $!.is_a?(SystemExit)
+                  shutdown
+                  exit exit_status if exit_status
+                else
+                  shutdown
+                end
+              end
             end
           end
 

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
     BUILD = nil
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/tasks/tests.rake

@@ -1,24 +1,25 @@
-# run unit tests for the NewRelic Agent
 begin
-  require 'rake/test_task'
+  require 'rake/testtask'
 rescue LoadError => e
 end
 
 if defined? Rake::TestTask
+  task :test => 'test:newrelic'
+  task :default => :test
   namespace :test do
-    AGENT_HOME = File.expand_path(File.join(File.dirname(__FILE__), "..",".."))
+    AGENT_HOME = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
     Rake::TestTask.new(:newrelic) do |t|
       t.libs << "#{AGENT_HOME}/test"
       t.libs << "#{AGENT_HOME}/lib"
-      t.test_files = FileList["#{AGENT_HOME}/test/**/*_test.rb"]
+      t.pattern = "#{AGENT_HOME}/test/**/*_test.rb"
       t.verbose = true
+    end
 
-      # Set the test loader to use the Ruby provided test loading script.
-      # In ruby 1.9 the default Rake provided runner seems to exit with a 0
-      # status code, even when tests fail.
-      t.loader = :testrb if RUBY_VERSION >= '1.9'
+    Rake::TestTask.new(:intentional_fail) do |t|
+      t.libs << "#{AGENT_HOME}/test"
+      t.libs << "#{AGENT_HOME}/lib"
+      t.pattern = "#{AGENT_HOME}/test/intentional_fail.rb"
+      t.verbose = true
     end
-    Rake::Task['test:newrelic'].comment = "Run the unit tests for the Agent"
-    task 'test:newrelic' => :environment
   end
 end

data/newrelic_rpm.gemspec.erb

@@ -19,7 +19,8 @@ EOS
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
-    "README.rdoc",
+    "README.md",
+    "GUIDELINES_FOR_CONTRIBUTING.md",
     "newrelic.yml"
   ]
   s.files = [<% files.each do |file| %>

data/test/intentional_fail.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+class IntentionalFail < Test::Unit::TestCase
+
+  # This test suite is provided to facilitate testing that build scripts (e.g.
+  # rake test) return the correct exit codes when tests fail.
+  def test_fail
+    assert false
+  end
+
+end

data/test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb

@@ -4,6 +4,16 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
   require 'active_record_fixtures'
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
+  # the db adapter library the tests are running under (e.g. sqlite3)
+  def adapter
+    if ActiveRecord::Base.respond_to?(:connection_config)
+      ActiveRecord::Base.connection_config[:adapter]
+    else
+      # old versions of rails are usually tested against mysql
+      'mysql'
+    end
+  end
+
   def setup
     super
     NewRelic::Agent.manual_start
@@ -87,7 +97,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       ActiveRecord/find
       ActiveRecord/ActiveRecordFixtures::Order/find
       Database/SQL/insert
-      RemoteService/sql/mysql/localhost
+      RemoteService/sql/#{adapter}/localhost
     ]
 
     if NewRelic::Control.instance.rails_version < '2.1.0'
@@ -149,7 +159,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       ActiveRecord/ActiveRecordFixtures::Order/find
       ActiveRecord/ActiveRecordFixtures::Order/create
       Database/SQL/other
-      RemoteService/sql/mysql/localhost]
+      RemoteService/sql/#{adapter}/localhost]
 
     if NewRelic::Control.instance.rails_version < '2.1.0'
       expected += ['ActiveRecord/save',
@@ -190,7 +200,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     ActiveRecord/find
     ActiveRecord/ActiveRecordFixtures::Order/find
     ActiveRecord/ActiveRecordFixtures::Shipment/find
-    RemoteService/sql/mysql/localhost
+    RemoteService/sql/#{adapter}/localhost
     ]
 
     assert_calls_metrics(*expected_metrics) do
@@ -256,7 +266,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
 
     expected_metrics = %W[
     ActiveRecord/all
-    RemoteService/sql/mysql/localhost
+    RemoteService/sql/#{adapter}/localhost
     ActiveRecord/destroy
     ActiveRecord/ActiveRecordFixtures::Order/destroy
     Database/SQL/insert
@@ -299,7 +309,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     expected_metrics = %W[
     ActiveRecord/all
     Database/SQL/select
-    RemoteService/sql/mysql/localhost
+    RemoteService/sql/#{adapter}/localhost
     ]
 
     assert_calls_unscoped_metrics(*expected_metrics) do
@@ -317,7 +327,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     expected_metrics = %W[
     ActiveRecord/all
     Database/SQL/other
-    RemoteService/sql/mysql/localhost
+    RemoteService/sql/#{adapter}/localhost
     ]
     assert_calls_unscoped_metrics(*expected_metrics) do
       ActiveRecordFixtures::Order.connection.execute "begin"
@@ -333,7 +343,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     return if isSqlite?
     return if isPostgres?
 
-    expected_metrics = %W[ActiveRecord/all Database/SQL/show RemoteService/sql/mysql/localhost]
+    expected_metrics = %W[ActiveRecord/all Database/SQL/show RemoteService/sql/#{adapter}/localhost]
 
     assert_calls_metrics(*expected_metrics) do
       ActiveRecordFixtures::Order.connection.execute "show tables"
@@ -499,7 +509,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
       true
     end
 
-    expected_metrics = %W[ActiveRecord/all Database/SQL/select RemoteService/sql/mysql/localhost]
+    expected_metrics = %W[ActiveRecord/all Database/SQL/select RemoteService/sql/#{adapter}/localhost]
 
     assert_calls_metrics(*expected_metrics) do
       begin
@@ -513,7 +523,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
     compare_metrics expected_metrics, metrics
     check_metric_count('Database/SQL/select', 1)
     check_metric_count('ActiveRecord/all', 1)
-    check_metric_count('RemoteService/sql/mysql/localhost', 1)
+    check_metric_count("RemoteService/sql/#{adapter}/localhost", 1)
   end
 
   def test_rescue_handling
@@ -535,7 +545,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
 #     puts NewRelic::Agent::Database.config.inspect
     
     ActiveRecordFixtures::Shipment.connection.execute('SHOW TABLES');
-    assert(NewRelic::Agent.get_stats('RemoteService/sql/mysql/localhost').call_count != 0)
+    assert(NewRelic::Agent.get_stats("RemoteService/sql/#{adapter}/localhost").call_count != 0)
 
     config = ActiveRecordFixtures::Shipment.connection.instance_eval { @config }    
     config[:host] = '127.0.0.1'
@@ -545,7 +555,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < Test::
 #     puts NewRelic::Agent::Database.config.inspect
     
     ActiveRecordFixtures::Shipment.connection.execute('SHOW TABLES');
-    assert(NewRelic::Agent.get_stats('RemoteService/sql/mysql/127.0.0.1').call_count != 0)
+    assert(NewRelic::Agent.get_stats("RemoteService/sql/#{adapter}/127.0.0.1").call_count != 0)
 
     config[:host] = 'localhost'
     ActiveRecordFixtures::Shipment.establish_connection(config)

data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb

@@ -35,7 +35,7 @@ module NewRelic
             end
 
             def test_default_metric_name_code
-              assert_equal "Custom/#{name}/test_method", default_metric_name_code('test_method')
+              assert_equal "Custom/#{self.class.name}/test_method", self.class.default_metric_name_code('test_method')
             end
 
             def test_newrelic_method_exists_positive
@@ -44,13 +44,13 @@ module NewRelic
             end
 
             def test_newrelic_method_exists_negative
-              self.expects(:method_defined?).returns(false)
-              self.expects(:private_method_defined?).returns(false)
+              self.class.expects(:method_defined?).returns(false)
+              self.class.expects(:private_method_defined?).returns(false)
 
               fake_log = mock('log')
               NewRelic::Control.instance.expects(:log).returns(fake_log)
-              fake_log.expects(:warn).with("Did not trace #{name}#test_method because that method does not exist")
-              assert !newrelic_method_exists?('test_method')
+              fake_log.expects(:warn).with("Did not trace #{self.class.name}#test_method because that method does not exist")
+              assert !self.class.newrelic_method_exists?('test_method')
             end
 
             def test_set_deduct_call_time_based_on_metric_positive

data/test/new_relic/control/logging_methods_test.rb

@@ -129,6 +129,7 @@ class NewRelic::Control::LoggingMethodsTest < Test::Unit::TestCase
 
   def test_log_path_path_created
     path = File.expand_path('tmp/log_path_test')
+    FileUtils.mkdir_p(File.dirname(path))
     @base.instance_eval { @log_path = nil }
     with_config(:log_file_path => 'tmp/log_path_test') do
       assert !File.directory?(path) || FileUtils.rmdir(path)

data/test/new_relic/control_test.rb

@@ -80,10 +80,18 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     end
   end
 
-  def test_resolve_ip
+  def test_resolve_ip_for_localhost
     assert_equal nil, control.send(:convert_to_ip_address, 'localhost')
+  end
+
+  def test_resolve_ip_for_non_existent_domain
+    Resolv.stubs(:getaddress).raises(Resolv::ResolvError)
+    IPSocket.stubs(:getaddress).raises(SocketError)
     assert_equal nil, control.send(:convert_to_ip_address, 'q1239988737.us')
-    # This will fail if you don't have a valid, accessible, DNS server
+  end
+
+  def test_resolves_valid_ip
+    Resolv.stubs(:getaddress).with('collector.newrelic.com').returns('204.93.223.153')
     assert_equal '204.93.223.153', control.send(:convert_to_ip_address, 'collector.newrelic.com')
   end
 

data/test/script/ci.sh

@@ -164,4 +164,4 @@ bundle --local || bundle
 # there are failures to see if they are transient (instead of re-running it by
 # hand).  Ultimately we'll move towards a more elegant solution.
 
-bundle exec rake --trace db:create:all test:newrelic || bundle exec rake --trace test:newrelic || bundle exec rake --trace test:newrelic
+bundle exec rake --trace db:create:all test:newrelic || bundle exec rake --trace test:newrelic

data/test/test_helper.rb

@@ -3,11 +3,13 @@ ENV['RAILS_ENV'] = 'test'
 NEWRELIC_PLUGIN_DIR = File.expand_path(File.join(File.dirname(__FILE__),".."))
 $LOAD_PATH << '.'
 $LOAD_PATH << '../../..'
+$LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"lib")
 $LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"test")
 $LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"ui/helpers")
 $LOAD_PATH.uniq!
 
 require 'rubygems'
+require 'rake'
 # We can speed things up in tests that don't need to load rails.
 # You can also run the tests in a mode without rails.  Many tests
 # will be skipped.
@@ -20,29 +22,36 @@ begin
   rescue LoadError
     # ignore load problems on test help - it doesn't exist in rails 3
   end
-
-rescue LoadError
-  # To run the tests against a standalone agent build, you need to
-  # add a rails app to the load path.  It can be 2.* to 3.*.  It should
-  # referenc newrelic_rpm in the Gemfile with a :path option pointing
-  # to this work directory.
-  guess = File.expand_path("../../../rpm", __FILE__)
-  if $LOAD_PATH.include? guess
-    puts "Unable to load Rails for New Relic tests.  See note in test_helper.rb"
-    raise
-  else
-    $LOAD_PATH << guess
-    retry
+  require 'newrelic_rpm'
+rescue LoadError => e
+  puts "Running tests in standalone mode."
+  require 'bundler'
+  Bundler.require
+  require 'rails/all'
+  require 'newrelic_rpm'
+
+  # Bootstrap a basic rails environment for the agent to run in.
+  class MyApp < Rails::Application
+    config.active_support.deprecation = :log
+    config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+    config.after_initialize do
+      NewRelic::Agent.manual_start
+    end
   end
+  MyApp.initialize!
+
 end
-require 'newrelic_rpm'
 
 require 'test/unit'
 require 'shoulda'
 require 'test_contexts'
 require 'mocha'
-require 'mocha/integration/test_unit'
-require 'mocha/integration/test_unit/assertion_counter'
+
+begin # 1.8.6
+  require 'mocha/integration/test_unit'
+  require 'mocha/integration/test_unit/assertion_counter'
+rescue LoadError
+end
 
 require 'new_relic/fake_service'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.1.14
+  version: 3.5.2.17
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -35,16 +35,19 @@ extensions: []
 extra_rdoc_files:
 - CHANGELOG
 - LICENSE
-- README.rdoc
+- README.md
+- GUIDELINES_FOR_CONTRIBUTING.md
 - newrelic.yml
 files:
 - .gitignore
 - .project
+- .travis.yml
 - CHANGELOG
+- GUIDELINES_FOR_CONTRIBUTING.md
 - Gemfile
 - InstallationNotes.md
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - bin/mongrel_rpm
 - bin/newrelic
@@ -53,6 +56,7 @@ files:
 - cert/oldsite.pem
 - cert/site.pem
 - config.dot
+- config/database.yml
 - init.rb
 - install.rb
 - lib/conditional_vendored_dependency_detection.rb
@@ -171,6 +175,7 @@ files:
 - test/config/newrelic.yml
 - test/config/test_control.rb
 - test/fixtures/proc_cpuinfo.txt
+- test/intentional_fail.rb
 - test/new_relic/agent/agent/connect_test.rb
 - test/new_relic/agent/agent/start_test.rb
 - test/new_relic/agent/agent/start_worker_thread_test.rb