newrelic_rpm 3.5.2.17 → 3.5.3.24
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of newrelic_rpm might be problematic. Click here for more details.
- data/.travis.yml +3 -1
- data/CHANGELOG +39 -23
- data/GUIDELINES_FOR_CONTRIBUTING.md +23 -2
- data/Rakefile +32 -0
- data/lib/new_relic/agent.rb +1 -0
- data/lib/new_relic/agent/agent.rb +45 -6
- data/lib/new_relic/agent/browser_monitoring.rb +36 -20
- data/lib/new_relic/agent/busy_calculator.rb +12 -4
- data/lib/new_relic/agent/configuration/defaults.rb +6 -1
- data/lib/new_relic/agent/configuration/environment_source.rb +14 -0
- data/lib/new_relic/agent/instrumentation/sinatra.rb +14 -10
- data/lib/new_relic/agent/new_relic_service.rb +192 -34
- data/lib/new_relic/agent/pipe_channel_manager.rb +1 -2
- data/lib/new_relic/agent/pipe_service.rb +5 -1
- data/lib/new_relic/agent/samplers/memory_sampler.rb +1 -1
- data/lib/new_relic/agent/sql_sampler.rb +29 -10
- data/lib/new_relic/agent/stats_engine/metric_stats.rb +40 -0
- data/lib/new_relic/agent/stats_engine/samplers.rb +1 -2
- data/lib/new_relic/agent/thread.rb +27 -0
- data/lib/new_relic/agent/thread_profiler.rb +295 -0
- data/lib/new_relic/agent/worker_loop.rb +29 -15
- data/lib/new_relic/control/frameworks/rails.rb +4 -4
- data/lib/new_relic/control/frameworks/rails3.rb +1 -1
- data/lib/new_relic/helper.rb +3 -0
- data/lib/new_relic/metric_data.rb +10 -2
- data/lib/new_relic/noticed_error.rb +5 -0
- data/lib/new_relic/transaction_sample.rb +23 -13
- data/lib/new_relic/transaction_sample/segment.rb +13 -15
- data/lib/new_relic/version.rb +1 -1
- data/lib/tasks/tests.rake +5 -11
- data/test/multiverse/.gitignore +10 -0
- data/test/multiverse/README.md +90 -0
- data/test/multiverse/Rakefile +17 -0
- data/test/multiverse/lib/multiverse/color.rb +13 -0
- data/test/multiverse/lib/multiverse/envfile.rb +66 -0
- data/test/multiverse/lib/multiverse/environment.rb +16 -0
- data/test/multiverse/lib/multiverse/output_collector.rb +29 -0
- data/test/multiverse/lib/multiverse/runner.rb +44 -0
- data/test/multiverse/lib/multiverse/suite.rb +162 -0
- data/test/multiverse/script/run_one +3 -0
- data/test/multiverse/script/runner +9 -0
- data/test/multiverse/suites/active_record/Envfile +13 -0
- data/test/multiverse/suites/active_record/ar_method_aliasing.rb +94 -0
- data/test/multiverse/suites/active_record/config/newrelic.yml +22 -0
- data/test/multiverse/suites/active_record/encoding_test.rb +26 -0
- data/test/multiverse/suites/agent_only/Envfile +3 -0
- data/test/multiverse/suites/agent_only/config/newrelic.yml +22 -0
- data/test/multiverse/suites/agent_only/http_response_code_test.rb +53 -0
- data/test/multiverse/suites/agent_only/marshaling_test.rb +109 -0
- data/test/multiverse/suites/agent_only/method_visibility_test.rb +98 -0
- data/test/multiverse/suites/agent_only/pipe_manager_test.rb +33 -0
- data/test/multiverse/suites/agent_only/service_timeout_test.rb +29 -0
- data/test/multiverse/suites/agent_only/test_trace_method_with_punctuation.rb +30 -0
- data/test/multiverse/suites/agent_only/test_trace_transaction_with_punctuation.rb +32 -0
- data/test/multiverse/suites/agent_only/thread_profiling_test.rb +80 -0
- data/test/multiverse/suites/datamapper/Envfile +8 -0
- data/test/multiverse/suites/datamapper/config/newrelic.yml +22 -0
- data/test/multiverse/suites/datamapper/encoding_test.rb +36 -0
- data/test/multiverse/suites/monitor_mode_false/Envfile +2 -0
- data/test/multiverse/suites/monitor_mode_false/config/newrelic.yml +25 -0
- data/test/multiverse/suites/monitor_mode_false/no_dns_resolv.rb +29 -0
- data/test/multiverse/suites/no_load/Envfile +2 -0
- data/test/multiverse/suites/no_load/config/newrelic.yml +23 -0
- data/test/multiverse/suites/no_load/start_up_test.rb +14 -0
- data/test/multiverse/suites/rails_3_error_tracing/Envfile +15 -0
- data/test/multiverse/suites/rails_3_error_tracing/config/newrelic.yml +165 -0
- data/test/multiverse/suites/rails_3_error_tracing/error_tracing_test.rb +236 -0
- data/test/multiverse/suites/rails_3_gc/Envfile +8 -0
- data/test/multiverse/suites/rails_3_gc/config/newrelic.yml +167 -0
- data/test/multiverse/suites/rails_3_gc/instrumentation_test.rb +92 -0
- data/test/multiverse/suites/rails_3_queue_time/Envfile +15 -0
- data/test/multiverse/suites/rails_3_queue_time/config/newrelic.yml +165 -0
- data/test/multiverse/suites/rails_3_queue_time/queue_time_test.rb +75 -0
- data/test/multiverse/suites/rails_3_views/.gitignore +3 -0
- data/test/multiverse/suites/rails_3_views/Envfile +16 -0
- data/test/multiverse/suites/rails_3_views/app/views/foos/_foo.html.haml +1 -0
- data/test/multiverse/suites/rails_3_views/app/views/test/_a_partial.html.erb +1 -0
- data/test/multiverse/suites/rails_3_views/app/views/test/_mid_partial.html.erb +1 -0
- data/test/multiverse/suites/rails_3_views/app/views/test/_top_partial.html.erb +3 -0
- data/test/multiverse/suites/rails_3_views/app/views/test/deep_partial.html.erb +3 -0
- data/test/multiverse/suites/rails_3_views/app/views/test/haml_view.html.haml +6 -0
- data/test/multiverse/suites/rails_3_views/app/views/test/index.html.erb +4 -0
- data/test/multiverse/suites/rails_3_views/config/newrelic.yml +164 -0
- data/test/multiverse/suites/rails_3_views/view_instrumentation_test.rb +245 -0
- data/test/multiverse/suites/resque/Envfile +21 -0
- data/test/multiverse/suites/resque/config/newrelic.yml +22 -0
- data/test/multiverse/suites/resque/dump.rdb +0 -0
- data/test/multiverse/suites/resque/instrumentation_test.rb +73 -0
- data/test/multiverse/suites/rum_auto_instrumentation/Envfile +4 -0
- data/test/multiverse/suites/rum_auto_instrumentation/config/newrelic.yml +24 -0
- data/test/multiverse/suites/rum_auto_instrumentation/problem_response.html +422 -0
- data/test/multiverse/suites/rum_auto_instrumentation/responses/worst_case_small.html +5000 -0
- data/test/multiverse/suites/rum_auto_instrumentation/sanity_test.rb +115 -0
- data/test/multiverse/suites/sinatra/Envfile +13 -0
- data/test/multiverse/suites/sinatra/config/newrelic.yml +24 -0
- data/test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb +76 -0
- data/test/multiverse/suites/sinatra/sinatra_routes_test.rb +46 -0
- data/test/multiverse/test/multiverse_test.rb +55 -0
- data/test/multiverse/test/suite_examples/one/a/Envfile +3 -0
- data/test/multiverse/test/suite_examples/one/a/a_test.rb +11 -0
- data/test/multiverse/test/suite_examples/one/a/config/newrelic.yml +24 -0
- data/test/multiverse/test/suite_examples/one/b/Envfile +3 -0
- data/test/multiverse/test/suite_examples/one/b/b_test.rb +11 -0
- data/test/multiverse/test/suite_examples/one/b/config/newrelic.yml +24 -0
- data/test/multiverse/test/suite_examples/three/a/Envfile +2 -0
- data/test/multiverse/test/suite_examples/three/a/fail_test.rb +6 -0
- data/test/multiverse/test/suite_examples/three/b/Envfile +2 -0
- data/test/multiverse/test/suite_examples/three/b/win_test.rb +6 -0
- data/test/multiverse/test/suite_examples/two/a/Envfile +1 -0
- data/test/multiverse/test/suite_examples/two/a/fail_test.rb +6 -0
- data/test/new_relic/agent/agent_test.rb +54 -2
- data/test/new_relic/agent/agent_test_controller.rb +1 -1
- data/test/new_relic/agent/agent_test_controller_test.rb +35 -5
- data/test/new_relic/agent/browser_monitoring_test.rb +8 -8
- data/test/new_relic/agent/configuration/environment_source_test.rb +16 -0
- data/test/new_relic/agent/method_tracer_test.rb +6 -6
- data/test/new_relic/agent/new_relic_service_test.rb +137 -20
- data/test/new_relic/agent/sql_sampler_test.rb +26 -0
- data/test/new_relic/agent/stats_engine/metric_stats_test.rb +1 -1
- data/test/new_relic/agent/stats_engine_test.rb +1 -0
- data/test/new_relic/agent/thread_profiler_test.rb +536 -0
- data/test/new_relic/agent/thread_test.rb +76 -0
- data/test/new_relic/agent/threaded_test.rb +65 -0
- data/test/new_relic/agent/transaction_sampler_test.rb +16 -13
- data/test/new_relic/agent/worker_loop_test.rb +20 -0
- data/test/new_relic/fake_collector.rb +103 -31
- data/test/new_relic/fake_service.rb +7 -1
- data/test/new_relic/metric_data_test.rb +45 -16
- data/test/new_relic/noticed_error_test.rb +14 -0
- data/test/new_relic/transaction_sample/segment_test.rb +23 -4
- data/test/new_relic/transaction_sample_test.rb +39 -0
- data/ui/views/layouts/newrelic_default.rhtml +1 -0
- data/ui/views/newrelic/threads.rhtml +2 -10
- metadata +88 -2
@@ -0,0 +1,80 @@
|
|
1
|
+
# https://newrelic.atlassian.net/wiki/display/eng/Agent+Thread+Profiling
|
2
|
+
# https://newrelic.atlassian.net/browse/RUBY-917
|
3
|
+
|
4
|
+
if RUBY_VERSION >= '1.9'
|
5
|
+
class ThreadProfilingTest < Test::Unit::TestCase
|
6
|
+
def setup
|
7
|
+
NewRelic::Agent.manual_start(:'thread_profiler.enabled' => true)
|
8
|
+
|
9
|
+
@agent = NewRelic::Agent.instance
|
10
|
+
@thread_profiler = @agent.thread_profiler
|
11
|
+
|
12
|
+
$collector ||= NewRelic::FakeCollector.new
|
13
|
+
$collector.reset
|
14
|
+
$collector.mock['connect'] = [200, {'return_value' => {"agent_run_id" => 666 }}]
|
15
|
+
$collector.mock['get_agent_commands'] = [200, {'return_value' => START_COMMAND}]
|
16
|
+
$collector.mock['agent_command_results'] = [200, {'return_value' => []}]
|
17
|
+
$collector.run
|
18
|
+
end
|
19
|
+
|
20
|
+
def teardown
|
21
|
+
$collector.reset
|
22
|
+
end
|
23
|
+
|
24
|
+
START_COMMAND = [[666,{
|
25
|
+
"name" => "start_profiler",
|
26
|
+
"arguments" => {
|
27
|
+
"profile_id" => -1,
|
28
|
+
"sample_period" => 0.01,
|
29
|
+
"duration" => 0.5,
|
30
|
+
"only_runnable_threads" => false,
|
31
|
+
"only_request_threads" => false,
|
32
|
+
"profile_agent_code" => false
|
33
|
+
}
|
34
|
+
}]]
|
35
|
+
|
36
|
+
STOP_COMMAND = [[666,{
|
37
|
+
"name" => "stop_profiler",
|
38
|
+
"arguments" => {
|
39
|
+
"profile_id" => -1,
|
40
|
+
"report_data" => true
|
41
|
+
}
|
42
|
+
}]]
|
43
|
+
|
44
|
+
# These are potentially fragile for being timing based
|
45
|
+
# START_COMMAND with 0.01 sampling and 0.5 duration expects to get
|
46
|
+
# roughly 50 polling cycles in. We check signficiantly less than that.
|
47
|
+
|
48
|
+
# STOP_COMMAND when immediately issued after a START_COMMAND is expected
|
49
|
+
# go only let a few cycles through, so we check less than 10
|
50
|
+
|
51
|
+
def test_thread_profiling
|
52
|
+
@agent.send(:check_for_agent_commands)
|
53
|
+
sleep(1)
|
54
|
+
NewRelic::Agent.shutdown
|
55
|
+
|
56
|
+
profile_data = $collector.calls_for('profile_data')[0]
|
57
|
+
assert_equal(666, profile_data[0])
|
58
|
+
|
59
|
+
poll_count = profile_data[1][0][3]
|
60
|
+
assert poll_count > 25, "Expected poll_count > 25, but was #{poll_count}"
|
61
|
+
end
|
62
|
+
|
63
|
+
def test_thread_profiling_can_stop
|
64
|
+
@agent.send(:check_for_agent_commands)
|
65
|
+
|
66
|
+
$collector.mock['get_agent_commands'] = [200, {'return_value' => STOP_COMMAND}]
|
67
|
+
@agent.send(:check_for_agent_commands)
|
68
|
+
|
69
|
+
sleep(0.1)
|
70
|
+
NewRelic::Agent.shutdown
|
71
|
+
|
72
|
+
profile_data = $collector.calls_for('profile_data')[0]
|
73
|
+
assert_equal(666, profile_data[0])
|
74
|
+
|
75
|
+
poll_count = profile_data[1][0][3]
|
76
|
+
assert poll_count < 10, "Expected poll_count < 10, but was #{poll_count}"
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
@@ -0,0 +1,22 @@
|
|
1
|
+
---
|
2
|
+
development:
|
3
|
+
error_collector:
|
4
|
+
capture_source: true
|
5
|
+
enabled: true
|
6
|
+
apdex_t: 0.5
|
7
|
+
ssl: false
|
8
|
+
monitor_mode: true
|
9
|
+
license_key: bootstrap_newrelic_admin_license_key_000
|
10
|
+
developer_mode: false
|
11
|
+
app_name: test
|
12
|
+
host: 127.0.0.1
|
13
|
+
api_host: 127.0.0.1
|
14
|
+
port: 30303
|
15
|
+
transaction_tracer:
|
16
|
+
record_sql: obfuscated
|
17
|
+
enabled: true
|
18
|
+
stack_trace_threshold: 0.5
|
19
|
+
transaction_threshold: 1.0
|
20
|
+
capture_params: false
|
21
|
+
log_level: debug
|
22
|
+
log_file_path: agent.log
|
@@ -0,0 +1,36 @@
|
|
1
|
+
# https://support.newrelic.com/tickets/2101
|
2
|
+
# https://github.com/newrelic/rpm/pull/42
|
3
|
+
# https://github.com/newrelic/rpm/pull/45
|
4
|
+
require 'test/unit'
|
5
|
+
require 'new_relic/agent/instrumentation/data_mapper'
|
6
|
+
|
7
|
+
class DatabaseAdapter
|
8
|
+
# we patch in here
|
9
|
+
def log(*args)
|
10
|
+
end
|
11
|
+
include ::NewRelic::Agent::Instrumentation::DataMapperInstrumentation
|
12
|
+
end
|
13
|
+
|
14
|
+
class EncodingTest < Test::Unit::TestCase
|
15
|
+
# datamapper wants a msg object
|
16
|
+
MSG = Object.new
|
17
|
+
def MSG.query
|
18
|
+
# Contains invalid UTF8 Byte
|
19
|
+
q = "select ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000"
|
20
|
+
if RUBY_VERSION >= '1.9'
|
21
|
+
# Force the query to an invalid encoding
|
22
|
+
q.force_encoding 'UTF-8'
|
23
|
+
end
|
24
|
+
q
|
25
|
+
end
|
26
|
+
def MSG.duration; 1.0; end
|
27
|
+
|
28
|
+
def test_should_not_bomb_out_if_a_query_is_in_an_invalid_encoding
|
29
|
+
if RUBY_VERSION >= '1.9'
|
30
|
+
assert_equal false, MSG.query.valid_encoding?
|
31
|
+
end
|
32
|
+
db = DatabaseAdapter.new
|
33
|
+
db.send(:log, MSG)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
@@ -0,0 +1,25 @@
|
|
1
|
+
development:
|
2
|
+
browser_monitoring:
|
3
|
+
auto_instrument: true
|
4
|
+
error_collector:
|
5
|
+
capture_source: true
|
6
|
+
enabled: true
|
7
|
+
apdex_t: 0.5
|
8
|
+
ssl: false
|
9
|
+
monitor_mode: false
|
10
|
+
license_key: bootstrap_newrelic_admin_license_key_000
|
11
|
+
developer_mode: false
|
12
|
+
app_name: test
|
13
|
+
host: staging-collector.newrelic.com
|
14
|
+
api_host: 127.0.0.1
|
15
|
+
port: 80
|
16
|
+
transaction_tracer:
|
17
|
+
record_sql: obfuscated
|
18
|
+
enabled: true
|
19
|
+
stack_trace_threshold: 0.5
|
20
|
+
transaction_threshold: 1.0
|
21
|
+
capture_params: false
|
22
|
+
log_level: debug
|
23
|
+
disable_serialization: false
|
24
|
+
log_file_name: mon_mode_false_newrelic.log
|
25
|
+
agent_enabled: false
|
@@ -0,0 +1,29 @@
|
|
1
|
+
require 'resolv'
|
2
|
+
|
3
|
+
class NoDnsResolv < Test::Unit::TestCase
|
4
|
+
def test_should_no_resolve_hostname_when_agent_is_disabled
|
5
|
+
Resolv.class_eval do
|
6
|
+
|
7
|
+
if RUBY_VERSION == '1.9.2'
|
8
|
+
class_variable_set(:@@getaddress_called,false)
|
9
|
+
else
|
10
|
+
@@getaddress_called = false
|
11
|
+
end
|
12
|
+
|
13
|
+
def self.getaddress(host)
|
14
|
+
@@getaddress_called = true
|
15
|
+
puts "address for #{host} requested"
|
16
|
+
"127.0.0.1"
|
17
|
+
end
|
18
|
+
|
19
|
+
def self.getaddress_called?
|
20
|
+
@@getaddress_called
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
require 'newrelic_rpm'
|
25
|
+
|
26
|
+
assert(!Resolv.getaddress_called?,
|
27
|
+
'called Resolv.getaddress when we should not have')
|
28
|
+
end
|
29
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
---
|
2
|
+
development:
|
3
|
+
error_collector:
|
4
|
+
capture_source: true
|
5
|
+
enabled: true
|
6
|
+
apdex_t: 0.5
|
7
|
+
ssl: false
|
8
|
+
monitor_mode: true
|
9
|
+
license_key: bootstrap_newrelic_admin_license_key_000
|
10
|
+
developer_mode: false
|
11
|
+
app_name: test
|
12
|
+
host: 127.0.0.1
|
13
|
+
api_host: 127.0.0.1
|
14
|
+
port: 30303
|
15
|
+
transaction_tracer:
|
16
|
+
record_sql: obfuscated
|
17
|
+
enabled: true
|
18
|
+
stack_trace_threshold: 0.5
|
19
|
+
transaction_threshold: 1.0
|
20
|
+
capture_params: false
|
21
|
+
log_level: debug
|
22
|
+
#log_file_path: STDOUT
|
23
|
+
disable_serialization: false
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# RUBY-839 make sure there is no STDOUT chatter
|
2
|
+
require 'open3'
|
3
|
+
|
4
|
+
class StartUpTest < Test::Unit::TestCase
|
5
|
+
def test_should_not_print_to_stdout_when_logging_available
|
6
|
+
ruby = 'require "newrelic_rpm"; NewRelic::Agent.manual_start; NewRelic::Agent.shutdown'
|
7
|
+
cmd = "bundle exec ruby -e '#{ruby}'"
|
8
|
+
|
9
|
+
sin, sout, serr = Open3.popen3(cmd)
|
10
|
+
|
11
|
+
jruby_noise = "JRuby limited openssl loaded. http://jruby.org/openssl\ngem install jruby-openssl for full support.\n"
|
12
|
+
assert_equal '', (sout.read + serr.read).sub(jruby_noise, '')
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1,165 @@
|
|
1
|
+
#
|
2
|
+
# This file configures the NewRelic RPM Agent, NewRelic RPM monitors Rails
|
3
|
+
# applications with deep visibility and low overhead. For more information,
|
4
|
+
# visit www.newrelic.com.
|
5
|
+
#
|
6
|
+
#
|
7
|
+
#
|
8
|
+
# here are the settings that are common to all environments
|
9
|
+
common: &default_settings
|
10
|
+
|
11
|
+
# ============================== LICENSE KEY ===============================
|
12
|
+
# You must specify the licence key associated with your New Relic account.
|
13
|
+
# This key binds your Agent's data to your account in the New Relic RPM service.
|
14
|
+
|
15
|
+
#license_key: 'bootstrap_newrelic_admin_license_key_000'
|
16
|
+
#host: localhost
|
17
|
+
#port: 3000
|
18
|
+
|
19
|
+
license_key: 'bd0e1d52adade840f7ca727d29a86249e89a6f1c'
|
20
|
+
host: localhost
|
21
|
+
|
22
|
+
# Agent Enabled
|
23
|
+
# Use this setting to force the agent to run or not run.
|
24
|
+
# Default is 'auto' which means the agent will install and run only if a
|
25
|
+
# valid dispatcher such as Mongrel is running. This prevents it from running
|
26
|
+
# with Rake or the console. Set to false to completely turn the agent off
|
27
|
+
# regardless of the other settings. Valid values are true, false and auto.
|
28
|
+
# agent_enabled: auto
|
29
|
+
|
30
|
+
# Application Name
|
31
|
+
# Set this to be the name of your application as you'd like it show up in RPM.
|
32
|
+
# RPM will then auto-map instances of your application into a RPM "application"
|
33
|
+
# on your home dashboard page. This setting does not prevent you from manually
|
34
|
+
# defining applications.
|
35
|
+
app_name: Rails 3 view test ap
|
36
|
+
|
37
|
+
# When 'enabled' is turned on, the agent collects performance data by inserting lightweight
|
38
|
+
# tracers on key methods inside the rails framework and asynchronously aggregating
|
39
|
+
# and reporting this performance data to the NewRelic RPM service at newrelic.com.
|
40
|
+
enabled: false
|
41
|
+
|
42
|
+
# The newrelic agent generates its own log file to keep its logging information
|
43
|
+
# separate from that of your application. Specify its log level here.
|
44
|
+
log_level: debug
|
45
|
+
|
46
|
+
# The newrelic agent communicates with the RPM service via http by default.
|
47
|
+
# If you want to communicate via https to increase security, then turn on
|
48
|
+
# SSL by setting this value to true. Note, this will result in increased
|
49
|
+
# CPU overhead to perform the encryption involved in SSL communication, but this
|
50
|
+
# work is done asynchronously to the threads that process your application code, so
|
51
|
+
# it should not impact response times.
|
52
|
+
ssl: false
|
53
|
+
|
54
|
+
# Set your application's Apdex threshold value with the 'apdex_t' setting, in seconds. The
|
55
|
+
# apdex_t value determines the buckets used to compute your overall Apdex score. Requests
|
56
|
+
# that take less than apdex_t seconds to process will be classified as Satisfying transactions;
|
57
|
+
# more than apdex_t seconds as Tolerating transactions; and more than four times the apdex_t
|
58
|
+
# value as Frustrating transactions. For more
|
59
|
+
# about the Apdex standard, see http://support.newrelic.com/faqs/general/apdex
|
60
|
+
apdex_t: 1.0
|
61
|
+
|
62
|
+
|
63
|
+
# Proxy settings for connecting to the RPM server.
|
64
|
+
#
|
65
|
+
# If a proxy is used, the host setting is required. Other settings are optional. Default
|
66
|
+
# port is 8080.
|
67
|
+
#
|
68
|
+
# proxy_host: hostname
|
69
|
+
# proxy_port: 8080
|
70
|
+
# proxy_user:
|
71
|
+
# proxy_pass:
|
72
|
+
|
73
|
+
|
74
|
+
# Tells transaction tracer and error collector (when enabled) whether or not to capture HTTP params.
|
75
|
+
# When true, the RoR filter_parameter_logging mechanism is used so that sensitive parameters are not recorded
|
76
|
+
capture_params: true
|
77
|
+
|
78
|
+
|
79
|
+
# Transaction tracer captures deep information about slow
|
80
|
+
# transactions and sends this to the RPM service once a minute. Included in the
|
81
|
+
# transaction is the exact call sequence of the transactions including any SQL statements
|
82
|
+
# issued.
|
83
|
+
transaction_tracer:
|
84
|
+
|
85
|
+
# Transaction tracer is enabled by default. Set this to false to turn it off. This feature
|
86
|
+
# is only available at the Silver and above product levels.
|
87
|
+
enabled: true
|
88
|
+
|
89
|
+
# Threshold in seconds for when to collect a transaction trace. When the response time of
|
90
|
+
# a controller action exceeds this threshold, a transaction trace will be recorded and sent
|
91
|
+
# to RPM. Valid values are any float value, or (default) "apdex_f", which will use the
|
92
|
+
# threshold for an dissatisfying Apdex controller action - four times the Apdex T value.
|
93
|
+
transaction_threshold: apdex_f
|
94
|
+
|
95
|
+
# When transaction tracer is on, SQL statements can optionally be recorded. The recorder
|
96
|
+
# has three modes, "off" which sends no SQL, "raw" which sends the SQL statement in its
|
97
|
+
# original form, and "obfuscated", which strips out numeric and string literals
|
98
|
+
record_sql: obfuscated
|
99
|
+
|
100
|
+
# Threshold in seconds for when to collect stack trace for a SQL call. In other words,
|
101
|
+
# when SQL statements exceed this threshold, then capture and send to RPM the current
|
102
|
+
# stack trace. This is helpful for pinpointing where long SQL calls originate from
|
103
|
+
stack_trace_threshold: 0.500
|
104
|
+
|
105
|
+
# Error collector captures information about uncaught exceptions and sends them to RPM for
|
106
|
+
# viewing
|
107
|
+
error_collector:
|
108
|
+
|
109
|
+
# Error collector is enabled by default. Set this to false to turn it off. This feature
|
110
|
+
# is only available at the Silver and above product levels
|
111
|
+
enabled: true
|
112
|
+
|
113
|
+
# Tells error collector whether or not to capture a source snippet around the place of the
|
114
|
+
# error when errors are View related.
|
115
|
+
capture_source: true
|
116
|
+
|
117
|
+
# To stop specific errors from reporting to RPM, set this property to comma separated
|
118
|
+
# values
|
119
|
+
#
|
120
|
+
#ignore_errors: ActionController::RoutingError, ...
|
121
|
+
ignore_errors: IgnoredError
|
122
|
+
|
123
|
+
# (Advanced) Uncomment this to ensure the cpu and memory samplers won't run. Useful when you
|
124
|
+
# are using the agent to monitor an external resource
|
125
|
+
# disable_samplers: true
|
126
|
+
|
127
|
+
# override default settings based on your application's environment
|
128
|
+
|
129
|
+
# NOTE if your application has other named environments, you should
|
130
|
+
# provide newrelic conifguration settings for these enviromnents here.
|
131
|
+
|
132
|
+
development:
|
133
|
+
<<: *default_settings
|
134
|
+
# turn off communication to RPM service in development mode.
|
135
|
+
# NOTE: for initial evaluation purposes, you may want to temporarily turn
|
136
|
+
# the agent on in development mode.
|
137
|
+
enabled: true
|
138
|
+
|
139
|
+
# When running in Developer Mode, the New Relic Agent will present
|
140
|
+
# performance information on the last 100 transactions you have
|
141
|
+
# executed since starting the mongrel. to view this data, go to
|
142
|
+
# http://localhost:3000/newrelic
|
143
|
+
developer: true
|
144
|
+
|
145
|
+
test:
|
146
|
+
<<: *default_settings
|
147
|
+
# it almost never makes sense to turn on the agent when running unit, functional or
|
148
|
+
# integration tests or the like.
|
149
|
+
enabled: true
|
150
|
+
log_level: debug
|
151
|
+
|
152
|
+
# Turn on the agent in production for 24x7 monitoring. NewRelic testing shows
|
153
|
+
# an average performance impact of < 5 ms per transaction, you you can leave this on
|
154
|
+
# all the time without incurring any user-visible performance degredation.
|
155
|
+
production:
|
156
|
+
<<: *default_settings
|
157
|
+
enabled: true
|
158
|
+
|
159
|
+
# many applications have a staging environment which behaves identically to production.
|
160
|
+
# Support for that environment is provided here. By default, the staging environment has
|
161
|
+
# the agent turned on.
|
162
|
+
staging:
|
163
|
+
<<: *default_settings
|
164
|
+
enabled: true
|
165
|
+
app_name: My Application (Staging)
|
@@ -0,0 +1,236 @@
|
|
1
|
+
# https://newrelic.atlassian.net/browse/RUBY-747
|
2
|
+
|
3
|
+
ENV['NEW_RELIC_DISPATCHER'] = 'test'
|
4
|
+
|
5
|
+
require 'action_controller/railtie'
|
6
|
+
require 'rails/test_unit/railtie'
|
7
|
+
require 'rails/test_help'
|
8
|
+
require 'test/unit'
|
9
|
+
require 'new_relic/rack/error_collector'
|
10
|
+
require 'fake_service'
|
11
|
+
|
12
|
+
|
13
|
+
# BEGIN RAILS APP
|
14
|
+
|
15
|
+
class MyApp < Rails::Application
|
16
|
+
# We need a secret token for session, cookies, etc.
|
17
|
+
config.active_support.deprecation = :log
|
18
|
+
config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
|
19
|
+
end
|
20
|
+
MyApp.initialize!
|
21
|
+
|
22
|
+
MyApp.routes.draw do
|
23
|
+
get('/bad_route' => 'Test#controller_error',
|
24
|
+
:constraints => lambda do |_|
|
25
|
+
raise ActionController::RoutingError.new('this is an uncaught routing error')
|
26
|
+
end)
|
27
|
+
match '/:controller(/:action(/:id))'
|
28
|
+
end
|
29
|
+
|
30
|
+
class ApplicationController < ActionController::Base; end
|
31
|
+
|
32
|
+
# a basic active model compliant model we can render
|
33
|
+
class Foo
|
34
|
+
extend ActiveModel::Naming
|
35
|
+
def to_model
|
36
|
+
self
|
37
|
+
end
|
38
|
+
|
39
|
+
def valid?() true end
|
40
|
+
def new_record?() true end
|
41
|
+
def destroyed?() true end
|
42
|
+
|
43
|
+
def raise_error
|
44
|
+
raise 'this is an uncaught model error'
|
45
|
+
end
|
46
|
+
|
47
|
+
def errors
|
48
|
+
obj = Object.new
|
49
|
+
def obj.[](key) [] end
|
50
|
+
def obj.full_messages() [] end
|
51
|
+
obj
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
class TestController < ApplicationController
|
56
|
+
include Rails.application.routes.url_helpers
|
57
|
+
newrelic_ignore :only => :ignored_action
|
58
|
+
|
59
|
+
def controller_error
|
60
|
+
raise 'this is an uncaught controller error'
|
61
|
+
end
|
62
|
+
|
63
|
+
def view_error
|
64
|
+
render :inline => "<% raise 'this is an uncaught view error' %>"
|
65
|
+
end
|
66
|
+
|
67
|
+
def model_error
|
68
|
+
Foo.new.raise_error
|
69
|
+
end
|
70
|
+
|
71
|
+
def ignored_action
|
72
|
+
raise 'this error should not be noticed'
|
73
|
+
end
|
74
|
+
|
75
|
+
def ignored_error
|
76
|
+
raise IgnoredError.new('this error should not be noticed')
|
77
|
+
end
|
78
|
+
|
79
|
+
def server_ignored_error
|
80
|
+
raise ServerIgnoredError.new('this is a server ignored error')
|
81
|
+
end
|
82
|
+
|
83
|
+
def noticed_error
|
84
|
+
newrelic_notice_error(RuntimeError.new('this error should be noticed'))
|
85
|
+
render :text => "Shoulda noticed an error"
|
86
|
+
end
|
87
|
+
end
|
88
|
+
# END RAILS APP
|
89
|
+
|
90
|
+
class IgnoredError < StandardError; end
|
91
|
+
class ServerIgnoredError < StandardError; end
|
92
|
+
|
93
|
+
class TestControllerTest < ActionDispatch::IntegrationTest
|
94
|
+
def setup
|
95
|
+
NewRelic::Agent::Agent.instance_variable_set(:@instance, NewRelic::Agent::Agent.new)
|
96
|
+
|
97
|
+
@service = NewRelic::FakeService.new
|
98
|
+
NewRelic::Agent::Agent.instance.service = @service
|
99
|
+
|
100
|
+
NewRelic::Agent.manual_start
|
101
|
+
end
|
102
|
+
|
103
|
+
def teardown
|
104
|
+
NewRelic::Agent::Agent.instance.shutdown if NewRelic::Agent::Agent.instance
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
class ErrorsWithoutSSCTest < TestControllerTest
|
109
|
+
def setup
|
110
|
+
super
|
111
|
+
reset_error_collector
|
112
|
+
end
|
113
|
+
|
114
|
+
def reset_error_collector
|
115
|
+
@error_collector = NewRelic::Agent.instance.error_collector
|
116
|
+
NewRelic::Agent.instance.error_collector \
|
117
|
+
.instance_variable_set(:@ignore_filter, nil)
|
118
|
+
|
119
|
+
# sanity checks
|
120
|
+
assert(@error_collector.enabled?,
|
121
|
+
'error collector should be enabled')
|
122
|
+
assert(!NewRelic::Agent.instance.error_collector.ignore_error_filter,
|
123
|
+
'no ignore error filter should be set')
|
124
|
+
end
|
125
|
+
|
126
|
+
|
127
|
+
def test_error_collector_should_be_enabled
|
128
|
+
assert NewRelic::Agent.config[:agent_enabled]
|
129
|
+
assert NewRelic::Agent.config[:'error_collector.enabled']
|
130
|
+
assert @error_collector.enabled?
|
131
|
+
assert Rails.application.config.middleware.include?(NewRelic::Rack::ErrorCollector)
|
132
|
+
end
|
133
|
+
|
134
|
+
def test_should_capture_error_raised_in_view
|
135
|
+
get '/test/view_error'
|
136
|
+
assert_error_reported_once('this is an uncaught view error')
|
137
|
+
end
|
138
|
+
|
139
|
+
def test_should_capture_error_raised_in_controller
|
140
|
+
get '/test/controller_error'
|
141
|
+
assert_error_reported_once('this is an uncaught controller error')
|
142
|
+
end
|
143
|
+
|
144
|
+
def test_should_capture_error_raised_in_model
|
145
|
+
get '/test/model_error'
|
146
|
+
assert_error_reported_once('this is an uncaught model error')
|
147
|
+
end
|
148
|
+
|
149
|
+
def test_should_capture_noticed_error_in_controller
|
150
|
+
get '/test/noticed_error'
|
151
|
+
assert_error_reported_once('this error should be noticed')
|
152
|
+
end
|
153
|
+
|
154
|
+
def test_should_capture_manually_noticed_error
|
155
|
+
NewRelic::Agent.notice_error(RuntimeError.new('this is a noticed error'))
|
156
|
+
assert_error_reported_once('this is a noticed error')
|
157
|
+
end
|
158
|
+
|
159
|
+
def test_should_capture_routing_error
|
160
|
+
get '/bad_route'
|
161
|
+
assert_error_reported_once('this is an uncaught routing error')
|
162
|
+
end
|
163
|
+
|
164
|
+
def test_should_capture_request_uri_and_params
|
165
|
+
get '/bad_route?eat=static'
|
166
|
+
assert_equal('/bad_route',
|
167
|
+
@error_collector.errors[0].params[:request_uri])
|
168
|
+
assert_equal({'eat' => 'static'},
|
169
|
+
@error_collector.errors[0].params[:request_params])
|
170
|
+
end
|
171
|
+
|
172
|
+
def test_should_not_notice_errors_from_ignored_action
|
173
|
+
get '/test/ignored_action'
|
174
|
+
assert(@error_collector.errors.empty?,
|
175
|
+
'Noticed an error that should have been ignored')
|
176
|
+
end
|
177
|
+
|
178
|
+
def test_should_not_notice_ignored_error_classes
|
179
|
+
get '/test/ignored_error'
|
180
|
+
assert(@error_collector.errors.empty?,
|
181
|
+
'Noticed an error that should have been ignored')
|
182
|
+
end
|
183
|
+
|
184
|
+
def test_should_not_notice_filtered_errors
|
185
|
+
NewRelic::Agent.instance.error_collector.ignore_error_filter do |error|
|
186
|
+
!error.kind_of?(RuntimeError)
|
187
|
+
end
|
188
|
+
|
189
|
+
get 'test/controller_error'
|
190
|
+
assert(NewRelic::Agent.instance.error_collector.errors.empty?,
|
191
|
+
'Noticed an error that should have been ignored')
|
192
|
+
end
|
193
|
+
|
194
|
+
def test_should_notice_server_ignored_error_if_no_server_side_config
|
195
|
+
get '/test/server_ignored_error'
|
196
|
+
assert_error_reported_once('this is a server ignored error')
|
197
|
+
end
|
198
|
+
|
199
|
+
protected
|
200
|
+
|
201
|
+
def assert_error_reported_once(message)
|
202
|
+
assert_equal(message,
|
203
|
+
@error_collector.errors[0].message,
|
204
|
+
'This error type was not detected')
|
205
|
+
assert_equal(1, @error_collector.errors.size,
|
206
|
+
'Too many of this error type was detected')
|
207
|
+
end
|
208
|
+
end
|
209
|
+
|
210
|
+
class ErrorsWithSSCTest < ErrorsWithoutSSCTest
|
211
|
+
def setup
|
212
|
+
super
|
213
|
+
@service.mock['connect'] = {
|
214
|
+
"listen_to_server_config" => true,
|
215
|
+
"agent_run_id" => 1,
|
216
|
+
"error_collector.ignore_errors" => 'IgnoredError,ServerIgnoredError',
|
217
|
+
"error_collector.enabled" => true,
|
218
|
+
"error_collector.capture_source" => true,
|
219
|
+
"collect_errors" => true
|
220
|
+
}
|
221
|
+
|
222
|
+
# Force us to apply the mocked connect values to our configuration
|
223
|
+
NewRelic::Agent.instance.query_server_for_configuration
|
224
|
+
end
|
225
|
+
|
226
|
+
def test_should_notice_server_ignored_error_if_no_server_side_config
|
227
|
+
# Overrides test in base class, since doesn't apply
|
228
|
+
end
|
229
|
+
|
230
|
+
def test_should_ignore_server_ignored_errors
|
231
|
+
get '/test/server_ignored_error'
|
232
|
+
assert(@error_collector.errors.empty?,
|
233
|
+
'Noticed an error that should have been ignored')
|
234
|
+
end
|
235
|
+
|
236
|
+
end
|