newrelic_rpm 3.6.8.168 → 3.6.9.171

data/test/environments/rails23/Gemfile

@@ -2,11 +2,12 @@ source 'https://rubygems.org'
 
 gem "test-unit"
 
-gem "rails", "~> 2.3.0"
+gem "rails", "~> 2.3.18"
 
 gem "mocha", "0.9.8"
 gem 'rack'
 gem 'rack-test'
+gem 'rdoc'
 
 gem "newrelic_rpm", :path => '../../..'
 
@@ -15,8 +16,6 @@ if(RUBY_PLATFORM == 'java')
   gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 else
-  gem "mysql", RUBY_VERSION == '1.8.6' ? '2.7' : '2.8.1'
+  gem "mysql", "~>2.9.1"
   gem "sqlite3-ruby", "1.2.5"
 end
-
-gem 'sequel', '~> 3.46.0' unless RUBY_VERSION == '1.8.6'

data/test/environments/rails23/Rakefile

@@ -5,8 +5,12 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
 require 'rake'
 require 'rake/testtask'
+require 'rdoc/task'
 
 gem 'newrelic_rpm'
+
+require 'tasks/rails'
 require 'tasks/all'
 
+Rake::Task["default"].clear
 task :default => [:'test:newrelic']

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

@@ -1,13 +1,10 @@
-# Shared properties for mysql db
 mysql: &mysql
   adapter: mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: rails_blog
+  database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
 
-# Shared properties for postgres.  This won't work with our schema but
-# Does work with agent tests
 sqlite3: &sqlite3
 <% if defined?(JRuby) %>
   adapter: jdbcsqlite3
@@ -18,9 +15,7 @@ sqlite3: &sqlite3
   pool: 5
   timeout: 5000
   host: localhost
-  
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+
 development:
   <<: *sqlite3
 

data/test/environments/rails30/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'test-unit'
-gem 'rails', '~>3.0.0'
+gem 'rails', '~>3.0.20'
 gem 'newrelic_rpm', :path => '../../..'
 gem "mocha"
 gem 'rack'
@@ -12,8 +12,6 @@ if (RUBY_PLATFORM == 'java')
   gem "activerecord-jdbcsqlite3-adapter", '1.2.5'
   gem "jruby-openssl"
 else
-  gem "mysql"
+  gem "mysql", "~>2.9.1"
   gem "sqlite3-ruby"
 end
-
-gem 'sequel', '~> 3.46.0'

data/test/environments/rails30/Rakefile

@@ -4,6 +4,8 @@
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
 
+RpmTestApp::Application.load_tasks
 require 'tasks/all'
 
+Rake::Task["default"].clear
 task :default => [:'test:newrelic']

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

@@ -1,13 +1,10 @@
-# Shared properties for mysql db
 mysql: &mysql
   adapter: mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: rails_blog
+  database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
 
-# Shared properties for postgres.  This won't work with our schema but
-# Does work with agent tests
 sqlite3: &sqlite3
 <% if defined?(JRuby) %>
   adapter: jdbcsqlite3
@@ -18,9 +15,7 @@ sqlite3: &sqlite3
   pool: 5
   timeout: 5000
   host: localhost
-  
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+
 development:
   <<: *sqlite3
 

data/test/environments/rails31/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'test-unit'
-gem 'rails', '~>3.1.0'
+gem 'rails', '~>3.1.12'
 gem 'newrelic_rpm', :path => '../../..'
 gem "mocha"
 gem 'rack'
@@ -12,8 +12,6 @@ if (RUBY_PLATFORM == 'java')
   gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 else
-  gem "mysql"
+  gem "mysql", "~>2.9.1"
   gem "sqlite3-ruby"
 end
-
-gem 'sequel', '~> 3.46.0'

data/test/environments/rails31/Rakefile

@@ -4,6 +4,8 @@
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
 
+RpmTestApp::Application.load_tasks
 require 'tasks/all'
 
+Rake::Task["default"].clear
 task :default => [:'test:newrelic']

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

@@ -1,13 +1,10 @@
-# Shared properties for mysql db
 mysql: &mysql
   adapter: mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: rails_blog
+  database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
 
-# Shared properties for postgres.  This won't work with our schema but
-# Does work with agent tests
 sqlite3: &sqlite3
 <% if defined?(JRuby) %>
   adapter: jdbcsqlite3
@@ -18,9 +15,7 @@ sqlite3: &sqlite3
   pool: 5
   timeout: 5000
   host: localhost
