newrelic_rpm 3.8.1.221 → 3.9.0.229

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

@@ -19,6 +19,10 @@ class LoggingTest < Minitest::Test
     NewRelic::Agent.stubs(:logger).returns(NewRelic::Agent::MemoryLogger.new)
   end
 
+  def teardown
+    NewRelic::Agent.config.reset_to_defaults
+  end
+
   def test_logs_app_name
     running_agent_writes_to_log(
        {:app_name => "My App"},
@@ -50,17 +54,17 @@ class LoggingTest < Minitest::Test
       {:'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')
+      NewRelic::Agent.config.add_config_for_testing(:'transaction_tracer.record_sql' => 'raw')
     end
 
   end
 
   def test_logs_ssl_warning
     running_agent_writes_to_log(
-      {:ssl => true},
+      {},
       "Agent is configured not to use SSL when communicating with New Relic's servers") do
-
-      NewRelic::Agent.config.apply_config(:ssl => false)
+      NewRelic::Agent.config.add_config_for_testing(:ssl => true )
+      NewRelic::Agent.config.add_config_for_testing(:ssl => false)
     end
   end
 
@@ -69,7 +73,7 @@ class LoggingTest < Minitest::Test
       {:'error_collector.enabled' => false},
       "Errors will be sent") do
 
-      NewRelic::Agent.config.apply_config(:'error_collector.enabled' => true)
+      NewRelic::Agent.config.add_config_for_testing(:'error_collector.enabled' => true)
     end
   end
 
@@ -78,7 +82,7 @@ class LoggingTest < Minitest::Test
       {:'error_collector.enabled' => true},
       "Errors will not be sent") do
 
-      NewRelic::Agent.config.apply_config(:'error_collector.enabled' => false)
+      NewRelic::Agent.config.add_config_for_testing(:'error_collector.enabled' => false)
     end
   end
 

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

@@ -17,14 +17,15 @@ class MarshalingTest < Minitest::Test
   def test_transaction_trace_marshaling
     # create fake transaction trace
     time = freeze_time
+    state = NewRelic::Agent::TransactionState.tl_get
     sampler = agent.transaction_sampler
-    sampler.on_start_transaction time, nil, {}
-    sampler.notice_push_frame "a"
-    sampler.notice_push_frame "ab"
+    sampler.on_start_transaction(state, time, nil)
+    sampler.notice_push_frame(state, "a")
+    sampler.notice_push_frame(state, "ab")
     advance_time 1
-    sampler.notice_pop_frame "ab"
-    sampler.notice_pop_frame "a"
-    sampler.on_finishing_transaction(OpenStruct.new(:name => 'path',
+    sampler.notice_pop_frame(state, "ab")
+    sampler.notice_pop_frame(state, "a")
+    sampler.on_finishing_transaction(state, OpenStruct.new(:name => 'path',
                                                :custom_parameters => {}))
 
     expected_sample = sampler.last_sample
@@ -68,11 +69,12 @@ class MarshalingTest < Minitest::Test
   end
 
   def test_sql_trace_data_marshalling
-    agent.sql_sampler.on_start_transaction(nil)
+    state = NewRelic::Agent::TransactionState.tl_get
+    agent.sql_sampler.on_start_transaction(state, nil)
     agent.sql_sampler.notice_sql("select * from test",
                                   "Database/test/select",
-                                  nil, 1.5)
-    agent.sql_sampler.on_finishing_transaction('txn')
+                                  nil, 1.5, state)
+    agent.sql_sampler.on_finishing_transaction(state, 'txn')
 
     agent.service.connect
     agent.send(:harvest_and_send_slowest_sql)

data/test/multiverse/suites/agent_only/script/loading.rb

@@ -14,7 +14,7 @@ DependencyDetection.items.each do |item|
     enable_everyone["disable_#{item.name}".to_sym] = false
   end
 end
-NewRelic::Agent.config.apply_config(enable_everyone)
+NewRelic::Agent.config.add_config_for_testing(enable_everyone)
 
 # Run dependency detection again!
 DependencyDetection.detect!

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

@@ -19,9 +19,13 @@ class ServiceTimeoutTest < Minitest::Test
     }
   end
 
