newrelic_rpm 3.6.6.147 → 3.6.7.152

data/test/environments/rails32/config/boot.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/environments/rails32/config/database.yml

@@ -0,0 +1,31 @@
+# Shared properties for mysql db
+mysql: &mysql
+  adapter: mysql
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  username: root
+  host: localhost
+  database: rails_blog
+
+# Shared properties for postgres.  This won't work with our schema but
+# Does work with agent tests
+sqlite3: &sqlite3
+<% if defined?(JRuby) %>
+  adapter: jdbcsqlite3
+<% else %>
+  adapter: sqlite3
+<% end %>
+  database: db/all.sqlite3
+  pool: 5
+  timeout: 5000
+  host: localhost
+  
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  <<: *sqlite3
+
+test:
+  <<: *mysql
+
+production:
+  <<: *mysql

data/test/environments/rails32/config/environment.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path('../application', __FILE__)
+RpmTestApp::Application.initialize!

data/test/environments/rails32/db/schema.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+# File is required to exist by Rails

data/test/environments/rails40/Gemfile

@@ -0,0 +1,25 @@
+source 'http://rubygems.org'
+
+gem 'rake'
+
+gem 'rails', '~>4.0.0.rc2'
+
+gem "mocha", '~>0.13.0', :require => false
+gem 'rack'
+gem 'rack-test'
+
+platforms :jruby do
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
+platforms :mri_19, :mri_20, :rbx do
+  gem "mysql"
+  gem "sqlite3-ruby"
+  gem "sqlite3"
+end
+
+gem 'sequel', '~> 3.46.0'
+
+gem "newrelic_rpm", :path => "../../.."

data/test/environments/rails40/Rakefile

@@ -0,0 +1,9 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+require 'tasks/all'
+
+task :default => [:'test:newrelic']

data/test/environments/rails40/config/application.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module RpmTestApp
+  class Application < Rails::Application
+    config.encoding = "utf-8"
+    config.filter_parameters += [:password]
+    config.secret_key_base = '414fd9af0cc192729b2b6bffe9e7077c9ac8eed5cbb74c8c4cd628906b716770598a2b7e1f328052753a4df72e559969dc05b408de73ce040c93cac7c51a348e'
+    config.eager_load = false
+  end
+end

data/test/environments/rails40/config/boot.rb

@@ -0,0 +1,10 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/environments/rails40/config/database.yml

@@ -0,0 +1,31 @@
+# Shared properties for mysql db
+mysql: &mysql
+  adapter: mysql
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  username: root
+  host: localhost
+  database: rails_blog
+
+# Shared properties for postgres.  This won't work with our schema but
+# Does work with agent tests
+sqlite3: &sqlite3
+<% if defined?(JRuby) %>
+  adapter: jdbcsqlite3
+<% else %>
+  adapter: sqlite3
+<% end %>
+  database: db/all.sqlite3
+  pool: 5
+  timeout: 5000
+  host: localhost
+  
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  <<: *sqlite3
+
+test:
+  <<: *mysql
+
+production:
+  <<: *mysql

data/test/environments/rails40/config/environment.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path('../application', __FILE__)
+RpmTestApp::Application.initialize!

data/test/environments/rails40/db/schema.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+# File is required to exist by Rails

data/test/multiverse/lib/multiverse/suite.rb

@@ -150,23 +150,35 @@ module Multiverse
       environments.after.call if environments.after
     end
 
+    def with_clean_env
+      if defined?(Bundler)
+        # clear $BUNDLE_GEMFILE and $RUBYOPT so that the ruby subprocess can run
+        # in the context of another bundle.
+        Bundler.with_clean_env { yield }
+      else
+        yield
+      end
+    end
+
     def execute_with_pipe(env)
       Thread.new do
-        suite = File.basename(directory)
-        IO.popen("#{__FILE__} #{directory} #{env} '#{seed}' '#{names.join(",")}'") do |io|
-          OutputCollector.write(suite, env, yellow("Running #{suite.inspect} for Envfile entry #{env}\n"))
-          OutputCollector.write(suite, env, yellow("Starting tests in child PID #{io.pid}\n"))
-          until io.eof do
-            chars = io.read
-            OutputCollector.write(suite, env, chars)
+        with_clean_env do
+          suite = File.basename(directory)
+          IO.popen("#{__FILE__} #{directory} #{env} '#{seed}' '#{names.join(",")}'") do |io|
+            OutputCollector.write(suite, env, yellow("Running #{suite.inspect} for Envfile entry #{env}\n"))
+            OutputCollector.write(suite, env, yellow("Starting tests in child PID #{io.pid}\n"))
+            until io.eof do
+              chars = io.read
+              OutputCollector.write(suite, env, chars)
+            end
+            OutputCollector.suite_report(suite, env)
           end