-  
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+
 development:
   <<: *sqlite3
 

data/test/environments/rails32/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>3.2.0'
+gem 'rails', '~>3.2.15'
 
 gem "mocha", '~>0.13.0', :require => false
 gem 'rack'
@@ -15,11 +15,8 @@ platforms :jruby do
 end
 
 platforms :ruby, :rbx do
-  gem "mysql"
-  gem "sqlite3-ruby"
+  gem "mysql", "~>2.9.1"
   gem "sqlite3"
 end
 
-gem 'sequel', '~> 3.46.0'
-
 gem "newrelic_rpm", :path => "../../.."

data/test/environments/rails32/Rakefile

@@ -4,6 +4,8 @@
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
 
+RpmTestApp::Application.load_tasks
 require 'tasks/all'
 
+Rake::Task["default"].clear
 task :default => [:'test:newrelic']

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

@@ -4,7 +4,7 @@ mysql: &mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: rails_blog
+  database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
 
 # Shared properties for postgres.  This won't work with our schema but
 # Does work with agent tests

data/test/environments/rails40/Gemfile

@@ -2,15 +2,15 @@ source 'http://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.0.0.rc2'
+gem 'rails', '~>4.0.0'
 
 gem "mocha", '~>0.13.0', :require => false
 gem 'rack'
 gem 'rack-test'
 
 platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter", "~>1.3.0"
+  gem "activerecord-jdbcsqlite3-adapter", "~>1.3.0"
   gem "jruby-openssl"
 end
 
@@ -20,6 +20,9 @@ platforms :mri_19, :mri_20, :rbx do
   gem "sqlite3"
 end
 
-gem 'sequel', '~> 3.46.0'
+platforms :rbx do
+  gem "rubysl"
+  gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
+end
 
 gem "newrelic_rpm", :path => "../../.."

data/test/environments/rails40/Rakefile

@@ -4,6 +4,8 @@
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
 
+RpmTestApp::Application.load_tasks
 require 'tasks/all'
 
+Rake::Task["default"].clear
 task :default => [:'test:newrelic']

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

@@ -1,13 +1,10 @@
-# Shared properties for mysql db
 mysql: &mysql
   adapter: mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: rails_blog
+  database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
 
-# Shared properties for postgres.  This won't work with our schema but
-# Does work with agent tests
 sqlite3: &sqlite3
 <% if defined?(JRuby) %>
   adapter: jdbcsqlite3
@@ -18,9 +15,7 @@ sqlite3: &sqlite3
   pool: 5
   timeout: 5000
   host: localhost
-  
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+
 development:
   <<: *sqlite3
 

data/test/helpers/runtime_detection.rb

@@ -0,0 +1,17 @@
+# 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.
+
+module NewRelic
+  module TestHelpers
+    module RuntimeDetection
+      def rubinius?
+        defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+      end
+
+      def jruby?
+        defined?(JRuby)
+      end
+    end
+  end
+end

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

@@ -73,6 +73,8 @@ module Multiverse
         f.puts jruby_openssl_line unless gemfile_text =~ /^\s*gem .jruby-openssl./
         f.puts minitest_line unless gemfile_text =~ /^\s*gem .minitest[^_]./
 
+        rbx_gemfile_lines(f, gemfile_text)
+
         # We currently pin usage of mocha at the 0.9.x line for compatibility
         # 0.10.x had issues with the integration handlers and MiniTest on old Rubies
         # 0.11.x introduced syntax that breaks 1.8.6 entirely :(
@@ -81,10 +83,13 @@ module Multiverse
         # resolved in some fashion at that point
         f.puts "  gem 'mocha', '~> 0.9.8', :require => false" unless environments.omit_mocha
 
-        if RUBY_VERSION > '1.8.7'
-          f.puts "  gem 'debugger'" if include_debugger
-        else
-          f.puts "  gem 'ruby-debug'" if include_debugger
+        # Need to get Rubinius' debugger wired in, but MRI's doesn't work
+        if include_debugger
+          if RUBY_VERSION > '1.8.7'
+            f.puts "  gem 'debugger', :platforms => [:mri]"
+          else
+            f.puts "  gem 'ruby-debug', :platforms => [:mri]"
+          end
         end
       end
       puts yellow("Gemfile.#{env_index} set to:") if verbose?
@@ -98,6 +103,17 @@ module Multiverse
       line
     end
 
