RubyGems - wd_newrelic_rpm - Versions diffs - 3.5.5 → 3.5.6 - Mend

wd_newrelic_rpm 3.5.5 → 3.5.6

Files changed (146) hide show

@@ -8,3 +8,4 @@ Gemfile.lock
 .idea
 tags
 *.sqlite3
+*.pid

data/test/multiverse/lib/multiverse/environment.rb CHANGED

@@ -4,7 +4,7 @@ module Multiverse
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
   $: << File.expand_path(File.join(ROOT, 'lib'))
-  # Include from our unit testing path to share fake_collector and fake_service
+  # Include from our unit testing path to share fake_collector
   $: << File.expand_path(File.join(ROOT, '..', 'new_relic'))
   SUITES_DIRECTORY = ENV['SUITES_DIRECTORY'] || File.join(ROOT, '/suites')

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

@@ -56,6 +56,8 @@ module Multiverse
         if RUBY_VERSION > '1.8.7'
           f.puts "  gem 'test-unit', :require => 'test/unit'"
           f.puts "  gem 'debugger'" if include_debugger
+        else
+          f.puts "  gem 'ruby-debug'" if include_debugger
         end
       end
       puts yellow("Gemfile set to:") if verbose?

data/test/multiverse/suites/active_record/Envfile CHANGED

@@ -2,12 +2,12 @@ gemfile <<-RB
   if RUBY_VERSION == '1.8.6'
     gem 'activerecord', '2.3.14'
   elsif RUBY_PLATFORM == 'java'
-    gem 'jdbc-sqlite3'
-    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'activerecord-jdbcsqlite3-adapter', '1.2.2.1'
+    gem 'jdbc-sqlite3', '3.7.2'
     gem 'activerecord'
   else
     gem 'activerecord'
-    gem 'sqlite3'
+    gem 'sqlite3', '~> 1.3.5'
   end
 RB

data/test/multiverse/suites/active_record/ar_method_aliasing.rb CHANGED

@@ -13,7 +13,7 @@ class InstrumentActiveRecordMethods < Test::Unit::TestCase
   if RUBY_VERSION >= '1.8.7'
     if RUBY_PLATFORM == 'java'
       require 'jdbc/sqlite3'
-      @@adapter = 'jdbcsqlite3'
+      @@adapter = 'sqlite3'
     else
       require 'sqlite3'
       @@adapter = 'sqlite3'

data/test/multiverse/suites/active_record/config/newrelic.yml CHANGED

@@ -11,8 +11,8 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: 30303
-  transaction_tracer:
+  port: <%= 30_000 + ($$ % 10_000) %>
+  transaction_trace:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5

data/test/multiverse/suites/agent_only/Envfile CHANGED

@@ -1,4 +1,5 @@
 gemfile <<-RB
   gem 'rack'
+  gem 'rack-test'
   gem 'mocha', '< 0.13'
-RB
+RB

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

@@ -11,7 +11,7 @@ development:
   app_name: test
   host: 127.0.0.1
   api_host: 127.0.0.1
-  port: 30303
+  port: <%= 30_000 + ($$ % 10_000) %>
   transaction_tracer:
     record_sql: obfuscated
     enabled: true
@@ -20,3 +20,5 @@ development:
   capture_params: false
   log_level: debug
   log_file_path: agent.log
+  browser_monitoring:
+    auto_instrument: true

data/test/multiverse/suites/agent_only/cross_process_test.rb ADDED

@@ -0,0 +1,56 @@
+require 'rack/test'
+require 'fake_collector'
+require './testing_app'
+class CrossProcessTest < Test::Unit::TestCase
+  # Important because the hooks are global that we only wire one AgentHooks up
+  @@app = TestingApp.new
+  @@wrapper_app = NewRelic::Rack::AgentHooks.new(@@app)
+  def setup
+    $collector ||= NewRelic::FakeCollector.new
+    $collector.reset
+    $collector.mock['connect'] = [200, {'return_value' => {"agent_run_id" => 666 }}]
+    $collector.run
+    NewRelic::Agent.manual_start(
+      :cross_process_id => "boo",
+      :encoding_key => "\0",
+      :trusted_account_ids => [1])
+    NewRelic::Agent.instance.events.notify(:finished_configuring)
+    @@app.reset_headers
+    @@app.response = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
+  end
+  def teardown
+    NewRelic::Agent.shutdown
+  end
+  include Rack::Test::Methods
+  def app
+    @@wrapper_app
+  end
+  def test_cross_process_doesnt_modify_without_header
+    get '/'
+    assert_nil last_response.headers["X-NewRelic-App-Data"]
+  end
+  def test_cross_process_doesnt_modify_with_invalid_header
+    get '/', nil, {'X-NewRelic-ID' => Base64.encode64('otherjunk')}
+    assert_nil last_response.headers["X-NewRelic-App-Data"]
+  end
+  def test_cross_process_writes_out_information
+    get '/', nil, {'X-NewRelic-ID' => Base64.encode64('1#234')}
+    assert_not_nil last_response.headers["X-NewRelic-App-Data"]
+    metric = NewRelic::Agent.instance.stats_engine.lookup_stats('ClientApplication/1#234/all')
+    assert_equal 1, metric.call_count
+  end
+end