+  def teardown
+    NewRelic::Agent.config.reset_to_defaults
+  end
+
   def test_service_timeout
     server = NewRelic::Control::Server.new('localhost',@port,'127.0.0.1')
-    NewRelic::Agent.config.apply_config(:timeout => 0.1)
+    NewRelic::Agent.config.add_config_for_testing(:timeout => 0.1)
 
     service = NewRelic::Agent::NewRelicService.new('deadbeef', server)
 

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

@@ -23,9 +23,10 @@ class TransactionIgnoringTest < Minitest::Test
 
   def trigger_transaction_with_slow_sql(txn_name)
     TestWidget.new.run_transaction(txn_name) do
+      state = NewRelic::Agent::TransactionState.tl_get
       NewRelic::Agent.instance.sql_sampler.notice_sql("select * from test",
                                    "Database/test/select",
-                                   nil, 1.5)
+                                   nil, 1.5, state)
     end
   end
 

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

@@ -32,7 +32,7 @@ class XraySessionsTest < Minitest::Test
   end
 
   def test_tags_transaction_traces_with_xray_id
-    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
+    session = build_xray_session('key_transaction_name' => 'Controller/Middleware/Rack/A')
     with_xray_sessions(session) do
       5.times { get '/?transaction_name=A' }
       trigger_harvest
@@ -43,12 +43,12 @@ class XraySessionsTest < Minitest::Test
 
     traces = posts.first.samples
     assert_equal(5, traces.size)
-    assert traces.all? { |t| t.metric_name == 'Controller/Rack/A' }
+    assert traces.all? { |t| t.metric_name == 'Controller/Middleware/Rack/A' }
     assert traces.all? { |t| t.xray_id == session['x_ray_id'] }
   end
 
   def test_does_not_collect_traces_for_non_xrayed_transactions
-    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
+    session = build_xray_session('key_transaction_name' => 'Controller/Middleware/Rack/A')
     with_xray_sessions(session) do
       get '/?transaction_name=OtherThing'
       get '/?transaction_name=A'
@@ -63,8 +63,8 @@ class XraySessionsTest < Minitest::Test
   end
 
   def test_gathers_transaction_traces_from_multiple_concurrent_xray_sessions
-    sessionA = build_xray_session('x_ray_id' => 12, 'key_transaction_name' => 'Controller/Rack/A')
-    sessionB = build_xray_session('x_ray_id' => 13, 'key_transaction_name' => 'Controller/Rack/B')
+    sessionA = build_xray_session('x_ray_id' => 12, 'key_transaction_name' => 'Controller/Middleware/Rack/A')
+    sessionB = build_xray_session('x_ray_id' => 13, 'key_transaction_name' => 'Controller/Middleware/Rack/B')
 
     with_xray_sessions(sessionA, sessionB) do
       2.times do
@@ -80,14 +80,14 @@ class XraySessionsTest < Minitest::Test
     traces = posts.first.samples
     assert_equal(4, traces.size)
 
-    tracesA = traces.select { |t| t.metric_name == 'Controller/Rack/A' }
-    tracesB = traces.select { |t| t.metric_name == 'Controller/Rack/B' }
+    tracesA = traces.select { |t| t.metric_name == 'Controller/Middleware/Rack/A' }
+    tracesB = traces.select { |t| t.metric_name == 'Controller/Middleware/Rack/B' }
     assert_equal(2, tracesA.size, "Expected 2 traces for transaction A")
     assert_equal(2, tracesB.size, "Expected 2 traces for transaction B")
   end
 
   def test_gathers_thread_profiles