-          OutputCollector.suite_report(suite, env)
-        end
 
-        if $? != 0
-          OutputCollector.failed(suite, env)
+          if $? != 0
+            OutputCollector.failed(suite, env)
+          end
+          Multiverse::Runner.notice_exit_status $?
         end
-        Multiverse::Runner.notice_exit_status $?
       end
     end
 

data/test/multiverse/suites/agent_only/logging_test.rb

@@ -104,18 +104,35 @@ class LoggingTest < MiniTest::Unit::TestCase
       "Agent configured not to send data in this environment.")
   end
 
-  def test_logs_mising_license_key
+  def test_logs_missing_license_key
     running_agent_writes_to_log(
       { :license_key => false },
       "No license key found in newrelic.yml config.")
   end
 
+  def test_logs_blank_license_key
+    running_agent_writes_to_log(
+      { :license_key => '' },
+      "No license key found in newrelic.yml config.")
+  end
+
   def test_logs_invalid_license_key
     running_agent_writes_to_log(
       { :license_key => 'a' * 30 },
       "Invalid license key: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
   end
 
+  def test_logs_unknown_config_setting_from_environment
+    env_var = 'NEW_RELIC_TOTORO'
+    setting = env_var.gsub(/NEW_RELIC_|NEWRELIC_/,'').downcase
+
+    running_agent_writes_to_log({}, "#{env_var} does not have a corresponding configuration setting (#{setting} does not exist).") do
+      ENV[env_var] = 'Ponyo'
+      NewRelic::Agent::Configuration::EnvironmentSource.new
+      ENV.delete(env_var)
+    end
+  end
+
   def test_logs_forking_workers
     running_agent_writes_to_log(
       { :dispatcher => :passenger },

data/test/multiverse/suites/agent_only/rum_instrumentation_test.rb

@@ -43,7 +43,7 @@ class RumAutoTest < MiniTest::Unit::TestCase
     assert(last_response.body.include?('<html><script type="text/javascript">var NREUMQ=NREUMQ||[];NREUMQ.push(["mark","firstbyte",new Date().getTime()]);</script><body>'))
   end
 
-  def test_autoinstrumentation_with_X_UA_Compatible_puts_header_at_end_of_head
+  def test_autoinstrumentation_with_X_UA_Compatible_puts_header_after_meta_tag
     @inner_app.response = '<html><head><meta http-equiv="X-UA-Compatible" content="IE=8;FF=3;OtherUA=4" /></head><body><p>Hello World</p></body></html>'
     get '/'
     assert(last_response.body.include?(
@@ -51,13 +51,6 @@ class RumAutoTest < MiniTest::Unit::TestCase
     ))
   end
 
-  # regression
-  def test_autoinstrumentation_fails_gracefully_with_X_UA_Compatible_and_no_close_head_tag_puts_header_before_body_tag
-    @inner_app.response = '<html><head><meta http-equiv="X-UA-Compatible" content="IE=8;FF=3;OtherUA=4" /><body><p>Hello World</p></body></html>'
-    get '/'
-    assert(!last_response.body.include?(%'NREUMQ'))
-  end
-
   def test_autoinstrumentation_doesnt_run_for_crazy_shit_like_this
     @inner_app.response = '<html><head <body </body>'
     get '/'

data/test/multiverse/suites/agent_only/thread_profiling_test.rb

@@ -15,7 +15,7 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
 
   setup_and_teardown_agent(:'thread_profiler.enabled' => true, :force_send => true) do |collector|
     collector.stub('connect', {"agent_run_id" => 666 })
-    collector.stub('get_agent_commands', START_COMMAND)
+    collector.stub('get_agent_commands', [])
     collector.stub('agent_command_results', [])
   end
 
@@ -37,7 +37,7 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
       "arguments" => {
         "profile_id" => -1,
         "sample_period" => 0.01,
-        "duration" => 0.5,
+        "duration" => 0.75,
         "only_runnable_threads" => false,
         "only_request_threads" => false,
         "profile_agent_code" => true
@@ -60,7 +60,7 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
   # go only let a few cycles through, so we check less than 10
 
   def test_thread_profiling
-    agent.send(:check_for_agent_commands)
+    issue_command(START_COMMAND)
 
     run_thread { NewRelic::Agent::Transaction.start(:controller, :request => stub) }
     run_thread { NewRelic::Agent::Transaction.start(:task) }
@@ -78,10 +78,8 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
   end
 
   def test_thread_profiling_can_stop
-    agent.send(:check_for_agent_commands)
-
-    $collector.mock['get_agent_commands'] = [200, {'return_value' => STOP_COMMAND}]
-    agent.send(:check_for_agent_commands)
+    issue_command(START_COMMAND)
+    issue_command(STOP_COMMAND)
 
     let_it_finish
 
@@ -90,6 +88,11 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
     assert(profile_data.poll_count < 50, "Expected poll_count < 50, but was #{profile_data.poll_count}")
   end
 
+  def issue_command(cmd)
+    $collector.stub('get_agent_commands', cmd)
+    agent.send(:handle_agent_commands)
+  end
+
   # Runs a thread we expect to span entire test and be killed at the end
   def run_thread
     Thread.new do

data/test/multiverse/suites/curb/curb_test.rb

@@ -79,6 +79,17 @@ class CurbTest < MiniTest::Unit::TestCase
       "Found some header lines appearing multiple times in header_str:\n#{header_str}")
   end
 
+  def test_get_via_multi_preserves_header_str
+    header_str = nil
+
+    Curl::Multi.get( [default_url] ) do |easy|
+      header_str = easy.header_str
+    end
+
+    assert_match(/^HTTP\/1\.1 200 OK\s+$/, header_str)
+    assert_match(/^Content-Length: \d+\s+$/, header_str)
+  end
+
   def test_get_doesnt_destroy_ability_to_call_status
     status_code = Curl.get( default_url ).status.to_i
     assert_equal(200, status_code)
@@ -94,7 +105,7 @@ class CurbTest < MiniTest::Unit::TestCase
   #   def self.head_response
   #     Curl.head( default_url )
   #   end
-  # 
+  #
   #   test_head
   # end
 
@@ -158,11 +169,14 @@ class CurbTest < MiniTest::Unit::TestCase
     "Curb"
   end
 
-  def get_response(url=nil)
+  def get_response(url=nil, headers=nil)
     if @get_response_proc
       @get_response_proc.call(url)
     else
-      Curl::Easy.http_get( url || default_url )
+      easy = Curl::Easy.new( url || default_url )
+      easy.headers = headers unless headers.nil?
+      easy.http_get
+      easy
     end
   end
 

data/test/multiverse/suites/excon/Envfile

@@ -2,7 +2,7 @@ suite_condition("Excon not supported in 1.8.6") do
   RUBY_VERSION != '1.8.6'
 end
 
-excon_versions = %w(0.24.0 0.19.0 0.18.0 0.10.0)
+excon_versions = %w(0.25.0 0.24.0 0.19.0 0.18.0 0.10.0)
 
 excon_versions.each do |excon_version|
   gemfile <<-RB

data/test/multiverse/suites/excon/excon_test.rb

@@ -16,8 +16,8 @@ class ExconTest < MiniTest::Unit::TestCase
     "Excon"
   end
 
-  def get_response(url=nil)
-    Excon.get(url || default_url)
+  def get_response(url=nil, headers=nil)
+    Excon.get(url || default_url, :headers => (headers || {}))
   end
 
   def get_response_multi(url, n)
@@ -44,6 +44,22 @@ class ExconTest < MiniTest::Unit::TestCase
     NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(Excon::Response.new(:headers => headers))
   end
 
+  def test_still_records_tt_node_when_request_fails_with_idempotent_set
+    target_url = "#{default_url}/idempotent_test"
+
+    in_transaction do
+      conn = Excon.new("#{target_url}?status=404")
+      assert_raises(Excon::Errors::NotFound) do
+        conn.get(:expects => 200, :idempotent => true)
+      end
+    end
+
+    tt = NewRelic::Agent.agent.transaction_sampler.last_sample
+    segment = tt.root_segment.called_segments.first
+    assert_equal("External/localhost/Excon/GET", segment.metric_name)
+    assert_equal(target_url, segment.params[:uri])
+  end
+
   def test_still_records_tt_node_when_request_expects_different_response_code
     in_transaction do
       conn = Excon.new("#{default_url}?status=500")

data/test/multiverse/suites/httpclient/httpclient_test.rb

@@ -16,8 +16,8 @@ class HTTPClientTest < MiniTest::Unit::TestCase
     "HTTPClient"
   end
 
-  def get_response(url=nil)
-    HTTPClient.get(url || default_url)
+  def get_response(url=nil, headers=nil)
+    HTTPClient.get(url || default_url, :header => headers)
   end
 
   def head_response

data/test/multiverse/suites/net_http/net_http_test.rb

@@ -20,12 +20,12 @@ class NetHttpTest < MiniTest::Unit::TestCase
     "Net::HTTP"
   end
 
-  def get_response(url=nil)
+  def get_response(url=nil, headers={})
     uri = default_uri
     uri = URI.parse(url) unless url.nil?
     path = uri.path.empty? ? '/' : uri.path
 
-    start(uri) { |http| http.get(path) }
+    start(uri) { |http| http.get(path, headers) }
   end
 
   def get_response_multi(url, n)