RubyGems - newrelic_rpm - Versions diffs - 3.4.1 → 3.4.2.beta1 - Mend

newrelic_rpm 3.4.1 → 3.4.2.beta1

Potentially problematic release.

This version of newrelic_rpm might be problematic. Click here for more details.

Files changed (81) hide show

data/CHANGELOG +7 -0
data/ReleaseNotes.md +638 -0
data/lib/new_relic/agent/agent.rb +44 -56
data/lib/new_relic/agent/beacon_configuration.rb +1 -1
data/lib/new_relic/agent/browser_monitoring.rb +80 -42
data/lib/new_relic/agent/configuration/defaults.rb +75 -0
data/lib/new_relic/agent/configuration/environment_source.rb +42 -0
data/lib/new_relic/agent/configuration/manager.rb +100 -0
data/lib/new_relic/agent/configuration/server_source.rb +24 -0
data/lib/new_relic/agent/configuration/yaml_source.rb +61 -0
data/lib/new_relic/agent/configuration.rb +48 -0
data/lib/new_relic/agent/error_collector.rb +10 -14
data/lib/new_relic/agent/instrumentation/active_record.rb +1 -5
data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +20 -4
data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +1 -1
data/lib/new_relic/agent/instrumentation/memcache.rb +2 -2
data/lib/new_relic/agent/instrumentation/metric_frame.rb +1 -1
data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +3 -3
data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +2 -2
data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
data/lib/new_relic/agent/method_tracer.rb +1 -1
data/lib/new_relic/agent/new_relic_service.rb +18 -9
data/lib/new_relic/agent/pipe_channel_manager.rb +5 -6
data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +2 -5
data/lib/new_relic/agent/sql_sampler.rb +11 -35
data/lib/new_relic/agent/stats_engine/transactions.rb +2 -2
data/lib/new_relic/agent/transaction_info.rb +24 -4
data/lib/new_relic/agent/transaction_sample_builder.rb +2 -3
data/lib/new_relic/agent/transaction_sampler.rb +9 -16
data/lib/new_relic/agent.rb +4 -1
data/lib/new_relic/collection_helper.rb +1 -1
data/lib/new_relic/commands/deployments.rb +5 -3
data/lib/new_relic/control/class_methods.rb +2 -3
data/lib/new_relic/control/frameworks/rails.rb +8 -8
data/lib/new_relic/control/frameworks/ruby.rb +2 -2
data/lib/new_relic/control/instance_methods.rb +26 -32
data/lib/new_relic/control/logging_methods.rb +5 -23
data/lib/new_relic/control/server_methods.rb +11 -18
data/lib/new_relic/control.rb +0 -1
data/lib/new_relic/delayed_job_injection.rb +1 -1
data/lib/new_relic/language_support.rb +8 -0
data/lib/new_relic/noticed_error.rb +1 -1
data/lib/new_relic/rack/browser_monitoring.rb +18 -6
data/lib/new_relic/version.rb +2 -2
data/newrelic.yml +0 -4
data/newrelic_rpm.gemspec +16 -6
data/test/config/newrelic.yml +3 -2
data/test/new_relic/agent/agent/connect_test.rb +88 -83
data/test/new_relic/agent/agent/start_test.rb +75 -80
data/test/new_relic/agent/agent/start_worker_thread_test.rb +18 -18
data/test/new_relic/agent/beacon_configuration_test.rb +13 -11
data/test/new_relic/agent/browser_monitoring_test.rb +69 -14
data/test/new_relic/agent/configuration/environment_source_test.rb +58 -0
data/test/new_relic/agent/configuration/manager_test.rb +120 -0
data/test/new_relic/agent/configuration/server_source_test.rb +28 -0
data/test/new_relic/agent/configuration/yaml_source_test.rb +56 -0
data/test/new_relic/agent/error_collector/notice_error_test.rb +63 -50
data/test/new_relic/agent/error_collector_test.rb +10 -12
data/test/new_relic/agent/new_relic_service_test.rb +11 -3
data/test/new_relic/agent/pipe_channel_manager_test.rb +19 -16
data/test/new_relic/agent/rpm_agent_test.rb +21 -19
data/test/new_relic/agent/sql_sampler_test.rb +55 -56
data/test/new_relic/agent/transaction_info_test.rb +45 -4
data/test/new_relic/agent/transaction_sampler_test.rb +48 -44
data/test/new_relic/agent_test.rb +68 -41
data/test/new_relic/collection_helper_test.rb +7 -8
data/test/new_relic/command/deployments_test.rb +12 -1
data/test/new_relic/control/frameworks/rails_test.rb +26 -0
data/test/new_relic/control/logging_methods_test.rb +77 -52
data/test/new_relic/control_test.rb +103 -126
data/test/new_relic/local_environment_test.rb +4 -6
data/test/new_relic/rack/browser_monitoring_test.rb +4 -4
data/test/new_relic/rack/developer_mode_test.rb +13 -7
data/test/new_relic/transaction_sample_test.rb +8 -2
data/test/script/build_test_gem.sh +9 -3
data/test/script/ci.sh +13 -3
data/test/test_helper.rb +9 -2
data/ui/helpers/developer_mode_helper.rb +2 -7
metadata +26 -11
data/lib/new_relic/control/configuration.rb +0 -206
data/test/new_relic/control/configuration_test.rb +0 -77

