newrelic_rpm 3.6.5.130 → 3.6.6.147

data/test/multiverse/suites/datamapper/Envfile

@@ -2,6 +2,8 @@ suite_condition("Datamapper not supported in 1.8.6") do
   RUBY_VERSION != '1.8.6'
 end
 
+omit_collector!
+
 gemfile <<-RB
   gem 'datamapper'
   gem 'dm-sqlite-adapter'

data/test/multiverse/suites/datamapper/config/newrelic.yml

@@ -11,7 +11,6 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: <%= 30_000 + ($$ % 10_000) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
@@ -19,4 +18,3 @@ development:
     transaction_threshold: 1.0
   capture_params: false
   log_level: debug
-  log_file_path: agent.log

data/test/multiverse/suites/datamapper/datamapper_test.rb

@@ -3,10 +3,9 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'data_mapper'
-require 'newrelic_rpm'
-require 'test/unit'
 
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
+require 'multiverse_helpers'
 
 DataMapper::Logger.new("/dev/null", :debug)
 DataMapper.setup(:default, 'sqlite::memory:')
@@ -28,10 +27,10 @@ class DummyConnection
   include NewRelic::Agent::Instrumentation::DataMapperInstrumentation
 end
 
-class DataMapperTest < Test::Unit::TestCase
-  def setup
-    NewRelic::Agent.instance.reset_stats
-  end
+class DataMapperTest < MiniTest::Unit::TestCase
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
 
   def test_basic_metrics
     post = Post.create(:title => "Dummy post", :body => "whatever, man")
@@ -97,9 +96,6 @@ class DataMapperTest < Test::Unit::TestCase
     msg.stubs(:query).returns(q)
 
     assert_equal false, msg.query.valid_encoding? if RUBY_VERSION >= '1.9'
-    assert_nothing_raised do
-      db.send(:log, msg)
-    end
+    db.send(:log, msg)
   end
 end
-

data/test/multiverse/suites/deferred_instrumentation/Envfile

@@ -0,0 +1,19 @@
+suite_condition("Sinatra not compatible with 1.8.6") do
+  RUBY_VERSION != '1.8.6'
+end
+
+gemfile <<-RB
+  gem 'sinatra', '~> 1.4.0', :require => false
+  gem 'rack-test', :require => 'rack/test'
+RB
+
+gemfile <<-RB
+  gem 'sinatra', '~> 1.3.0', :require => false
+  gem 'rack-test', :require => 'rack/test'
+RB
+
+gemfile <<-RB
+  gem 'sinatra', '~> 1.2.0', :require => false
+  gem 'rack-test', :require => 'rack/test'
+RB
+

data/test/multiverse/suites/deferred_instrumentation/config/newrelic.yml

@@ -0,0 +1,22 @@
+---
+development:
+  error_collector:
+    capture_source: true
+    enabled: true
+  apdex_t: 0.5
+  ssl: false
+  agent_enabled: true
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  sync_startup: true
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false
+  disable_serialization: false

data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb

@@ -0,0 +1,103 @@
+# 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(File.join(File.dirname(__FILE__), '..', 'sinatra', 'sinatra_test_cases'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
+
+require 'newrelic_rpm'
+require 'sinatra'
+
+class DeferredSinatraTestApp < Sinatra::Base
+  include NewRelic::Agent::Instrumentation::Rack
+
+  configure do
+    # display exceptions so we see what's going on
+    disable :show_exceptions
+
+    # create a condition (sintra's version of a before_filter) that returns the
+    # value that was passed into it.
+    set :my_condition do |boolean|
+      condition do
+        halt 404 unless boolean
+      end
+    end
+  end
+
+  get '/user/login' do
+    "please log in"
+  end
+
+  # this action will always return 404 because of the condition.
+  get '/user/:id', :my_condition => false do |id|
+    "Welcome #{id}"
+  end
+
+  get '/raise' do
+    raise "Uh-oh"
+  end
+
+  # check that pass works properly
+  condition { pass { halt 418, "I'm a teapot." } }
+  get('/pass') { }
+
+  get '/pass' do
+    "I'm not a teapot."
+  end
+
+  class Error < StandardError; end
+  error(Error) { halt 200, 'nothing happened' }
+  condition { raise Error }
+  get('/error') { }
+
+  condition do
+    raise "Boo" if $precondition_already_checked
+    $precondition_already_checked = true
+  end
+  get('/precondition') { 'precondition only happened once' }
+
+  get '/route/:name' do |name|
+    # usually this would be a db test or something
+    pass if name != 'match'
+    'first route'
+  end
+
+  get '/route/no_match' do
+    'second route'
+  end
+
+  before '/filtered' do
+    @filtered = true
+  end
+
+  get '/filtered' do
+    @filtered ? 'got filtered' : 'nope'
+  end
+
+  get /\/regex.*/ do
+    "Yeah, regex's!"
+  end
+end
+
+class DeferredSinatraTest < MiniTest::Unit::TestCase
+  include SinatraTestCases
+
+  def app
+    Rack::Builder.new( DeferredSinatraTestApp ).to_app
+  end
+
+
+  def test_ignores_route_metrics
+    # Can't use 'newrelic_ignore' if newrelic was loaded before sinatra, as the
+    # instrumentation doesn't load until Rack is building the app to run it.
+  end
+
+
+  # (RUBY-1169)
+  def test_only_tries_deferred_detection_once
+    Rack::Builder.new( DeferredSinatraTestApp ).to_app
+    ::DependencyDetection.expects( :detect! ).never
+    Rack::Builder.new( DeferredSinatraTestApp ).to_app
+  end
+
+end

data/test/multiverse/suites/excon/config/newrelic.yml

@@ -11,11 +11,9 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: <%= 30_000 + ($$ % 10_000) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
     transaction_threshold: 1.0
   capture_params: false
-  log_level: debug

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

@@ -9,7 +9,7 @@ require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
-class ExconTest < Test::Unit::TestCase
+class ExconTest < MiniTest::Unit::TestCase
   include HttpClientTestCases
 
   def client_name
@@ -40,8 +40,8 @@ class ExconTest < Test::Unit::TestCase
     NewRelic::Agent::HTTPClients::ExconHTTPRequest.new({:headers => ""})
   end
 
-  def response_instance
-    NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(Excon::Response.new)
+  def response_instance(headers = {})
+    NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(Excon::Response.new(:headers => headers))
   end
 
   def test_still_records_tt_node_when_request_expects_different_response_code

data/test/multiverse/suites/httpclient/Envfile

@@ -0,0 +1,15 @@
+suite_condition("HTTPClient not supported in 1.8.6") do
+  RUBY_VERSION != '1.8.6'
+end
+
+httpclient_versions = %w(2.3.3 2.2.0)
+
+httpclient_versions.each do |httpclient_version|
+  gemfile <<-RB
+    gem 'httpclient', '~> #{httpclient_version}'
+    gem 'rack'
+    if RUBY_VERSION < '1.9.0'
+      gem 'json'
+    end
+  RB
+end

data/test/multiverse/suites/httpclient/config/newrelic.yml

@@ -0,0 +1,19 @@
+---
+development:
+  error_collector:
+    capture_source: true
+    enabled: true
+  apdex_t: 0.5
+  ssl: false
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false

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

