newrelic_rpm 3.18.1.330 → 4.0.0.332

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails40/Gemfile

@@ -4,23 +4,6 @@ gem 'rake', '< 11'
 
 gem 'rails', '~>4.0.13'
 
-# mime-types 2.99.1 and 3.x introduce mime-types-data
-# mime-types-data requires Ruby version >= 2.0
-# mime-types 2.99 requires Ruby version >= 1.9.3
-if RUBY_VERSION < '1.9.3'
-  gem 'mime-types', '1.25.1'
-elsif RUBY_VERSION < '2'
-  gem 'mime-types', '< 3'
-end
-
-# Do not automatically require minitest, since this will break with rbx-2.2.5.
-# rbx-2.2.5 helpfully bundles minitest-5.3.0.
-# Our tests don't work with minitest-5.3.0.
-# minitest-4.7.5 is the version we want to use here, but if you just do
-# a require 'minitest' on rbx-2.2.5, you'll get 5.3.0 (since 4.7.5 doesn't
-# actually have a minitest.rb file under lib/). The :require => false prevents
-# us from inadvertently loading minitest 5.3.0 on rbx (we'll require
-# minitest/unit instead via a different path).
 gem 'minitest', '~>4.7.5', :require => false
 gem 'mocha', '1.1', :require => false
 gem 'rack', '< 2.0.0'
@@ -37,15 +20,6 @@ platforms :ruby do
   gem "sqlite3"
 end
 
-platforms :rbx do
-  gem "rubysl"
-  gem "json", '< 2.0.0'
-  # If we don't skip the require here, test-unit tries to install its at_exit
-  # hook and run when we run our rake task to create the test DB.
-  gem "rubysl-test-unit", :require => false
-  gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
-end
-
 gem "newrelic_rpm", :path => "../../.."
 
 gem 'pry', '~> 0.9.12'

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql2
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails41/Gemfile

@@ -4,15 +4,6 @@ gem 'rake', '< 11'
 
 gem 'rails', '~>4.1.10'
 
-# mime-types 2.99.1 and 3.x introduce mime-types-data
-# mime-types-data requires Ruby version >= 2.0
-# mime-types 2.99 requires Ruby version >= 1.9.3
-if RUBY_VERSION < '1.9.3'
-  gem 'mime-types', '1.25.1'
-elsif RUBY_VERSION < '2'
-  gem 'mime-types', '< 3'
-end
-
 gem 'minitest', '5.2.3'
 gem 'mocha', '1.1', :require => false
 gem 'rack', '< 2.0.0'
@@ -29,15 +20,6 @@ platforms :ruby do
   gem "sqlite3"
 end
 
-platforms :rbx do
-  gem "rubysl"
-  gem "json", '< 2.0.0'
-  # If we don't skip the require here, test-unit tries to install its at_exit
-  # hook and run when we run our rake task to create the test DB.
-  gem "rubysl-test-unit", :require => false
-  gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
-end
-
 gem "newrelic_rpm", :path => "../../.."
 
 gem 'pry', '~> 0.9.12'

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql2
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails42/Gemfile

@@ -4,15 +4,6 @@ gem 'rake', '< 11'
 
 gem 'rails', '~>4.2.1'
 
-# mime-types 2.99.1 and 3.x introduce mime-types-data
-# mime-types-data requires Ruby version >= 2.0
-# mime-types 2.99 requires Ruby version >= 1.9.3
-if RUBY_VERSION < '1.9.3'
-  gem 'mime-types', '1.25.1'
-elsif RUBY_VERSION < '2'
-  gem 'mime-types', '< 3'
-end
-
 gem 'minitest', '5.2.3'
 gem 'mocha', '1.1', :require => false
 gem 'rack', '< 2.0.0'
@@ -29,19 +20,6 @@ platforms :ruby do
   gem "sqlite3"
 end
 
-platforms :rbx do
-  gem "rubysl"
-  gem "json", '< 2.0.0'
-  # If we don't skip the require here, test-unit tries to install its at_exit
-  # hook and run when we run our rake task to create the test DB.
-  gem "rubysl-test-unit", :require => false
-  gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
-
-  # Compilation issues with rubysl-openssl 2.2.1, lock at 2.1.0 for now.
-  # https://github.com/rubysl/rubysl-openssl/issues/11
-  gem "rubysl-openssl", "2.1.0"
-end
-
 gem "newrelic_rpm", :path => "../../.."
 
 gem 'pry', '~> 0.9.12'

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql2
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/environments/rails50/Gemfile