data/test/multiverse/suites/{logging → agent_only}/logging_test.rb RENAMED

@@ -36,27 +36,50 @@ class LoggingTest < Test::Unit::TestCase
   end
   def test_logs_raw_sql_warning
-    NewRelic::Agent.config.apply_config(:'transaction_tracer.record_sql' => 'obfuscated')
     running_agent_writes_to_log(
-      {:'transaction_tracer.record_sql' => 'raw'},
-      "Agent is configured to send raw SQL to the service")
+      {:'transaction_tracer.record_sql' => 'obfuscated'},
+      "Agent is configured to send raw SQL to the service") do
+      NewRelic::Agent.config.apply_config(:'transaction_tracer.record_sql' => 'raw')
+    end
   end
-  def test_logs_if_sending_errors_on_change
-    NewRelic::Agent.config.apply_config(:'error_collector.enabled' => false)
+  def test_logs_ssl_warning
+    running_agent_writes_to_log(
+      {:ssl => false},
+      "Agent is configured not to use SSL when communicating with New Relic's servers") do
+      NewRelic::Agent.config.apply_config(:ssl => false)
+    end
+  end
+  def test_logs_ssl_verify_cert_warning
     running_agent_writes_to_log(
-      {:'error_collector.enabled' => true},
-      "Errors will be sent")
+      {:ssl => false, :verify_certificate => false},
+      "Agent is configured to use SSL but to skip certificate validation when communicating with New Relic's servers") do
+      NewRelic::Agent.config.apply_config(:ssl => true, :verify_certificate => false)
+    end
   end
-  def test_logs_if_not_sending_errors_on_change
-    NewRelic::Agent.config.apply_config(:'error_collector.enabled' => true)
+  def test_logs_if_sending_errors_on_change
     running_agent_writes_to_log(
       {:'error_collector.enabled' => false},
-      "Errors will not be sent")
+      "Errors will be sent") do
+      NewRelic::Agent.config.apply_config(:'error_collector.enabled' => true)
+    end
+  end
+  def test_logs_if_not_sending_errors_on_change
+    running_agent_writes_to_log(
+      {:'error_collector.enabled' => true},
+      "Errors will not be sent") do
+      NewRelic::Agent.config.apply_config(:'error_collector.enabled' => false)
+    end
   end
   def test_logs_transaction_tracing_disabled
@@ -103,8 +126,7 @@ class LoggingTest < Test::Unit::TestCase
     $collector.run
     NewRelic::Agent.reset_config
-    NewRelic::Agent.agent = NewRelic::Agent::Agent.new
-    NewRelic::Control.instance(true)
+    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
     @logger = NewRelic::Agent::MemoryLogger.new
     NewRelic::Agent.logger = @logger
@@ -113,25 +135,23 @@ class LoggingTest < Test::Unit::TestCase
   def teardown
     $collector.reset
+    # Really clear out our agent instance since we set bad license keys
+    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
   end
   # Helpers
   def running_agent_writes_to_log(options, msg)
-    run_agent_with(options) do
-      saw?(msg)
-    end
+    NewRelic::Agent.manual_start(options)
+    yield if block_given?
+    NewRelic::Agent.shutdown
+    saw?(msg)
   end
   def with_connect_response(status=200, response={})
     $collector.mock['connect'] = [status, response]
   end
-  def run_agent_with(options = {})
-    NewRelic::Agent.manual_start(options)
-    NewRelic::Agent.shutdown
-    yield
-  end
   def saw?(*expected_messages)
     flattened = @logger.messages.flatten
     expected_messages.each do |expected|