@@ -0,0 +1,70 @@
+# 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 "httpclient"
+require "newrelic_rpm"
+require "test/unit"
+require "http_client_test_cases"
+
+require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
+
+class HTTPClientTest < MiniTest::Unit::TestCase
+  include HttpClientTestCases
+
+  def client_name
+    "HTTPClient"
+  end
+
+  def get_response(url=nil)
+    HTTPClient.get(url || default_url)
+  end
+
+  def head_response
+    HTTPClient.head(default_url)
+  end
+
+  def post_response
+    HTTPClient.post(default_url, :body => "")
+  end
+
+  def request_instance
+    httpclient_req = HTTP::Message.new_request(:get, 'http://newrelic.com')
+    NewRelic::Agent::HTTPClients::HTTPClientRequest.new(httpclient_req)
+  end
+
+  def response_instance(headers = {})
+    httpclient_resp = HTTP::Message.new_response('')
+    headers.each do |k, v|
+      httpclient_resp.http_header[k] = v
+    end
+    NewRelic::Agent::HTTPClients::HTTPClientResponse.new(httpclient_resp)
+  end
+
+  def test_still_records_tt_node_when_pop_raises_an_exception
+    in_transaction do
+      test_exception = StandardError.new
+      evil_connection = HTTPClient::Connection.new
+      evil_connection.instance_variable_set(:@test_exception, test_exception)
+      evil_connection.instance_eval do
+        def new_push(request)
+          @queue.push(@test_exception)
+        end
+
+        alias old_push push
+        alias push new_push
+      end
+
+      HTTPClient::Connection.stubs(:new).returns(evil_connection)
+
+      begin
+        get_response(default_url)
+      rescue => e
+        raise e unless e == test_exception
+      end
+
+      last_segment = find_last_transaction_segment()
+      assert_equal("External/localhost/HTTPClient/GET", last_segment.metric_name)
+    end
+  end
+end

data/test/multiverse/suites/net_http/config/newrelic.yml

@@ -11,11 +11,9 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: <%= 30_000 + ($$ % 10_000) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
     transaction_threshold: 1.0
   capture_params: false
-  log_level: debug

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

@@ -9,7 +9,7 @@ require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
 
-class NetHttpTest < Test::Unit::TestCase
+class NetHttpTest < MiniTest::Unit::TestCase
   include HttpClientTestCases
 
   #
@@ -23,8 +23,9 @@ class NetHttpTest < Test::Unit::TestCase
   def get_response(url=nil)
     uri = default_uri
     uri = URI.parse(url) unless url.nil?
+    path = uri.path.empty? ? '/' : uri.path
 
-    start(uri) { |http| http.get(uri.path) }
+    start(uri) { |http| http.get(path) }
   end
 
   def get_response_multi(url, n)
@@ -69,8 +70,12 @@ class NetHttpTest < Test::Unit::TestCase
     NewRelic::Agent::HTTPClients::NetHTTPRequest.new(http, request)
   end
 
-  def response_instance
-    Net::HTTPResponse.new(nil, nil, nil)
+  def response_instance(headers = {})
+    response = Net::HTTPResponse.new(nil, nil, nil)
+    headers.each do |k,v|
+      response[k] = v
+    end
+    response
   end
 
   #

data/test/multiverse/suites/padrino/Envfile

@@ -6,11 +6,13 @@ gemfile <<-RB
   # Gemspec from rubygems on this version gets illformed warnings on 1.8.7
   gem 'http_router', '0.11.0', :git => 'git://github.com/joshbuddy/http_router.git'
 
+  gem 'activesupport', '~> 3'
   gem 'padrino', '~> 0.11.0'
   gem 'rack-test', :require => 'rack/test'
 RB
 
 gemfile <<-RB
+  gem 'activesupport', '~> 3'
   gem 'padrino', '~> 0.10.0'
   gem 'rack-test', :require => 'rack/test'
 RB

data/test/multiverse/suites/padrino/config/newrelic.yml

@@ -10,15 +10,12 @@ development:
   license_key: bootstrap_newrelic_admin_license_key_000
   developer_mode: false
   app_name: test
-  sync_startup: true
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: <%= 30_000 + ($$ % 10_000) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
     transaction_threshold: 1.0
   capture_params: false
-  log_level: debug
   disable_serialization: false

data/test/multiverse/suites/padrino/padrino_test.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper.rb')
+require 'multiverse_helpers'
 
 # Shhhh
 Padrino::Logger::Config[:development][:stream] = :null
@@ -21,16 +22,16 @@ class PadrinoTestApp < Padrino::Application
   end
 end
 
-class PadrinoRoutesTest < Test::Unit::TestCase
+class PadrinoRoutesTest < MiniTest::Unit::TestCase
   include Rack::Test::Methods
 
   def app
     PadrinoTestApp
   end
 
-  def setup
-    ::NewRelic::Agent.manual_start
-  end
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
 
   def test_basic_route
     get '/user/login'