@@ -17,19 +17,6 @@ platforms :ruby do
   gem "mysql2"
 end
 
-platforms :rbx do
-  gem "rubysl"
-  gem "json", '< 2.0.0'
-  # If we don't skip the require here, test-unit tries to install its at_exit
-  # hook and run when we run our rake task to create the test DB.
-  gem "rubysl-test-unit", :require => false
-  gem "racc"  # https://github.com/rubinius/rubinius/issues/2632
-
-  # Compilation issues with rubysl-openssl 2.2.1, lock at 2.1.0 for now.
-  # https://github.com/rubysl/rubysl-openssl/issues/11
-  gem "rubysl-openssl", "2.1.0"
-end
-
 gem "newrelic_rpm", :path => "../../.."
 
 gem 'pry', '~> 0.9.12'

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

@@ -1,6 +1,6 @@
 mysql: &mysql
   adapter: mysql2
-  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" : "/tmp/mysql.sock" %>
   username: root
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>

data/test/helpers/logging.rb

@@ -0,0 +1,37 @@
+# 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.
+
+def with_verbose_logging
+  orig_logger = NewRelic::Agent.logger
+  $stderr.puts '', '---', ''
+  new_logger = NewRelic::Agent::AgentLogger.new('', Logger.new($stderr) )
+  NewRelic::Agent.logger = new_logger
+
+  with_config(:log_level => 'debug') do
+    yield
+  end
+ensure
+  NewRelic::Agent.logger = orig_logger
+end
+
+# Need to be a bit sloppy when testing against the logging--let everything
+# through, but check we (at least) get our particular message we care about
+def expects_logging(level, *with_params)
+  ::NewRelic::Agent.logger.stubs(level)
+  ::NewRelic::Agent.logger.expects(level).with(*with_params).once
+end
+
+def expects_no_logging(level)
+  ::NewRelic::Agent.logger.expects(level).never
+end
+
+# Sometimes need to test cases where we muddle with the global logger
+# If so, use this method to ensure it gets restored after we're done
+def without_logger
+  logger = ::NewRelic::Agent.logger
+  ::NewRelic::Agent.logger = nil
+  yield
+ensure
+  ::NewRelic::Agent.logger = logger
+end

data/test/helpers/minitest.rb

@@ -0,0 +1,50 @@
+# 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.
+
+unless defined?(Minitest::Test)
+  Minitest::Test = MiniTest::Unit::TestCase
+end
+
+# Set up a watcher for leaking agent threads out of tests.  It'd be nice to
+# disable the threads everywhere, but not all tests have newrelic.yml loaded to
+# us to rely on, so instead we'll just watch for it.
+class Minitest::Test
+
+  def before_setup
+    if self.respond_to?(:name)
+      test_method_name = self.name
+    else
+      test_method_name = self.__name__
+    end
+
+    NewRelic::Agent.logger.info("*** #{self.class}##{test_method_name} **")
+
+    @__thread_count = ruby_threads.count
+    super
+  end
+
+  def after_teardown
+    unfreeze_time
+
+    threads = ruby_threads
+    if @__thread_count != threads.count
+      backtraces = threads.map do |thread|
+        trace = Hometown.for(thread)
+        trace.backtrace.join("\n    ")
+      end.join("\n\n")
+
+      fail "Thread count changed in this test from #{@__thread_count} to #{threads.count}\n#{backtraces}"
+    end
+
+    super
+  end
+
+  # We only want to count threads that were spun up from Ruby (i.e.
+  # Thread.new) JRuby has system threads we don't care to track.
+  def ruby_threads
+    Thread.list.select { |t| Hometown.for(t) }
+  end
+
+end
+

data/test/helpers/misc.rb