-    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
+    session = build_xray_session('key_transaction_name' => 'Controller/Middleware/Rack/A')
     with_xray_sessions(session) do
       wait_for_backtrace_service_poll
       get '/?transaction_name=A&sleep=1'
@@ -115,7 +115,7 @@ class XraySessionsTest < Minitest::Test
     defaults = {
       "x_ray_id"              => next_xray_session_id,
       "xray_session_name"     => "Test XRay Session",
-      "key_transaction_name"  => "Controller/Rack/Transaction",
+      "key_transaction_name"  => "Controller/Middleware/Rack/Transaction",
       "requested_trace_count" => 10,
       "duration"              => 100,
       "sample_period"         => 0.1,

data/test/multiverse/suites/capistrano/Capfile

@@ -0,0 +1,26 @@
+# Load DSL and Setup Up Stages
+require 'capistrano/setup'
+
+# Includes default deployment tasks
+require 'capistrano/deploy'
+
+# Includes tasks from other gems included in your Gemfile
+#
+# For documentation on these, see for example:
+#
+#   https://github.com/capistrano/rvm
+#   https://github.com/capistrano/rbenv
+#   https://github.com/capistrano/chruby
+#   https://github.com/capistrano/bundler
+#   https://github.com/capistrano/rails
+#
+# require 'capistrano/rvm'
+# require 'capistrano/rbenv'
+# require 'capistrano/chruby'
+# require 'capistrano/bundler'
+# require 'capistrano/rails/assets'
+# require 'capistrano/rails/migrations'
+require 'new_relic/recipes'
+
+# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

data/test/multiverse/suites/capistrano/Envfile

@@ -0,0 +1,18 @@
+suite_condition("Capistrano 3 not supported in 1.8.7") do
+  RUBY_VERSION != '1.8.7'
+end
+
+gemfile <<-RB
+  gem 'capistrano', '~>3.2.1'
+  gem 'rack'
+RB
+
+gemfile <<-RB
+  gem 'capistrano', '~>3.1.0'
+  gem 'rack'
+RB
+
+gemfile <<-RB
+  gem 'capistrano', '~>3.0.1'
+  gem 'rack'
+RB

data/test/multiverse/suites/capistrano/config/deploy.rb

@@ -0,0 +1,10 @@
+# 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.
+
+set :application, 'test'
+
+# Since Capistrano 3 doesn't allow settings direct from command-line, add any
+# settings we want to conditionally toggle from tests in the following manner.
+set :newrelic_user, ENV["NEWRELIC_USER"] if ENV["NEWRELIC_USER"]
+set :newrelic_appname, ENV["NEWRELIC_APPNAME"] if ENV["NEWRELIC_APPNAME"]

data/test/multiverse/suites/capistrano/config/deploy/production.rb

@@ -0,0 +1,9 @@
+# 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.
+
+role :app, %w{deploy@example.com}
+role :web, %w{deploy@example.com}
+role :db,  %w{deploy@example.com}
+
+server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value

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

@@ -0,0 +1,21 @@
+---
+production:
+  error_collector:
+    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
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  api_port: <%= ENV["FAKE_RPM_SITE_PORT"] %>
+  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/capistrano/deployment_test.rb

@@ -0,0 +1,47 @@
+# 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 'fake_rpm_site'
+require 'multiverse_helpers'
+
+class DeploymentTest < Minitest::Test
+  def setup
+    $rpm_site ||= NewRelic::FakeRpmSite.new
+    $rpm_site.reset
+    $rpm_site.run
+  end
+
+  def test_deploys_to_configured_application
+    cap_it
+    assert_deployment_value("application_id", "test")
+  end
+
+  def test_deploys_with_commandline_parameter
+    # Capistrano 3 doesn't provide built-in commandline params -> settings
+    # We wire our own up via ENV to test setting out setting custom values
+    env = {
+      'NEWRELIC_USER'      => "someone",
+      'NEWRELIC_APPNAME'   => "somewhere"
+    }
+
+    cap_it(env)
+
+    assert_deployment_value("user",           "someone")
+    assert_deployment_value("application_id", "somewhere")
+  end
+
+  def assert_deployment_value(key, value)
+    assert_equal(1, $rpm_site.requests.count)
+    assert_equal(value, $rpm_site.requests.first["deployment"][key])
+  end
+
+  def cap_it(custom_env={})
+    cmd = "cap production newrelic:notice_deployment"
+    default_env = { 'FAKE_RPM_SITE_PORT' => $rpm_site.port.to_s }
+    output = with_environment(default_env.merge(custom_env)) do
+      `#{cmd}`
+    end
+    assert $?.success?, "cap command '#{cmd}' failed with output: #{output}"
+  end
+end

data/test/multiverse/suites/capistrano2/Capfile

@@ -0,0 +1,4 @@
+require 'new_relic/recipes'
+
+load 'deploy'
+load 'config/deploy'

data/test/multiverse/suites/capistrano2/Envfile

@@ -0,0 +1,4 @@
+gemfile <<-RB
+  gem 'capistrano', '~>2.15.5'
+  gem 'rack'
+RB

data/test/multiverse/suites/capistrano2/config/deploy.rb

@@ -0,0 +1,19 @@
+# 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 'bundler/capistrano'
+
+set :application, "new_relic_capistrano"
+set :repository,  "~/new_relic_capistrano"
+set :current_path, ""
+set :newrelic_license_key, "bootstrap_newrelic_admin_license_key_000"
+set :newrelic_rails_env, "development"
+
+set :scm, :none
+
+role :web, "localhost"
+role :app, "localhost"
+role :db,  "localhost"
+
+set :use_sudo, false

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

@@ -0,0 +1,21 @@
+---
+development:
+  error_collector:
+    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
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  api_port: <%= ENV["FAKE_RPM_SITE_PORT"] %>
+  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/capistrano2/deployment_test.rb

@@ -0,0 +1,38 @@
+# 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 'fake_rpm_site'
+require 'multiverse_helpers'
+
+class DeploymentTest < Minitest::Test
+  def setup
+    $rpm_site ||= NewRelic::FakeRpmSite.new
+    $rpm_site.reset
+    $rpm_site.run
+  end
+
+  def test_deploys_to_configured_application
+    cap_it
+    assert_deployment_value("application_id", "test")
+  end
+
+  def test_deploys_with_commandline_parameter
+    cap_it("-s newrelic_user=someone -s newrelic_appname=somewhere")
+    assert_deployment_value("user",           "someone")
+    assert_deployment_value("application_id", "somewhere")
+  end
+
+  def assert_deployment_value(key, value)
+    assert_equal(1, $rpm_site.requests.count)
+    assert_equal(value, $rpm_site.requests.first["deployment"][key])
+  end
+
+  def cap_it(options="")
+    cmd = "cap newrelic:notice_deployment #{options}"
+    output = with_environment('FAKE_RPM_SITE_PORT' => $rpm_site.port.to_s) do
+      `#{cmd}`
+    end
+    assert $?.success?, "cap command '#{cmd}' failed with output: #{output}"
+  end
+end

data/test/multiverse/suites/curb/Envfile

@@ -3,9 +3,12 @@ suite_condition("Curb is not useful on JRuby") do
 end
 
 gemfile <<-RB
-  gem 'curb', '0.8.1'
+  gem 'curb', '~> 0.8.4'
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
+
+  # We try translating URIs through Addressable if it's there, so test with it.
+  gem 'addressable', :require => 'addressable/uri'
 RB
 
 gemfile <<-RB
@@ -13,3 +16,9 @@ gemfile <<-RB
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 RB
+
+gemfile <<-RB
+  gem 'curb', '0.8.1'
+  gem 'rack'
+  gem 'json', :platforms => [:rbx, :mri_18]
+RB