wd_newrelic_rpm 3.3.4.1 → 3.5.5
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +20 -0
- data/.project +23 -0
- data/.travis.yml +9 -0
- data/CHANGELOG +317 -39
- data/GUIDELINES_FOR_CONTRIBUTING.md +76 -0
- data/Gemfile +16 -0
- data/LICENSE +1 -1
- data/{README.rdoc → README.md} +71 -55
- data/Rakefile +62 -0
- data/bin/mongrel_rpm +1 -1
- data/config.dot +290 -0
- data/config/database.yml +5 -0
- data/init.rb +31 -0
- data/lib/new_relic/agent.rb +31 -60
- data/lib/new_relic/agent/agent.rb +277 -502
- data/lib/new_relic/agent/agent_logger.rb +165 -0
- data/lib/new_relic/agent/audit_logger.rb +72 -0
- data/lib/new_relic/agent/beacon_configuration.rb +36 -50
- data/lib/new_relic/agent/browser_monitoring.rb +114 -61
- data/lib/new_relic/agent/busy_calculator.rb +14 -6
- data/lib/new_relic/agent/configuration.rb +74 -0
- data/lib/new_relic/agent/configuration/defaults.rb +126 -0
- data/lib/new_relic/agent/configuration/environment_source.rb +49 -0
- data/lib/new_relic/agent/configuration/manager.rb +136 -0
- data/lib/new_relic/agent/configuration/mask_defaults.rb +10 -0
- data/lib/new_relic/agent/configuration/server_source.rb +27 -0
- data/lib/new_relic/agent/configuration/yaml_source.rb +63 -0
- data/lib/new_relic/agent/cross_process_monitoring.rb +43 -0
- data/lib/new_relic/agent/database.rb +39 -26
- data/lib/new_relic/agent/error_collector.rb +48 -49
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record.rb +4 -7
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +1 -1
- data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
- data/lib/new_relic/agent/instrumentation/browser_monitoring_timings.rb +41 -0
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +35 -12
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -12
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +2 -2
- data/lib/new_relic/agent/instrumentation/memcache.rb +6 -6
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
- data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
- data/lib/new_relic/agent/instrumentation/metric_frame.rb +4 -14
- data/lib/new_relic/agent/instrumentation/metric_frame/pop.rb +1 -1
- data/lib/new_relic/agent/instrumentation/net.rb +1 -1
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +6 -20
- data/lib/new_relic/agent/instrumentation/queue_time.rb +2 -2
- data/lib/new_relic/agent/instrumentation/rack.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +7 -7
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/errors.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +5 -5
- data/lib/new_relic/agent/instrumentation/rails3/errors.rb +6 -2
- data/lib/new_relic/agent/instrumentation/resque.rb +81 -0
- data/lib/new_relic/agent/instrumentation/sinatra.rb +21 -10
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb +5 -4
- data/lib/new_relic/agent/method_tracer.rb +11 -9
- data/lib/new_relic/agent/new_relic_service.rb +379 -0
- data/lib/new_relic/agent/pipe_channel_manager.rb +175 -0
- data/lib/new_relic/agent/pipe_service.rb +58 -0
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +86 -0
- data/lib/new_relic/agent/samplers/memory_sampler.rb +6 -8
- data/lib/new_relic/agent/sql_sampler.rb +31 -74
- data/lib/new_relic/agent/stats_engine.rb +0 -5
- data/lib/new_relic/agent/stats_engine/gc_profiler.rb +40 -24
- data/lib/new_relic/agent/stats_engine/metric_stats.rb +89 -14
- data/lib/new_relic/agent/stats_engine/samplers.rb +9 -7
- data/lib/new_relic/agent/stats_engine/transactions.rb +20 -12
- data/lib/new_relic/agent/thread.rb +32 -0
- data/lib/new_relic/agent/thread_profiler.rb +306 -0
- data/lib/new_relic/agent/transaction_info.rb +24 -4
- data/lib/new_relic/agent/transaction_sample_builder.rb +12 -13
- data/lib/new_relic/agent/transaction_sampler.rb +49 -65
- data/lib/new_relic/agent/worker_loop.rb +31 -25
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/commands/deployments.rb +19 -10
- data/lib/new_relic/control.rb +1 -3
- data/lib/new_relic/control/class_methods.rb +10 -5
- data/lib/new_relic/control/frameworks/merb.rb +0 -6
- data/lib/new_relic/control/frameworks/rails.rb +30 -45
- data/lib/new_relic/control/frameworks/rails3.rb +23 -18
- data/lib/new_relic/control/frameworks/rails4.rb +23 -0
- data/lib/new_relic/control/frameworks/ruby.rb +2 -23
- data/lib/new_relic/control/instance_methods.rb +35 -73
- data/lib/new_relic/control/instrumentation.rb +7 -12
- data/lib/new_relic/control/server_methods.rb +17 -19
- data/lib/new_relic/delayed_job_injection.rb +2 -2
- data/lib/new_relic/helper.rb +34 -0
- data/lib/new_relic/language_support.rb +56 -37
- data/lib/new_relic/local_environment.rb +32 -67
- data/lib/new_relic/metric_data.rb +10 -2
- data/lib/new_relic/metric_spec.rb +7 -3
- data/lib/new_relic/noticed_error.rb +32 -9
- data/lib/new_relic/rack.rb +4 -0
- data/lib/new_relic/rack/browser_monitoring.rb +34 -25
- data/lib/new_relic/rack/developer_mode.rb +3 -0
- data/lib/new_relic/rack/error_collector.rb +56 -0
- data/lib/new_relic/stats.rb +9 -7
- data/lib/new_relic/transaction_sample.rb +19 -18
- data/lib/new_relic/transaction_sample/segment.rb +13 -15
- data/lib/new_relic/version.rb +19 -3
- data/lib/newrelic_rpm.rb +1 -1
- data/lib/tasks/tests.rake +6 -8
- data/newrelic.yml +15 -32
- data/newrelic_rpm.gemspec +224 -43
- data/newrelic_rpm.gemspec.erb +54 -0
- data/test/config/newrelic.yml +4 -3
- data/test/config/test_control.rb +18 -18
- data/test/fixtures/gemspec_no_build.rb +442 -0
- data/test/fixtures/gemspec_with_build.rb +442 -0
- data/test/fixtures/gemspec_with_build_and_stage.rb +442 -0
- data/test/intentional_fail.rb +10 -0
- data/test/multiverse/.gitignore +10 -0
- data/test/multiverse/README.md +85 -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 +4 -0
- data/test/multiverse/suites/agent_only/audit_log_test.rb +99 -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/config_file_loading/Envfile +7 -0
- data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb +106 -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/logging/Envfile +4 -0
- data/test/multiverse/suites/logging/config/newrelic.yml +22 -0
- data/test/multiverse/suites/logging/logging_test.rb +143 -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 +22 -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/responses/worst_case_small.html +5000 -0
- data/test/multiverse/suites/rum_auto_instrumentation/sanity_test.rb +102 -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 +77 -0
- data/test/multiverse/suites/sinatra/sinatra_routes_test.rb +46 -0
- data/test/multiverse/suites/sinatra/sinatra_test.rb +55 -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/connect_test.rb +151 -227
- data/test/new_relic/agent/agent/start_test.rb +68 -118
- data/test/new_relic/agent/agent/start_worker_thread_test.rb +12 -74
- data/test/new_relic/agent/agent_logger_test.rb +153 -0
- data/test/new_relic/agent/agent_test.rb +116 -30
- data/test/new_relic/agent/agent_test_controller.rb +1 -1
- data/test/new_relic/agent/agent_test_controller_test.rb +42 -10
- data/test/new_relic/agent/audit_logger_test.rb +105 -0
- data/test/new_relic/agent/beacon_configuration_test.rb +63 -67
- data/test/new_relic/agent/browser_monitoring_test.rb +151 -79
- data/test/new_relic/agent/busy_calculator_test.rb +7 -0
- data/test/new_relic/agent/configuration/environment_source_test.rb +79 -0
- data/test/new_relic/agent/configuration/manager_test.rb +204 -0
- data/test/new_relic/agent/configuration/server_source_test.rb +45 -0
- data/test/new_relic/agent/configuration/yaml_source_test.rb +75 -0
- data/test/new_relic/agent/cross_process_monitoring_test.rb +77 -0
- data/test/new_relic/agent/database_test.rb +12 -11
- data/test/new_relic/agent/error_collector/notice_error_test.rb +64 -53
- data/test/new_relic/agent/error_collector_test.rb +33 -19
- data/test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb +60 -30
- data/test/new_relic/agent/instrumentation/browser_monitoring_timings_test.rb +39 -0
- data/test/new_relic/agent/instrumentation/metric_frame/pop_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/metric_frame_test.rb +6 -0
- data/test/new_relic/agent/instrumentation/queue_time_test.rb +14 -0
- data/test/new_relic/agent/instrumentation/sinatra_test.rb +25 -0
- data/test/new_relic/agent/instrumentation/task_instrumentation_test.rb +2 -2
- data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb +4 -10
- data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb +3 -15
- data/test/new_relic/agent/method_tracer_test.rb +7 -6
- data/test/new_relic/agent/mock_scope_listener.rb +3 -0
- data/test/new_relic/agent/new_relic_service_test.rb +376 -0
- data/test/new_relic/agent/pipe_channel_manager_test.rb +131 -0
- data/test/new_relic/agent/pipe_service_test.rb +113 -0
- data/test/new_relic/agent/rpm_agent_test.rb +27 -50
- data/test/new_relic/agent/sql_sampler_test.rb +81 -56
- data/test/new_relic/agent/stats_engine/metric_stats/harvest_test.rb +3 -20
- data/test/new_relic/agent/stats_engine/metric_stats_test.rb +12 -1
- data/test/new_relic/agent/stats_engine_test.rb +17 -8
- data/test/new_relic/agent/thread_profiler_test.rb +537 -0
- data/test/new_relic/agent/thread_test.rb +89 -0
- data/test/new_relic/agent/threaded_test.rb +65 -0
- data/test/new_relic/agent/transaction_info_test.rb +45 -4
- data/test/new_relic/agent/transaction_sample_builder_test.rb +8 -7
- data/test/new_relic/agent/transaction_sampler_test.rb +193 -204
- data/test/new_relic/agent/worker_loop_test.rb +26 -11
- data/test/new_relic/agent_test.rb +113 -33
- data/test/new_relic/collection_helper_test.rb +7 -8
- data/test/new_relic/command/deployments_test.rb +18 -2
- data/test/new_relic/control/class_methods_test.rb +0 -18
- data/test/new_relic/control/frameworks/rails_test.rb +26 -0
- data/test/new_relic/control_test.rb +96 -137
- data/test/new_relic/delayed_job_injection_test.rb +6 -1
- data/test/new_relic/dispatcher_test.rb +54 -0
- data/test/new_relic/fake_collector.rb +283 -0
- data/test/new_relic/fake_service.rb +53 -0
- data/test/new_relic/fakes_sending_data.rb +30 -0
- data/test/new_relic/framework_test.rb +53 -0
- data/test/new_relic/load_test.rb +13 -0
- data/test/new_relic/local_environment_test.rb +11 -11
- data/test/new_relic/metric_data_test.rb +45 -16
- data/test/new_relic/noticed_error_test.rb +24 -0
- data/test/new_relic/rack/browser_monitoring_test.rb +20 -10
- data/test/new_relic/rack/developer_mode_test.rb +13 -7
- data/test/new_relic/rack/error_collector_test.rb +74 -0
- data/test/new_relic/stats_test.rb +10 -0
- data/test/new_relic/transaction_sample/segment_test.rb +23 -4
- data/test/new_relic/transaction_sample_test.rb +47 -2
- data/test/new_relic/version_number_test.rb +32 -0
- data/test/script/build_test_gem.sh +9 -3
- data/test/script/ci.sh +108 -35
- data/test/script/ci_agent-tests_runner.sh +82 -0
- data/test/script/ci_multiverse_runner.sh +63 -0
- data/test/test_contexts.rb +1 -0
- data/test/test_helper.rb +68 -18
- data/ui/helpers/developer_mode_helper.rb +21 -11
- data/ui/views/layouts/newrelic_default.rhtml +1 -0
- data/ui/views/newrelic/file/images/arrow-close.png +0 -0
- data/ui/views/newrelic/file/images/arrow-open.png +0 -0
- data/ui/views/newrelic/file/images/blue_bar.gif +0 -0
- data/ui/views/newrelic/file/images/file_icon.png +0 -0
- data/ui/views/newrelic/file/images/gray_bar.gif +0 -0
- data/ui/views/newrelic/show_sample.rhtml +1 -1
- data/ui/views/newrelic/threads.rhtml +2 -10
- data/vendor/gems/metric_parser-0.1.0.pre1/.specification +116 -0
- data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/servlet_init.rb +7 -0
- metadata +191 -65
- data/lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb +0 -40
- data/lib/new_relic/control/configuration.rb +0 -206
- data/lib/new_relic/control/logging_methods.rb +0 -143
- data/lib/new_relic/data_serialization.rb +0 -151
- data/test/new_relic/control/configuration_test.rb +0 -84
- data/test/new_relic/control/logging_methods_test.rb +0 -185
- data/test/new_relic/data_serialization_test.rb +0 -208
@@ -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,22 @@
|
|
1
|
+
---
|
2
|
+
development:
|
3
|
+
error_collector:
|
4
|
+
capture_source: true
|
5
|
+
enabled: false
|
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
|
+
disable_serialization: false
|
@@ -0,0 +1,143 @@
|
|
1
|
+
# RUBY-980 Improve logging
|
2
|
+
# This test suite is for checking IMPORTANT conditions that we log rather than
|
3
|
+
# trying to do this via brittle unit tests
|
4
|
+
|
5
|
+
require 'logger'
|
6
|
+
require 'newrelic_rpm'
|
7
|
+
require 'fake_collector'
|
8
|
+
require 'mocha'
|
9
|
+
|
10
|
+
class LoggingTest < Test::Unit::TestCase
|
11
|
+
|
12
|
+
def test_logs_app_name
|
13
|
+
running_agent_writes_to_log(
|
14
|
+
{:app_name => "My App"},
|
15
|
+
"Application: My App")
|
16
|
+
end
|
17
|
+
|
18
|
+
def test_logs_error_with_bad_app_name
|
19
|
+
running_agent_writes_to_log(
|
20
|
+
{:app_name => false},
|
21
|
+
"Unable to determine application name.")
|
22
|
+
end
|
23
|
+
|
24
|
+
def test_logs_dispatcher
|
25
|
+
dispatcher = "Y U NO SERVER WEBPAGE"
|
26
|
+
|
27
|
+
running_agent_writes_to_log(
|
28
|
+
{:dispatcher => dispatcher},
|
29
|
+
dispatcher)
|
30
|
+
end
|
31
|
+
|
32
|
+
def test_logs_missing_dispatcher
|
33
|
+
running_agent_writes_to_log(
|
34
|
+
{:dispatcher => ''},
|
35
|
+
"No dispatcher detected")
|
36
|
+
end
|
37
|
+
|
38
|
+
def test_logs_raw_sql_warning
|
39
|
+
NewRelic::Agent.config.apply_config(:'transaction_tracer.record_sql' => 'obfuscated')
|
40
|
+
|
41
|
+
running_agent_writes_to_log(
|
42
|
+
{:'transaction_tracer.record_sql' => 'raw'},
|
43
|
+
"Agent is configured to send raw SQL to the service")
|
44
|
+
end
|
45
|
+
|
46
|
+
def test_logs_if_sending_errors_on_change
|
47
|
+
NewRelic::Agent.config.apply_config(:'error_collector.enabled' => false)
|
48
|
+
|
49
|
+
running_agent_writes_to_log(
|
50
|
+
{:'error_collector.enabled' => true},
|
51
|
+
"Errors will be sent")
|
52
|
+
end
|
53
|
+
|
54
|
+
def test_logs_if_not_sending_errors_on_change
|
55
|
+
NewRelic::Agent.config.apply_config(:'error_collector.enabled' => true)
|
56
|
+
|
57
|
+
running_agent_writes_to_log(
|
58
|
+
{:'error_collector.enabled' => false},
|
59
|
+
"Errors will not be sent")
|
60
|
+
end
|
61
|
+
|
62
|
+
def test_logs_transaction_tracing_disabled
|
63
|
+
running_agent_writes_to_log(
|
64
|
+
{:'transaction_tracer.enabled' => false},
|
65
|
+
"Transaction traces will not be sent")
|
66
|
+
end
|
67
|
+
|
68
|
+
def test_invalid_license_key
|
69
|
+
with_connect_response(401)
|
70
|
+
running_agent_writes_to_log({},
|
71
|
+
"Visit NewRelic.com to obtain a valid license key")
|
72
|
+
end
|
73
|
+
|
74
|
+
def test_logs_monitor_mode_disabled
|
75
|
+
running_agent_writes_to_log(
|
76
|
+
{:monitor_mode => false },
|
77
|
+
"Agent configured not to send data in this environment.")
|
78
|
+
end
|
79
|
+
|
80
|
+
def test_logs_mising_license_key
|
81
|
+
running_agent_writes_to_log(
|
82
|
+
{ :license_key => false },
|
83
|
+
"No license key found in newrelic.yml config.")
|
84
|
+
end
|
85
|
+
|
86
|
+
def test_logs_invalid_license_key
|
87
|
+
running_agent_writes_to_log(
|
88
|
+
{ :license_key => 'a' * 30 },
|
89
|
+
"Invalid license key: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
|
90
|
+
end
|
91
|
+
|
92
|
+
def test_logs_forking_workers
|
93
|
+
running_agent_writes_to_log(
|
94
|
+
{ :dispatcher => :passenger },
|
95
|
+
"Connecting workers after forking.")
|
96
|
+
end
|
97
|
+
|
98
|
+
# Initialization
|
99
|
+
def setup
|
100
|
+
$collector ||= NewRelic::FakeCollector.new
|
101
|
+
$collector.reset
|
102
|
+
$collector.mock['connect'] = [200, {'return_value' => {"agent_run_id" => 666 }}]
|
103
|
+
$collector.run
|
104
|
+
|
105
|
+
NewRelic::Agent.reset_config
|
106
|
+
NewRelic::Agent.agent = NewRelic::Agent::Agent.new
|
107
|
+
NewRelic::Control.instance(true)
|
108
|
+
|
109
|
+
@logger = NewRelic::Agent::MemoryLogger.new
|
110
|
+
NewRelic::Agent.logger = @logger
|
111
|
+
NewRelic::Agent::AgentLogger.stubs(:new).with(any_parameters).returns(@logger)
|
112
|
+
end
|
113
|
+
|
114
|
+
def teardown
|
115
|
+
$collector.reset
|
116
|
+
end
|
117
|
+
|
118
|
+
# Helpers
|
119
|
+
def running_agent_writes_to_log(options, msg)
|
120
|
+
run_agent_with(options) do
|
121
|
+
saw?(msg)
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
def with_connect_response(status=200, response={})
|
126
|
+
$collector.mock['connect'] = [status, response]
|
127
|
+
end
|
128
|
+
|
129
|
+
def run_agent_with(options = {})
|
130
|
+
NewRelic::Agent.manual_start(options)
|
131
|
+
NewRelic::Agent.shutdown
|
132
|
+
yield
|
133
|
+
end
|
134
|
+
|
135
|
+
def saw?(*expected_messages)
|
136
|
+
flattened = @logger.messages.flatten
|
137
|
+
expected_messages.each do |expected|
|
138
|
+
found = flattened.any? {|msg| msg.to_s.include?(expected)}
|
139
|
+
@logger.messages.each {|msg| puts msg.inspect} if !found
|
140
|
+
assert(found, "Didn't see message '#{expected}'")
|
141
|
+
end
|
142
|
+
end
|
143
|
+
end
|
@@ -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,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: raw
|
17
|
+
enabled: true
|
18
|
+
stack_trace_threshold: 0.5
|
19
|
+
transaction_threshold: 1.0
|
20
|
+
capture_params: false
|
21
|
+
log_level: debug
|
22
|
+
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)
|