@@ -0,0 +1,87 @@
+# 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.
+
+def default_service(stubbed_method_overrides = {})
+  service = stub
+  stubbed_method_defaults = {
+    :connect => {},
+    :shutdown => nil,
+    :agent_id= => nil,
+    :agent_id => nil,
+    :collector => stub_everything,
+    :request_timeout= =>  nil,
+    :metric_data => nil,
+    :error_data => nil,
+    :transaction_sample_data => nil,
+    :sql_trace_data => nil,
+    :get_agent_commands => [],
+    :agent_command_results => nil,
+    :analytic_event_data => nil,
+    :valid_to_marshal? => true
+  }
+
+  service.stubs(stubbed_method_defaults.merge(stubbed_method_overrides))
+
+  # When session gets called yield to the given block.
+  service.stubs(:session).yields
+  service
+end
+
+def fixture_tcp_socket( response )
+  # Don't actually talk to Google.
+  socket = stub("socket") do
+    stubs(:closed?).returns(false)
+    stubs(:close)
+    stubs(:setsockopt)
+
+    # Simulate a bunch of socket-ey stuff since Mocha doesn't really
+    # provide any other way to do it
+    class << self
+      attr_accessor :response, :write_checker
+    end
+
+    def self.check_write
+      self.write_checker = Proc.new
+    end
+
+    def self.write( buf )
+      self.write_checker.call( buf ) if self.write_checker
+      buf.length
+    end
+
+    def self.sysread( size, buf='' )
+      @data ||= response.to_s
+      raise EOFError if @data.empty?
+      buf.replace @data.slice!( 0, size )
+      buf
+    end
+    class << self
+      alias_method :read_nonblock, :sysread
+    end
+
+  end
+
+  socket.response = response
+  TCPSocket.stubs( :open ).returns( socket )
+
+  return socket
+end
+
+def dummy_mysql_explain_result(hash=nil)
+  hash ||= {
+    'Id' => '1',
+    'Select Type' => 'SIMPLE',
+    'Table' => 'sandwiches',
+    'Type' => 'range',
+    'Possible Keys' => 'PRIMARY',
+    'Key' => 'PRIMARY',
+    'Key Length' => '4',
+    'Ref' => '',
+    'Rows' => '1',
+    'Extra' => 'Using index'
+  }
+  explain_result = mock('explain result')
+  explain_result.stubs(:each_hash).yields(hash)
+  explain_result
+end

data/test/helpers/transaction_sample.rb

@@ -0,0 +1,44 @@
+# 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 TransactionSampleTestHelper
+  module_function
+  def make_sql_transaction(*sql)
+    sampler = nil
+    state = NewRelic::Agent::TransactionState.tl_get
+
+    in_transaction('/path') do
+      sampler = NewRelic::Agent.instance.transaction_sampler
+      sampler.notice_push_frame(state, "a")
+      explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
+      sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "mysql"}, 0, state, explainer) }
+      sleep 0.02
+      yield if block_given?
+      sampler.notice_pop_frame(state, "a")
+    end
+
+    return sampler.last_sample
+  end
+
+  def run_sample_trace(path='/path')
+    sampler = nil
+    state = NewRelic::Agent::TransactionState.tl_get
+
+    request = stub(:path => path)
+
+    in_transaction("Controller/sandwiches/index", :request => request) do
+      sampler = NewRelic::Agent.instance.transaction_sampler
+      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", {}, 0, state)
+      sampler.notice_push_frame(state, "ab")
+      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", {}, 0, state)
+      yield sampler if block_given?
+      sampler.notice_pop_frame(state, "ab")
+      sampler.notice_push_frame(state, "lew")
+      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", {}, 0, state)
+      sampler.notice_pop_frame(state, "lew")
+    end
+
+    return sampler.last_sample
+  end
+end

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

@@ -165,7 +165,6 @@ module Multiverse
 
     def generate_gemfile(gemfile_text, env_index, local = true)
       pin_rack_version_if_needed(gemfile_text)
-      pin_json_version_if_needed(gemfile_text)
 
       gemfile = File.join(Dir.pwd, "Gemfile.#{env_index}")
       File.open(gemfile,'w') do |f|
@@ -173,24 +172,15 @@ module Multiverse
         f.print gemfile_text
         f.puts newrelic_gemfile_line unless gemfile_text =~ /^\s*gem .newrelic_rpm./
         f.puts jruby_openssl_line unless gemfile_text =~ /^\s*gem .jruby-openssl./ || (defined?(JRUBY_VERSION) && JRUBY_VERSION > '1.7')
-        f.puts mime_types_line unless gemfile_text =~ /^\s*gem .mime-types[^_-]./
         f.puts minitest_line unless gemfile_text =~ /^\s*gem .minitest[^_]./
-        f.puts rake_line unless gemfile_text =~ /^\s*gem .rake[^_]./ || suite == 'rake'
-        if RUBY_VERSION == "1.8.7"
-          f.puts "gem 'json', '< 1.8.5'" unless gemfile_text =~ /^\s.*gem .json./
-        end
-
-        rbx_gemfile_lines(f, gemfile_text)
+        f.puts "gem 'rake'" unless gemfile_text =~ /^\s*gem .rake[^_]./ || suite == 'rake'
 
         f.puts "  gem 'mocha', '0.14.0', :require => false"
 
         if debug
