newrelic_rpm 3.6.4.122 → 3.6.5.130

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

@@ -4,6 +4,7 @@
 
 # RUBY-981 Audit Log
 
+require 'test/unit'
 require 'newrelic_rpm'
 require 'fake_collector'
 

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

@@ -11,7 +11,11 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
+<% if $collector && $collector.port %>
+  port: <%= $collector.port %>
+<% else %>
   port: <%= 30_000 + ($$ % 10_000) %>
+<% end %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true

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

@@ -10,7 +10,7 @@ class HttpResponseCodeTest < Test::Unit::TestCase
     $collector ||= NewRelic::FakeCollector.new
     $collector.reset
     $collector.run
-    NewRelic::Agent.manual_start(:send_data_on_exit => false)
+    NewRelic::Agent.manual_start(:send_data_on_exit => false, :port => $collector.port)
     @agent = NewRelic::Agent.instance
   end
 

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

@@ -32,7 +32,8 @@ class RenameRuleTest < Test::Unit::TestCase
     $collector.run
 
     NewRelic::Agent.manual_start(:sync_startup => true,
-                                 :force_reconnect => true)
+                                 :force_reconnect => true,
+                                 :port => $collector.port)
     TestWidget.new.txn
   end
 

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

@@ -13,12 +13,13 @@ class StartUpTest < Test::Unit::TestCase
     sin, sout, serr = Open3.popen3(cmd)
     output = sout.read + serr.read
 