data/test/new_relic/control/configuration_test.rb DELETED Viewed

@@ -1,77 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'/../../test_helper'))
-class NewRelic::Control::ConfigurationTest < Test::Unit::TestCase
-  require 'new_relic/control/configuration'
-  include NewRelic::Control::Configuration
-  def setup
-    # The log stuff is memoized so let's clear it each time.
-    NewRelic::Control.instance.instance_variable_set '@log_path', nil
-    NewRelic::Control.instance.instance_variable_set '@log_file', nil
-    @root = ::Rails::VERSION::MAJOR == 3 ? Rails.root : RAILS_ROOT
-  end
-  def teardown
-    NewRelic::Control.instance.settings.delete('log_file_path')
-  end
-  def test_license_key_defaults_to_env_variable
-    ENV['NEWRELIC_LICENSE_KEY'] = nil
-    self.expects(:fetch).with('license_key', nil)
-    license_key
-    ENV['NEWRELIC_LICENSE_KEY'] = "a string"
-    self.expects(:fetch).with('license_key', 'a string')
-    license_key
-  end
-  def test_log_path_uses_default_if_not_set
-    NewRelic::Control.instance.setup_log
-    assert_equal(File.expand_path("log/newrelic_agent.log"),
-                 NewRelic::Control.instance.log_file)
-  end
-  def test_log_file_path_uses_given_value
-    Dir.stubs(:mkdir).returns(true)
-    NewRelic::Control.instance['log_file_path'] = 'lerg'
-    NewRelic::Control.instance.setup_log
-    assert_match(/\/lerg\/newrelic_agent.log/,
-                 NewRelic::Control.instance.log_file)
-    NewRelic::Control.instance.settings.delete('log_file_path') # = nil
-  end
-  def test_server_side_config_ignores_yaml
-    settings.merge! 'ssl' => false, 'transaction_tracer' => {'enabled' => true, 'stack_trace_threshold' => 1.0}, 'error_collector' => {'enabled' => true, 'ignore_errors' => 'ActiveRecord::RecordNotFound'}, 'capture_params' => false
-    merge_server_side_config 'transaction_tracer.enabled' => false, 'error_collector.enabled' => false
-    assert_equal({'ssl' => false, 'transaction_tracer' => {'enabled' => false}, 'error_collector' => {'enabled' => false}}, settings)
-  end
-  def test_install_browser_monitoring
-    require(File.expand_path(File.join(File.dirname(__FILE__),
-                         '/../../../lib/new_relic/rack/browser_monitoring')))
-    middleware = stub('middleware config')
-    config = stub('rails config', :middleware => middleware)
-    middleware.expects(:use).with(NewRelic::Rack::BrowserMonitoring)
-    NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => true }
-    NewRelic::Control.instance.instance_eval { @browser_monitoring_installed = false }
-    NewRelic::Control.instance.install_browser_monitoring(config)
-  end
-  def test_install_browser_monitoring_should_not_install_when_not_configured
-    middleware = stub('middleware config')
-    config = stub('rails config', :middleware => middleware)
-    middleware.expects(:use).never
-    NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => false }
-    NewRelic::Control.instance.instance_eval { @browser_monitoring_installed = false }
-    NewRelic::Control.instance.install_browser_monitoring(config)
-    NewRelic::Control.instance['browser_monitoring'] = { 'auto_instrument' => true }
-  end
-  def test_data_serialization_default_off
-    DependencyDetection.send(:class_variable_set, '@@items', [])
-    assert NewRelic::Control.instance.disable_serialization?
-  end
-end