-          pry_version = RUBY_VERSION > '1.8.7' ? '0.10.0' : '0.9.12'
-
-          # Pry 0.10.0 breaks compatibility with Ruby 1.8.7 :(
-          f.puts "  gem 'pry', '~> #{pry_version}'"
-          f.puts "  gem 'pry-byebug'" if defined?(RUBY_ENGINE) && RUBY_VERSION >= "2.0.0" && RUBY_ENGINE == "ruby"
-          f.puts "  gem 'pry-stack_explorer'" if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
+          f.puts "  gem 'pry', '~> 0.10.0'"
+          f.puts "  gem 'pry-byebug', platforms: :mri"
+          f.puts "  gem 'pry-stack_explorer', platforms: :mri"
         end
       end
       puts yellow("Gemfile.#{env_index} set to:") if verbose?
@@ -204,33 +194,10 @@ 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 'json', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .json./
-      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', '~> 0.9.10', :require => false, :platforms => [:jruby]"
     end
 
-    # mime-types got a new dependency after 2.99 that breaks compatibility with ruby < 2.0
-    def mime_types_line
-      if RUBY_VERSION <= '1.9.3'
-        "gem 'mime-types', '1.25.1'"
-      elsif RUBY_VERSION < '2'
-        "gem 'mime-types', '2.99'"
-      else
-        ''
-      end
-    end
-
     def minitest_line
       "gem 'minitest', '~> #{minitest_version}', :require => false"
     end
@@ -250,15 +217,6 @@ module Multiverse
       require 'minitest/unit'
     end
 
-    # rake 11 dropped support for ruby < 1.9.3
-    def rake_line
-      if RUBY_VERSION < '1.9.3'
-        "gem 'rake', '< 11'"
-      else
-        "gem 'rake'"
-      end
-    end
-
     # Rack 2.0 works with Ruby > 2.2.2. Earlier rubies need to pin
     # their Rack version prior to 2.0
     def pin_rack_version_if_needed gemfile_text
@@ -269,49 +227,6 @@ module Multiverse
       end
     end
 
-    # JSON gem version 2.0.0 requires Ruby ~> 2.0. We need to pin
-    # the json version for older rubies. In some cases json is pulled
-    # in by other libraries without pinning the version. For older rubies
-    # we will preemptively require json with an appropriate version. None of
-    # this is ideal and should be fixed, either by this PR to bundler:
-    # https://github.com/bundler/bundler/pull/4650 or with a better solution
-    # in mutiverse.
-    def pin_json_version_if_needed gemfile_text
-      return if suite == "json" || suite == "no_json" || suite == "datamapper" ||
-        RUBY_VERSION >= "2.0.0" && RUBY_VERSION < "2.4.0" &&
-        !pin_json_for_jruby?
-
-      match = gemfile_text.match(/^\s*?(gem\s*?['"]json['"]).*?$/)
-      version = json_version
-      if match
-        return if match[0].include? version
-
-        replacement = match[0].gsub(match[1], "#{match[1]}, '#{version}'")
-        gemfile_text.gsub! match[0], replacement
-      else
-        gemfile_text.concat "\ngem 'json', '#{version}'\n"
-      end
-    end
-
-    def json_version
-      case
-      when RUBY_VERSION >= '2.4'
-        '~> 2.0.2'
-      when RUBY_VERSION == '1.8.7'
-        '< 1.8.5'
-      else
-        '< 2.0.0'
-      end
-    end
-
-    # Bundler does not seem to be able to find version 2.0.1 of the json
-    # gem for jruby 9000. This is likely a temporary situation and we
-    # can probably remove this check in the near future. For now we need
-    # this for CI to pass.
-    def pin_json_for_jruby?
-      defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && RUBY_VERSION >= "2.0.0"
-    end
-
     def print_environment
       puts yellow("Environment loaded with:") if verbose?
       gems = Bundler.definition.specs.inject([]) do |m, s|
@@ -564,8 +479,8 @@ module Multiverse
 
     def require_helpers
       # If used from a 3rd-party, these paths likely need to be added
-      $LOAD_PATH << File.expand_path(File.join(__FILE__, "..", "..", "..", ".."))
-      $LOAD_PATH << File.expand_path(File.join(__FILE__, "..", "..", "..", "..", "new_relic"))
+      $: << File.expand_path('../../../..', __FILE__)
+      $: << File.expand_path('../../../../new_relic', __FILE__)
       require 'multiverse_helpers'
     end