+    def rbx_gemfile_lines(f, gemfile_text)
+      return unless is_rbx?
+
+      f.puts "gem 'rubysl', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl./
+      f.puts "gem 'racc', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .racc./
+    end
+
+    def is_rbx?
+      defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+    end
+
     def jruby_openssl_line
       "gem 'jruby-openssl', :require => false, :platforms => [:jruby]"
     end

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

@@ -62,7 +62,7 @@ class KeyTransactionsTest < MiniTest::Unit::TestCase
     TestWidget.new.key_txn
     TestWidget.new.other_txn
 
-    NewRelic::Agent.instance.send(:harvest_and_send_slowest_sample)
+    NewRelic::Agent.instance.send(:harvest_and_send_transaction_traces)
 
     traces = $collector.calls_for('transaction_sample_data')
     assert_equal 1, traces.size

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

@@ -31,7 +31,7 @@ class MarshalingTest < MiniTest::Unit::TestCase
     expected_sample = sampler.last_sample
 
     agent.service.connect
-    agent.send(:harvest_and_send_slowest_sample)
+    agent.send(:harvest_and_send_transaction_traces)
 
     if NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported?
       marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new

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

@@ -77,11 +77,33 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
     assert_saw_traces(profile_data, "BACKGROUND")
   end
 
+  def test_thread_profiling_with_pruby_marshaller
+    with_config(:marshaller => 'pruby') do
+      issue_command(START_COMMAND)
+
+      run_thread { NewRelic::Agent::Transaction.start(:controller, :request => stub) }
+      run_thread { NewRelic::Agent::Transaction.start(:task) }
+
+      let_it_finish
+    end
+
+    profile_data = $collector.calls_for('profile_data')[0]
+    assert_equal('666', profile_data.run_id, "Missing run_id, profile_data was #{profile_data.inspect}")
+    assert(profile_data.sample_count > 10, "Expected sample_count > 10, but was #{profile_data.sample_count}")
+
+    assert_saw_traces(profile_data, "OTHER")
+    assert_saw_traces(profile_data, "AGENT")
+    assert_saw_traces(profile_data, "REQUEST")
+    assert_saw_traces(profile_data, "BACKGROUND")
+  end
+
   def test_thread_profiling_can_stop
     issue_command(START_COMMAND)
     issue_command(STOP_COMMAND)
 
-    let_it_finish
+    # No wait needed, should be immediately ready to harvest
+    assert @thread_profiler_session.ready_to_harvest?
+    harvest
 
     profile_data = $collector.calls_for('profile_data')[0]
     assert_equal('666', profile_data.run_id, "Missing run_id, profile_data was #{profile_data.inspect}")
@@ -102,17 +124,20 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
   end
 
   def let_it_finish
-    Timeout.timeout(5) do
-      until @thread_profiler_session.ready_to_harvest?
-        sleep(0.1)
-      end
-    end
+    wait_for_backtrace_service_poll(:timeout => 10.0, :iterations => 10)
+    harvest
+  end
 
+  def harvest
     agent.send(:transmit_data, true)
   end
 
   def assert_saw_traces(profile_data, type)
-    assert !profile_data.traces[type].empty?, "Missing #{type} traces"
+    assert_kind_of Hash, profile_data.traces
+    traces_for_type = profile_data.traces[type]
+    assert traces_for_type, "Missing key for type #{type} in profile_data"
+    assert_kind_of Array, traces_for_type
+    assert !profile_data.traces[type].empty?, "Zero #{type} traces seen"
   end
 
 end

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

@@ -89,6 +89,7 @@ class XraySessionsTest < MiniTest::Unit::TestCase
   def test_gathers_thread_profiles
     session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
     with_xray_sessions(session) do
+      wait_for_backtrace_service_poll
       get '/?transaction_name=A&sleep=1'
       trigger_harvest
     end

data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb

@@ -33,13 +33,14 @@ class ConfigFileLoadingTest < MiniTest::Unit::TestCase
 
     # Figure out where multiverse is in the real file system.
     @cwd = Dir.pwd
+
+    # require the agent before we're in FakeFS so require doesn't hit the fake
+    require 'newrelic_rpm'
+
     # Use a fake file system so we don't damage the real one.
     FakeFS.activate!
     FakeFS::FileSystem.clear
 
-    # require the agent after we're in FakeFS
-    require 'newrelic_rpm'
-
     FileUtils.mkdir_p(@cwd)
   end