data/test/multiverse/suites/agent_only/no_dns_resolv.rb ADDED

@@ -0,0 +1,17 @@
+class NoDnsResolv < Test::Unit::TestCase
+  def test_should_no_resolve_hostname_when_agent_is_disabled
+    Resolv.expects(:getaddress).never
+    NewRelic::Agent.manual_start(:monitor_mode => false)
+  end
+  def setup
+    NewRelic::Agent::Agent.instance_variable_set(:@instance, NewRelic::Agent::Agent.new)
+  end
+  def teardown
+    $collector.reset
+    NewRelic::Agent.shutdown
+    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
+  end
+end

data/test/multiverse/suites/{rum_auto_instrumentation/sanity_test.rb → agent_only/rum_instrumentation_test.rb} RENAMED

@@ -1,68 +1,47 @@
-require 'test/unit'
-require "rack/test"
+require 'rack/test'
 require 'new_relic/rack/browser_monitoring'
-require 'benchmark'
-class MyApp
-  # allow tests to set up the response they want.
-  class << self
-    def reset_headers
-      @headers = {'Content-Type' => 'text/html'}
-    end
-    attr_accessor :response
-    attr_accessor :headers
-    def add_header(key, value)
-      @headers[key] = value
-      @headers
-    end
-  end
-  def call(env)
-    [200, self.class.headers, [self.class.response]]
-  end
-end
-NewRelic::Agent.manual_start(:browser_key => 'browserKey', :application_id => 'appId',
-                             :beacon => 'beacon', :episodes_file => 'this_is_my_file')
-NewRelic::Agent.instance.instance_eval do
-  @beacon_configuration = NewRelic::Agent::BeaconConfiguration.new
-end
+require './testing_app'
 class RumAutoTest < Test::Unit::TestCase
-  def setup
-    MyApp.reset_headers
-  end
+  attr_reader :app
   include Rack::Test::Methods
-  def app
-    NewRelic::Rack::BrowserMonitoring.new(MyApp.new)
+  def setup
+    @inner_app = TestingApp.new
+    @app = NewRelic::Rack::BrowserMonitoring.new(@inner_app)
+    NewRelic::Agent.manual_start(:browser_key => 'browserKey', :application_id => 'appId',
+                                 :beacon => 'beacon', :episodes_file => 'this_is_my_file')
+    NewRelic::Agent.instance.instance_variable_set(
+      :@beacon_configuration, NewRelic::Agent::BeaconConfiguration.new)
   end
+  def teardown
+    NewRelic::Agent.shutdown
+  end
   def test_autoinstrumenation_is_active
-    MyApp.response = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
+    @inner_app.response = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
     get '/'
     assert(last_response.body =~ %r|<script|, "response body should include RUM auto instrumentation js:\n #{last_response.body}")
     assert(last_response.body =~ %r|NREUMQ|, "response body should include RUM auto instrumentation js:\n #{last_response.body}")
   end
   def test_autoinstrumenation_with_basic_page_puts_header_at_beggining_of_head
-    MyApp.response = "<html><head><title>foo</title></head><body><p>Hello World</p></body></html>"
+    @inner_app.response = "<html><head><title>foo</title></head><body><p>Hello World</p></body></html>"
     get '/'
     assert(last_response.body.include?('<html><head><script type="text/javascript">var NREUMQ=NREUMQ||[];NREUMQ.push(["mark","firstbyte",new Date().getTime()]);</script><title>foo</title></head><body>'))
   end
   def test_autoinstrumenation_with_body_only_puts_header_before_body
-    MyApp.response = "<html><body><p>Hello World</p></body></html>"
+    @inner_app.response = "<html><body><p>Hello World</p></body></html>"
     get '/'
     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_autoinstrumenation_with_X_UA_Compatible_puts_header_at_end_of_head