-    jruby_noise = [
+    expected_noise = [
       "JRuby limited openssl loaded. http://jruby.org/openssl\n",
       "gem install jruby-openssl for full support.\n",
+      "fatal: Not a git repository (or any of the parent directories): .git\n",
       /Exception\: java\.lang.*\n/]
 
-    jruby_noise.each {|noise| output.gsub!(noise, "")}
+    expected_noise.each {|noise| output.gsub!(noise, "")}
 
     assert_equal '', output.chomp
   end

data/test/multiverse/suites/config_file_loading/Envfile

@@ -4,4 +4,6 @@ gemfile <<-RB
   # stub file system so we can test that newrelic.yml can be loaded from
   # various places.
   gem 'fakefs', :require => 'fakefs/safe'
+
+  gem 'jruby-openssl', :platforms => [:jruby]
 RB

data/test/multiverse/suites/excon/Envfile

@@ -0,0 +1,15 @@
+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.each do |excon_version|
+  gemfile <<-RB
+    gem 'excon', '~> #{excon_version}'
+    gem 'rack'
+    if RUBY_VERSION < '1.9.0'
+      gem 'json'
+    end
+  RB
+end

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

@@ -0,0 +1,21 @@
+---
+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
+  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

@@ -0,0 +1,60 @@
+# 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 "excon"
+require "newrelic_rpm"
+require "test/unit"
+require "http_client_test_cases"
+
+require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
+
+class ExconTest < Test::Unit::TestCase
+  include HttpClientTestCases
+
+  def client_name
+    "Excon"
+  end
+
+  def get_response(url=nil)
+    Excon.get(url || default_url)
+  end
+
+  def get_response_multi(url, n)
+    responses = []
+    conn = Excon.new(url)
+    n.times { responses << conn.get }
+    conn.reset
+    responses
+  end
+
+  def head_response
+    Excon.head(default_url)
+  end
+
+  def post_response
+    Excon.post(default_url, :body => "")
+  end
+
+  def request_instance
+    NewRelic::Agent::HTTPClients::ExconHTTPRequest.new({:headers => ""})
+  end
+
+  def response_instance
+    NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(Excon::Response.new)
+  end
+
+  def test_still_records_tt_node_when_request_expects_different_response_code
+    in_transaction do
+      conn = Excon.new("#{default_url}?status=500")
+      begin
+        conn.request(:method => :get, :expects => [200])
+      rescue Excon::Errors::Error => e
+        # meh
+      end
+
+      last_segment = find_last_transaction_segment()
+      assert_equal("External/localhost/Excon/GET", last_segment.metric_name)
+    end
+  end
+end

data/test/multiverse/suites/net_http/Envfile

@@ -0,0 +1,6 @@
+gemfile <<-RB
+  gem 'rack'
+  if RUBY_VERSION < '1.9.0'
+    gem 'json'
+  end
+RB

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

@@ -0,0 +1,21 @@
+---
+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
+  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

@@ -0,0 +1,102 @@
+# 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 "net/http"
+require "newrelic_rpm"
+require "test/unit"
+require "http_client_test_cases"
+
+require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
+
+class NetHttpTest < Test::Unit::TestCase
+  include HttpClientTestCases
+
+  #
+  # Support for shared test cases
+  #
+
+  def client_name
+    "Net::HTTP"
+  end
+
+  def get_response(url=nil)
+    uri = default_uri
+    uri = URI.parse(url) unless url.nil?
+
+    start(uri) { |http| http.get(uri.path) }
+  end
+
+  def get_response_multi(url, n)
+    uri = URI(url)
+    responses = []
+
+    start(uri) do |conn|
+      n.times do
+        req = Net::HTTP::Get.new(url)
+        responses << conn.request(req)
+      end
+    end
+
+    responses
+  end
+
+  def head_response
+    start(default_uri) { |http| http.head(default_uri.path) }
+  end
+
+  def post_response
+    start(default_uri) { |http| http.post(default_uri.path, "") }
+  end
+
+  def create_http(uri)
+    http = Net::HTTP.new(uri.host, uri.port)
+    if use_ssl?
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    http
+  end
+
+  def start(uri, &block)
+    http = create_http(uri)
+    http.start(&block)
+  end
+
+  def request_instance
+    http = Net::HTTP.new(default_uri.host, default_uri.port)
+    request = Net::HTTP::Get.new(default_uri.request_uri)
+    NewRelic::Agent::HTTPClients::NetHTTPRequest.new(http, request)
+  end
+
+  def response_instance
+    Net::HTTPResponse.new(nil, nil, nil)
+  end
+
+  #
+  # Net::HTTP specific tests
+  #
+  def test_get__simple
+    # Don't check this specific condition against SSL, since API doesn't support it
+    return if use_ssl?
+
+    Net::HTTP.get default_uri
+
+    assert_metrics_recorded([
+      'External/all',
+      'External/localhost/Net::HTTP/GET',
+      'External/allOther',
+      'External/localhost/all'
+    ])
+  end
+
+  # https://newrelic.atlassian.net/browse/RUBY-835
+  def test_direct_get_request_doesnt_double_count
+    http = create_http(default_uri)
+    http.request(Net::HTTP::Get.new(default_uri.request_uri))
+
+    assert_metrics_recorded([
+      'External/localhost/Net::HTTP/GET'
+    ])
+  end
+end

data/test/multiverse/suites/rails/Envfile

@@ -4,7 +4,7 @@ end
 
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
-    gem 'rails', '~>4.0.0.rc1'
+    gem 'rails', '~>4.0.0'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   RB
 end

data/test/multiverse/suites/rails/view_instrumentation_test.rb

@@ -90,6 +90,12 @@ class ViewControllerTest < ActionController::TestCase
         .subscribe(/^process_action.action_controller$/)
     end
   end
+
+  def teardown
+    super
+    request_sampler = NewRelic::Agent.instance.instance_variable_get(:@request_sampler)
+    request_sampler.reset unless request_sampler.nil?
+  end
 end
 
 # SANITY TESTS - Make sure nothing raises errors,

data/test/multiverse/suites/resque/Envfile

@@ -13,12 +13,3 @@ gemfile <<-RB
   gem 'json'
   gem 'rake'
 RB
-
-before_suite do
-  ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"] = (20_000 + ($$ % 10_000)).to_s
-  system("echo 'port #{ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]}' | redis-server - > /dev/null &")
-end
-
-after_suite do
-  system("redis-cli -p #{ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]} shutdown")
-end

data/test/multiverse/suites/resque/instrumentation_test.rb

@@ -9,9 +9,26 @@ require 'test/unit'
 require 'logger'
 require 'newrelic_rpm'
 require 'fake_collector'
-require File.join(File.dirname(__FILE__), 'resque_setup')
 
 class ResqueTest < Test::Unit::TestCase
+  class JobForTesting
+    @queue = :resque_test
+    @count = 0
+
+    def self.reset_counter
+      @count = 0
+    end
+
+    def self.count
+      @count
+    end
+
+    def self.perform(sleep_duration=0)
+      sleep sleep_duration
+      @count += 1
+    end
+  end
+
   JOB_COUNT = 5
 
   def setup
@@ -19,9 +36,7 @@ class ResqueTest < Test::Unit::TestCase
     $collector.reset
     $collector.run
 
-    $redis.del('queue:resque_test')
-    $redis.set('index_key', 0)
-    Resque::Stat.clear('processed')
+    JobForTesting.reset_counter
 
     # From multiverse, we only run the Resque jobs inline to check that we
     # are properly instrumenting the methods. Testing of the forking/backgrounding
@@ -29,14 +44,14 @@ class ResqueTest < Test::Unit::TestCase
     Resque.inline = true
 
     JOB_COUNT.times do |i|
-      Resque.enqueue(JobForTesting, 'index_key', i + 1)
+      Resque.enqueue(JobForTesting)
     end
 
     NewRelic::Agent.instance.send(:transmit_data)
   end
 
   def test_all_jobs_ran
-    assert_equal(JOB_COUNT, $redis.get('index_key').to_i)
+    assert_equal(JOB_COUNT, JobForTesting.count)
   end
 
   def test_agent_posts_correct_metric_data

data/test/multiverse/suites/typhoeus/Envfile

@@ -0,0 +1,46 @@
+suite_condition("Typhoeus not supported in 1.8.6") do
+  RUBY_VERSION != '1.8.6'
+end
+
+gemfile <<-RB
+  gem 'typhoeus', '~> 0.6.3'
+  gem 'rack'
+  if RUBY_VERSION < '1.9.0'
+    gem 'json'
+  end
+RB
+
+gemfile <<-RB
+  # Compatibility issues with ethon 0.5.12 https://github.com/typhoeus/ethon/issues/51
+  gem 'ethon', '0.5.11'
+
+  gem 'typhoeus', '~> 0.5.4'
+  gem 'rack'
+  if RUBY_VERSION < '1.9.0'
+    gem 'json'
+  end
+RB
+
+# Earliest supported version
+gemfile <<-RB
+  # Compatibility issues with ethon 0.5.12 https://github.com/typhoeus/ethon/issues/51
+  gem 'ethon', '0.5.11'
+
+  gem 'typhoeus', '0.5.3'
+  gem 'rack'
+  if RUBY_VERSION < '1.9.0'
+    gem 'json'
+  end
+RB
+
+# Prior to supported versions
+gemfile <<-RB
+  # Compatibility issues with ethon 0.5.12 https://github.com/typhoeus/ethon/issues/51
+  gem 'ethon', '0.5.11'
+
+  gem 'typhoeus', '0.5.2'
+  gem 'rack'
+  if RUBY_VERSION < '1.9.0'
+    gem 'json'
+  end
+RB