-    MyApp.response = '<html><head><meta http-equiv="X-UA-Compatible" content="IE=8;FF=3;OtherUA=4" /></head><body><p>Hello World</p></body></html>'
+    @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?(
       '<html><head><meta http-equiv="X-UA-Compatible" content="IE=8;FF=3;OtherUA=4" /><script type="text/javascript">var NREUMQ=NREUMQ||[];NREUMQ.push(["mark","firstbyte",new Date().getTime()]);</script></head><body>'
@@ -71,21 +50,21 @@ class RumAutoTest < Test::Unit::TestCase
   # regression
   def test_autoinstrumenation_fails_gracefully_with_X_UA_Compatible_and_no_close_head_tag_puts_header_before_body_tag
-    MyApp.response = '<html><head><meta http-equiv="X-UA-Compatible" content="IE=8;FF=3;OtherUA=4" /><body><p>Hello World</p></body></html>'
+    @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_autoinstrumenation_doesnt_run_for_crazy_shit_like_this
-    MyApp.response = '<html><head <body </body>'
+    @inner_app.response = '<html><head <body </body>'
     get '/'
     assert_equal('<html><head <body </body>', last_response.body)
   end
   def test_content_length_is_correctly_set_if_present
-    MyApp.response = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
-    content_length = MyApp.response.length
-    MyApp.add_header("Content-Length", content_length)
+    @inner_app.response = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
+    content_length = @inner_app.response.length
+    @inner_app.headers["Content-Length"] = content_length
     get '/'
     assert(last_response.headers['Content-Length'].to_i > content_length)
     assert_equal(last_response.body.length.to_s, last_response.headers['Content-Length'])
@@ -93,8 +72,8 @@ class RumAutoTest < Test::Unit::TestCase
   def test_xml_responses_arent_instrumented
     body = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
-    MyApp.response = body
-    MyApp.add_header("Content-Type", "text/xml")
+    @inner_app.response = body
+    @inner_app.headers["Content-Type"] = "text/xml"
     get '/'
     assert_equal(last_response.body, body)
   end

data/test/multiverse/suites/agent_only/service_timeout_test.rb CHANGED

@@ -1,8 +1,11 @@
 require 'socket'
 class ServiceTimeoutTest < Test::Unit::TestCase
+  PORT = 10_000 + ($$ % 10_000)
   def setup
-    hk = TCPServer.new('127.0.0.1',8081)
+    hk = TCPServer.new('127.0.0.1',PORT)
     Thread.new {
       client = hk.accept
@@ -14,8 +17,8 @@ class ServiceTimeoutTest < Test::Unit::TestCase
   end
   def test_service_timeout
-    server = NewRelic::Control::Server.new('localhost', 8081,'127.0.0.1')
-    NewRelic::Agent.config.apply_config(:timeout => 2)
+    server = NewRelic::Control::Server.new('localhost',PORT,'127.0.0.1')
+    NewRelic::Agent.config.apply_config(:timeout => 0.1)
     service = NewRelic::Agent::NewRelicService.new('deadbeef', server)

data/test/multiverse/suites/agent_only/ssl_test.rb ADDED

@@ -0,0 +1,22 @@
+class SSLTest < Test::Unit::TestCase
+  def setup
+    # This is similar to how jruby 1.6.8 behaves when jruby-openssl isn't
+    # installed
+    @original_ssl_config = NewRelic::Agent.config[:ssl]
+    NewRelic::Agent.config.apply_config(:ssl => true)
+    NewRelic::Agent.agent = NewRelic::Agent::Agent.new
+    Net::HTTPSession.any_instance.stubs('use_ssl=').raises(LoadError)
+  end
+  def teardown
+    NewRelic::Agent.config.apply_config(:ssl => @original_ssl_config)
+  end
+  def test_agent_shuts_down_when_ssl_is_on_but_unavailable
+    ::NewRelic::Agent.agent.expects(:shutdown)
+    ::NewRelic::Agent.expects(:finish_setup).never
+    ::NewRelic::Agent.agent.connect_in_foreground
+  ensure
+  end
+end

data/test/multiverse/suites/{no_load → agent_only}/start_up_test.rb RENAMED

@@ -7,8 +7,15 @@ class StartUpTest < Test::Unit::TestCase
     cmd = "bundle exec ruby -e '#{ruby}'"
     sin, sout, serr = Open3.popen3(cmd)
+    output = sout.read + serr.read
-    jruby_noise = "JRuby limited openssl loaded. http://jruby.org/openssl\ngem install jruby-openssl for full support.\n"
-    assert_equal '', (sout.read + serr.read).sub(jruby_noise, '')
+    jruby_noise = [
+      "JRuby limited openssl loaded. http://jruby.org/openssl\n",
+      "gem install jruby-openssl for full support.\n",
+      /Exception\: java\.lang.*\n/]
+    jruby_noise.each {|noise| output.gsub!(noise, "")}
+    assert_equal '', output
   end
 end