ghazel-newrelic_rpm 3.1.0.1 → 3.4.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (175) hide show
  1. data/CHANGELOG +120 -35
  2. data/LICENSE +29 -2
  3. data/README.rdoc +2 -2
  4. data/bin/mongrel_rpm +0 -0
  5. data/bin/newrelic +0 -0
  6. data/bin/newrelic_cmd +0 -0
  7. data/lib/new_relic/agent.rb +50 -38
  8. data/lib/new_relic/agent/agent.rb +459 -337
  9. data/lib/new_relic/agent/beacon_configuration.rb +71 -11
  10. data/lib/new_relic/agent/browser_monitoring.rb +73 -14
  11. data/lib/new_relic/agent/busy_calculator.rb +11 -3
  12. data/lib/new_relic/agent/chained_call.rb +2 -2
  13. data/lib/new_relic/agent/database.rb +223 -0
  14. data/lib/new_relic/agent/error_collector.rb +231 -183
  15. data/lib/new_relic/agent/instrumentation.rb +2 -2
  16. data/lib/new_relic/agent/instrumentation/active_merchant.rb +10 -2
  17. data/lib/new_relic/agent/instrumentation/active_record.rb +138 -0
  18. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +7 -1
  19. data/lib/new_relic/agent/instrumentation/authlogic.rb +6 -0
  20. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +46 -14
  21. data/lib/new_relic/agent/instrumentation/data_mapper.rb +8 -2
  22. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +11 -3
  23. data/lib/new_relic/agent/instrumentation/memcache.rb +49 -25
  24. data/lib/new_relic/agent/instrumentation/merb/controller.rb +7 -2
  25. data/lib/new_relic/agent/instrumentation/merb/errors.rb +7 -1
  26. data/lib/new_relic/agent/instrumentation/metric_frame.rb +31 -4
  27. data/lib/new_relic/agent/instrumentation/metric_frame/pop.rb +1 -5
  28. data/lib/new_relic/agent/instrumentation/net.rb +8 -2
  29. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +5 -2
  30. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
  31. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +66 -35
  32. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +7 -1
  33. data/lib/new_relic/agent/instrumentation/rails/errors.rb +7 -1
  34. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +121 -1
  35. data/lib/new_relic/agent/instrumentation/rails3/errors.rb +7 -1
  36. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +21 -0
  37. data/lib/new_relic/agent/instrumentation/resque.rb +80 -0
  38. data/lib/new_relic/agent/instrumentation/sinatra.rb +46 -20
  39. data/lib/new_relic/agent/instrumentation/sunspot.rb +6 -0
  40. data/lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb +7 -2
  41. data/lib/new_relic/agent/method_tracer.rb +205 -99
  42. data/lib/new_relic/agent/new_relic_service.rb +221 -0
  43. data/lib/new_relic/agent/pipe_channel_manager.rb +161 -0
  44. data/lib/new_relic/agent/pipe_service.rb +54 -0
  45. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +89 -0
  46. data/lib/new_relic/agent/samplers/memory_sampler.rb +6 -7
  47. data/lib/new_relic/agent/shim_agent.rb +5 -5
  48. data/lib/new_relic/agent/sql_sampler.rb +282 -0
  49. data/lib/new_relic/agent/stats_engine.rb +2 -0
  50. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +123 -0
  51. data/lib/new_relic/agent/stats_engine/metric_stats.rb +35 -30
  52. data/lib/new_relic/agent/stats_engine/samplers.rb +10 -4
  53. data/lib/new_relic/agent/stats_engine/transactions.rb +28 -87
  54. data/lib/new_relic/agent/transaction_info.rb +74 -0
  55. data/lib/new_relic/agent/transaction_sample_builder.rb +18 -3
  56. data/lib/new_relic/agent/transaction_sampler.rb +108 -20
  57. data/lib/new_relic/agent/worker_loop.rb +14 -6
  58. data/lib/new_relic/collection_helper.rb +19 -11
  59. data/lib/new_relic/command.rb +1 -1
  60. data/lib/new_relic/commands/deployments.rb +2 -2
  61. data/lib/new_relic/commands/install.rb +2 -13
  62. data/lib/new_relic/control.rb +2 -3
  63. data/lib/new_relic/control/class_methods.rb +12 -6
  64. data/lib/new_relic/control/configuration.rb +57 -8
  65. data/lib/new_relic/control/frameworks.rb +10 -0
  66. data/lib/new_relic/control/frameworks/external.rb +4 -4
  67. data/lib/new_relic/control/frameworks/merb.rb +2 -1
  68. data/lib/new_relic/control/frameworks/rails.rb +35 -22
  69. data/lib/new_relic/control/frameworks/rails3.rb +12 -7
  70. data/lib/new_relic/control/frameworks/ruby.rb +5 -5
  71. data/lib/new_relic/control/frameworks/sinatra.rb +1 -4
  72. data/lib/new_relic/control/instance_methods.rb +38 -12
  73. data/lib/new_relic/control/instrumentation.rb +23 -4
  74. data/lib/new_relic/control/logging_methods.rb +70 -15
  75. data/lib/new_relic/control/server_methods.rb +22 -9
  76. data/lib/new_relic/delayed_job_injection.rb +16 -3
  77. data/lib/new_relic/helper.rb +21 -0
  78. data/lib/new_relic/language_support.rb +95 -0
  79. data/lib/new_relic/local_environment.rb +92 -48
  80. data/lib/new_relic/metric_data.rb +7 -2
  81. data/lib/new_relic/metric_spec.rb +12 -9
  82. data/lib/new_relic/noticed_error.rb +6 -1
  83. data/lib/new_relic/rack/browser_monitoring.rb +18 -19
  84. data/lib/new_relic/rack/developer_mode.rb +3 -2
  85. data/lib/new_relic/recipes.rb +8 -4
  86. data/lib/new_relic/stats.rb +17 -60
  87. data/lib/new_relic/transaction_analysis.rb +2 -1
  88. data/lib/new_relic/transaction_analysis/segment_summary.rb +4 -2
  89. data/lib/new_relic/transaction_sample.rb +60 -75
  90. data/lib/new_relic/transaction_sample/segment.rb +31 -79
  91. data/lib/new_relic/version.rb +2 -2
  92. data/lib/newrelic_rpm.rb +1 -1
  93. data/newrelic.yml +2 -2
  94. data/newrelic_rpm.gemspec +46 -54
  95. data/test/active_record_fixtures.rb +3 -3
  96. data/test/config/newrelic.yml +1 -1
  97. data/test/fixtures/proc_cpuinfo.txt +575 -0
  98. data/test/new_relic/agent/agent/connect_test.rb +128 -25
  99. data/test/new_relic/agent/agent/start_test.rb +9 -94
  100. data/test/new_relic/agent/agent/start_worker_thread_test.rb +2 -4
  101. data/test/new_relic/agent/agent_test.rb +51 -78
  102. data/test/new_relic/agent/agent_test_controller.rb +1 -1
  103. data/test/new_relic/agent/agent_test_controller_test.rb +49 -33
  104. data/test/new_relic/agent/beacon_configuration_test.rb +12 -5
  105. data/test/new_relic/agent/browser_monitoring_test.rb +99 -50
  106. data/test/new_relic/agent/database_test.rb +161 -0
  107. data/test/new_relic/agent/error_collector_test.rb +47 -23
  108. data/test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb +96 -42
  109. data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb +0 -2
  110. data/test/new_relic/agent/instrumentation/instrumentation_test.rb +1 -1
  111. data/test/new_relic/agent/instrumentation/metric_frame/pop_test.rb +3 -11
  112. data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb +9 -9
  113. data/test/new_relic/agent/instrumentation/queue_time_test.rb +6 -11
  114. data/test/new_relic/agent/memcache_instrumentation_test.rb +54 -18
  115. data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb +1 -1
  116. data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb +1 -1
  117. data/test/new_relic/agent/method_tracer_test.rb +3 -2
  118. data/test/new_relic/agent/new_relic_service_test.rb +151 -0
  119. data/test/new_relic/agent/pipe_channel_manager_test.rb +114 -0
  120. data/test/new_relic/agent/pipe_service_test.rb +113 -0
  121. data/test/new_relic/agent/rpm_agent_test.rb +4 -31
  122. data/test/new_relic/agent/sql_sampler_test.rb +192 -0
  123. data/test/new_relic/agent/stats_engine/metric_stats_test.rb +19 -18
  124. data/test/new_relic/agent/stats_engine_test.rb +41 -6
  125. data/test/new_relic/agent/transaction_info_test.rb +13 -0
  126. data/test/new_relic/agent/transaction_sample_builder_test.rb +27 -4
  127. data/test/new_relic/agent/transaction_sampler_test.rb +68 -46
  128. data/test/new_relic/agent/worker_loop_test.rb +3 -3
  129. data/test/new_relic/agent_test.rb +242 -0
  130. data/test/new_relic/collection_helper_test.rb +50 -28
  131. data/test/new_relic/control/configuration_test.rb +77 -0
  132. data/test/new_relic/control/logging_methods_test.rb +49 -21
  133. data/test/new_relic/control_test.rb +115 -54
  134. data/test/new_relic/delayed_job_injection_test.rb +21 -0
  135. data/test/new_relic/fake_collector.rb +210 -0
  136. data/test/new_relic/fake_service.rb +44 -0
  137. data/test/new_relic/local_environment_test.rb +14 -1
  138. data/test/new_relic/metric_parser/metric_parser_test.rb +11 -0
  139. data/test/new_relic/rack/browser_monitoring_test.rb +84 -23
  140. data/test/new_relic/rack/developer_mode_helper_test.rb +141 -0
  141. data/test/new_relic/rack/developer_mode_test.rb +31 -0
  142. data/test/new_relic/stats_test.rb +3 -18
  143. data/test/new_relic/transaction_analysis/segment_summary_test.rb +14 -0
  144. data/test/new_relic/transaction_analysis_test.rb +3 -3
  145. data/test/new_relic/transaction_sample/segment_test.rb +15 -80
  146. data/test/new_relic/transaction_sample_test.rb +25 -18
  147. data/test/script/build_test_gem.sh +51 -0
  148. data/test/script/ci.sh +140 -0
  149. data/test/script/ci_agent-tests_runner.sh +82 -0
  150. data/test/script/ci_bench.sh +52 -0
  151. data/test/script/ci_multiverse_runner.sh +63 -0
  152. data/test/test_contexts.rb +1 -0
  153. data/test/test_helper.rb +18 -5
  154. data/ui/helpers/developer_mode_helper.rb +14 -8
  155. data/ui/helpers/google_pie_chart.rb +0 -1
  156. data/ui/views/newrelic/index.rhtml +2 -2
  157. data/vendor/gems/dependency_detection-0.0.1.build/LICENSE +4 -18
  158. data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb +10 -0
  159. data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/mem_cache.rb +11 -11
  160. data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/metric_parser.rb +17 -4
  161. data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb +4 -0
  162. metadata +50 -36
  163. data/lib/new_relic/agent/instrumentation/rails/active_record_instrumentation.rb +0 -108
  164. data/lib/new_relic/agent/instrumentation/rails3/active_record_instrumentation.rb +0 -112
  165. data/lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb +0 -40
  166. data/lib/new_relic/data_serialization.rb +0 -84
  167. data/lib/new_relic/histogram.rb +0 -91
  168. data/lib/new_relic/rack/metric_app.rb +0 -65
  169. data/lib/new_relic/rack/mongrel_rpm.ru +0 -28
  170. data/lib/new_relic/rack/newrelic.yml +0 -27
  171. data/lib/new_relic/rack_app.rb +0 -6
  172. data/test/new_relic/data_serialization_test.rb +0 -70
  173. data/vendor/gems/dependency_detection-0.0.1.build/README +0 -0
  174. data/vendor/gems/metric_parser-0.1.0.pre1/LICENSE +0 -0
  175. data/vendor/gems/metric_parser-0.1.0.pre1/README +0 -0
@@ -0,0 +1,114 @@
1
+ require 'timeout'
2
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
3
+ require 'new_relic/agent/pipe_channel_manager'
4
+
5
+ class NewRelic::Agent::PipeChannelManagerTest < Test::Unit::TestCase
6
+ def setup
7
+ NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
8
+ NewRelic::Agent.manual_start
9
+ end
10
+
11
+ def teardown
12
+ NewRelic::Agent::PipeChannelManager.listener.stop
13
+ NewRelic::Agent.shutdown
14
+ end
15
+
16
+ def test_registering_a_pipe
17
+ NewRelic::Agent::PipeChannelManager.listener.wake.in.expects(:<<).with('.')
18
+ NewRelic::Agent::PipeChannelManager.register_report_channel(1)
19
+ pipe = NewRelic::Agent::PipeChannelManager.channels[1]
20
+
21
+ assert pipe.out.kind_of?(IO)
22
+ assert pipe.in.kind_of?(IO)
23
+
24
+ NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
25
+ end
26
+
27
+ if NewRelic::LanguageSupport.can_fork? && !NewRelic::LanguageSupport.using_version?('1.9.1')
28
+ def test_listener_merges_timeslice_metrics
29
+ metric = 'Custom/test/method'
30
+ engine = NewRelic::Agent.agent.stats_engine
31
+ engine.get_stats_no_scope(metric).record_data_point(1.0)
32
+
33
+ listener = start_listener_with_pipe(666)
34
+
35
+ pid = Process.fork do
36
+ NewRelic::Agent.after_fork
37
+ new_engine = NewRelic::Agent::StatsEngine.new
38
+ new_engine.get_stats_no_scope(metric).record_data_point(2.0)
39
+ listener.pipes[666].write(:stats => new_engine.harvest_timeslice_data({}, {}))
40
+ end
41
+ Process.wait(pid)
42
+ listener.stop
43
+
44
+ assert_equal(3.0, engine.lookup_stats(metric).total_call_time)
45
+ end
46
+
47
+ def test_listener_merges_transaction_traces
48
+ sampler = NewRelic::Agent.agent.transaction_sampler
49
+ TransactionSampleTestHelper.run_sample_trace_on(sampler)
50
+ NewRelic::Agent.agent.merge_data_from([nil, [sampler.samples], nil])
51
+
52
+ assert_equal(1, NewRelic::Agent.agent.unsent_traces_size)
53
+
54
+ listener = start_listener_with_pipe(667)
55
+
56
+ pid = Process.fork do
57
+ NewRelic::Agent.after_fork
58
+ new_sampler = NewRelic::Agent::TransactionSampler.new
59
+ sample = TransactionSampleTestHelper.run_sample_trace_on(new_sampler)
60
+ new_sampler.store_force_persist(sample)
61
+ listener.pipes[667].write(:transaction_traces => new_sampler.harvest([], 0))
62
+ end
63
+ Process.wait(pid)
64
+ listener.stop
65
+
66
+ assert_equal(2, NewRelic::Agent.agent.unsent_traces_size)
67
+ end
68
+
69
+ def test_listener_merges_error_traces
70
+ sampler = NewRelic::Agent.agent.error_collector
71
+ sampler.notice_error(Exception.new("message"), :uri => '/myurl/',
72
+ :metric => 'path', :referer => 'test_referer',
73
+ :request_params => {:x => 'y'})
74
+ NewRelic::Agent.agent.merge_data_from([nil, nil, [sampler.errors]])
75
+
76
+ assert_equal(1, NewRelic::Agent.agent.unsent_errors_size)
77
+
78
+ listener = start_listener_with_pipe(668)
79
+
80
+ pid = Process.fork do
81
+ NewRelic::Agent.after_fork
82
+ new_sampler = NewRelic::Agent::ErrorCollector.new
83
+ new_sampler.notice_error(Exception.new("new message"), :uri => '/myurl/',
84
+ :metric => 'path', :referer => 'test_referer',
85
+ :request_params => {:x => 'y'})
86
+ listener.pipes[668].write(:error_traces => new_sampler.harvest_errors([]))
87
+ end
88
+ Process.wait(pid)
89
+ listener.stop
90
+
91
+ assert_equal(2, NewRelic::Agent.agent.unsent_errors_size)
92
+ end
93
+
94
+ def test_close_pipe_on_EOF_string
95
+ listener = start_listener_with_pipe(669)
96
+
97
+ pid = Process.fork do
98
+ listener.pipes[669].write('EOF')
99
+ end
100
+ Process.wait(pid)
101
+ listener.stop
102
+
103
+ assert(!NewRelic::Agent::PipeChannelManager.channels[669] ||
104
+ NewRelic::Agent::PipeChannelManager.channels[669].closed?)
105
+ end
106
+ end
107
+
108
+ def start_listener_with_pipe(pipe_id)
109
+ listener = NewRelic::Agent::PipeChannelManager.listener
110
+ listener.start
111
+ listener.register_pipe(pipe_id)
112
+ listener
113
+ end
114
+ end
@@ -0,0 +1,113 @@
1
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
2
+
3
+ class PipeServiceTest < Test::Unit::TestCase
4
+ def setup
5
+ NewRelic::Agent::PipeChannelManager.listener.stop
6
+ NewRelic::Agent::PipeChannelManager.register_report_channel(:pipe_service_test)
7
+ @service = NewRelic::Agent::PipeService.new(:pipe_service_test)
8
+ end
9
+
10
+ def test_constructor
11
+ assert_equal :pipe_service_test, @service.channel_id
12
+ end
13
+
14
+ def test_connect_returns_nil
15
+ assert_nil @service.connect({})
16
+ end
17
+
18
+ if NewRelic::LanguageSupport.can_fork? &&
19
+ !NewRelic::LanguageSupport.using_version?('1.9.1')
20
+
21
+ def test_metric_data
22
+ received_data = data_from_forked_process do
23
+ metric_data0 = generate_metric_data('Custom/something')
24
+ @service.metric_data(0.0, 0.1, metric_data0)
25
+ end
26
+
27
+ assert_equal 'Custom/something', received_data[:stats].keys.sort[0].name
28
+ end
29
+
30
+ def test_transaction_sample_data
31
+ received_data = data_from_forked_process do
32
+ @service.transaction_sample_data(['txn'])
33
+ end
34
+
35
+ assert_equal ['txn'], received_data[:transaction_traces]
36
+ end
37
+
38
+ def test_error_data
39
+ received_data = data_from_forked_process do
40
+ @service.error_data(['err'])
41
+ end
42
+ assert_equal ['err'], received_data[:error_traces]
43
+ end
44
+
45
+ def test_sql_trace_data
46
+ received_data = data_from_forked_process do
47
+ @service.sql_trace_data(['sql'])
48
+ end
49
+ assert_equal ['sql'], received_data[:sql_traces]
50
+ end
51
+
52
+ def test_multiple_writes_to_pipe
53
+ pid = Process.fork do
54
+ metric_data0 = generate_metric_data('Custom/something')
55
+ @service.metric_data(0.0, 0.1, metric_data0)
56
+ @service.transaction_sample_data(['txn0'])
57
+ @service.error_data(['err0'])
58
+ @service.sql_trace_data(['sql0'])
59
+ @service.shutdown(Time.now)
60
+ end
61
+ Process.wait(pid)
62
+
63
+ received_data = read_from_pipe
64
+
65
+ assert_equal 'Custom/something', received_data[:stats].keys.sort[0].name
66
+ assert_equal ['txn0'], received_data[:transaction_traces]
67
+ assert_equal ['err0'], received_data[:error_traces].sort
68
+ end
69
+
70
+ def test_shutdown_sends_EOF
71
+ received_data = data_from_forked_process do
72
+ @service.shutdown(Time.now)
73
+ end
74
+ assert_equal 'EOF', received_data[:EOF]
75
+ end
76
+
77
+ def test_shutdown_closes_pipe
78
+ data_from_forked_process do
79
+ @service.shutdown(Time.now)
80
+ assert NewRelic::Agent::PipeChannelManager \
81
+ .channels[:pipe_service_test].closed?
82
+ end
83
+ end
84
+ end
85
+
86
+ def generate_metric_data(metric_name, data=1.0)
87
+ engine = NewRelic::Agent::StatsEngine.new
88
+ engine.get_stats_no_scope(metric_name).record_data_point(data)
89
+ engine.harvest_timeslice_data({}, {}).values
90
+ end
91
+
92
+ def read_from_pipe
93
+ pipe = NewRelic::Agent::PipeChannelManager.channels[:pipe_service_test]
94
+ pipe.in.close
95
+ data = {}
96
+ while payload = pipe.out.gets("\n\n")
97
+ got = Marshal.load(payload)
98
+ if got == 'EOF'
99
+ got = {:EOF => 'EOF'}
100
+ end
101
+ data.merge!(got)
102
+ end
103
+ data
104
+ end
105
+
106
+ def data_from_forked_process
107
+ pid = Process.fork do
108
+ yield
109
+ end
110
+ Process.wait(pid)
111
+ read_from_pipe
112
+ end
113
+ end
@@ -82,8 +82,10 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
82
82
 
83
83
  should "send_timeslice_data" do
84
84
  # this test fails due to a rubinius bug
85
- return if (RUBY_DESCRIPTION =~ /rubinius/i)
86
- @agent.expects(:invoke_remote).returns({NewRelic::MetricSpec.new("/A/b/c") => 1, NewRelic::MetricSpec.new("/A/b/c", "/X") => 2, NewRelic::MetricSpec.new("/A/b/d") => 3 }.to_a)
85
+ return if NewRelic::LanguageSupport.using_engine?('rbx')
86
+ @agent.service.expects(:metric_data).returns({ NewRelic::MetricSpec.new("/A/b/c") => 1,
87
+ NewRelic::MetricSpec.new("/A/b/c", "/X") => 2,
88
+ NewRelic::MetricSpec.new("/A/b/d") => 3 }.to_a)
87
89
  @agent.send :harvest_and_send_timeslice_data
88
90
  assert_equal 3, @agent.metric_ids.size
89
91
  assert_equal 3, @agent.metric_ids[NewRelic::MetricSpec.new("/A/b/d") ], @agent.metric_ids.inspect
@@ -106,34 +108,6 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
106
108
  assert_match /\d\.\d+\.\d+/, NewRelic::VERSION::STRING
107
109
  end
108
110
 
109
- should "invoke_remote__ignore_non_200_results" do
110
- NewRelic::Agent::Agent.class_eval do
111
- public :invoke_remote
112
- end
113
- response_mock = mock()
114
- Net::HTTP.any_instance.stubs(:request).returns(response_mock)
115
- response_mock.stubs(:message).returns("bogus error")
116
-
117
- for code in %w[500 504 400 302 503] do
118
- assert_raise NewRelic::Agent::ServerConnectionException, "Ignore #{code}" do
119
- response_mock.stubs(:code).returns(code)
120
- NewRelic::Agent.agent.invoke_remote :get_data_report_period, 0
121
- end
122
- end
123
- end
124
- should "invoke_remote__throw_other_errors" do
125
- NewRelic::Agent::Agent.class_eval do
126
- public :invoke_remote
127
- end
128
- response_mock = Net::HTTPSuccess.new nil, nil, nil
129
- response_mock.stubs(:body).returns("")
130
- Marshal.stubs(:load).raises(RuntimeError, "marshal issue")
131
- Net::HTTP.any_instance.stubs(:request).returns(response_mock)
132
- assert_raise RuntimeError do
133
- NewRelic::Agent.agent.invoke_remote :get_data_report_period, 0xFEFE
134
- end
135
- end
136
-
137
111
  context "with transaction api" do
138
112
  should "reject empty arguments" do
139
113
  assert_raises RuntimeError do
@@ -143,7 +117,6 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
143
117
  should "record a transaction" do
144
118
  NewRelic::Agent.record_transaction 0.5, 'uri' => "/users/create?foo=bar"
145
119
  end
146
-
147
120
  end
148
121
  end
149
122
  end
@@ -0,0 +1,192 @@
1
+ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
2
+
3
+ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
4
+
5
+ def setup
6
+ agent = NewRelic::Agent.instance
7
+ stats_engine = NewRelic::Agent::StatsEngine.new
8
+ agent.stubs(:stats_engine).returns(stats_engine)
9
+ @sampler = NewRelic::Agent::SqlSampler.new
10
+ @connection = stub('ActiveRecord connection', :execute => 'result')
11
+ NewRelic::Agent::Database.stubs(:get_connection).returns(@connection)
12
+ end
13
+
14
+ def test_notice_first_scope_push
15
+ assert_nil @sampler.transaction_data
16
+ @sampler.notice_first_scope_push nil
17
+ assert_not_nil @sampler.transaction_data
18
+ @sampler.notice_scope_empty
19
+ assert_nil @sampler.transaction_data
20
+ end
21
+
22
+ def test_notice_sql_no_transaction
23
+ assert_nil @sampler.transaction_data
24
+ @sampler.notice_sql "select * from test", "Database/test/select", nil, 10
25
+ end
26
+
27
+ def test_notice_sql
28
+ @sampler.notice_first_scope_push nil
29
+ @sampler.notice_sql "select * from test", "Database/test/select", nil, 1.5
30
+ @sampler.notice_sql "select * from test2", "Database/test2/select", nil, 1.3
31
+ # this sql will not be captured
32
+ @sampler.notice_sql "select * from test", "Database/test/select", nil, 0
33
+ assert_not_nil @sampler.transaction_data
34
+ assert_equal 2, @sampler.transaction_data.sql_data.size
35
+ end
36
+
37
+ def test_harvest_slow_sql
38
+ data = NewRelic::Agent::TransactionSqlData.new
39
+ data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {},
40
+ 'guid')
41
+ data.sql_data.concat [
42
+ NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5),
43
+ NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.2),
44
+ NewRelic::Agent::SlowSql.new("select * from test2", "Database/test2/select", {}, 1.1)
45
+ ]
46
+ @sampler.harvest_slow_sql data
47
+
48
+ assert_equal 2, @sampler.sql_traces.size
49
+ end
50
+
51
+ def test_sql_aggregation
52
+ sql_trace = NewRelic::Agent::SqlTrace.new("select * from test",
53
+ NewRelic::Agent::SlowSql.new("select * from test",
54
+ "Database/test/select", {}, 1.2),
55
+ "tx_name", "uri")
56
+
57
+ sql_trace.aggregate NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5), "slowest_tx_name", "slow_uri"
58
+ sql_trace.aggregate NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.1), "other_tx_name", "uri2"
59
+
60
+ assert_equal 3, sql_trace.call_count
61
+ assert_equal "slowest_tx_name", sql_trace.path
62
+ assert_equal "slow_uri", sql_trace.url
63
+ assert_equal 1.5, sql_trace.max_call_time
64
+ end
65
+
66
+ def test_harvest
67
+ data = NewRelic::Agent::TransactionSqlData.new
68
+ data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {},
69
+ 'guid')
70
+ data.sql_data.concat [NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5),
71
+ NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.2),
72
+ NewRelic::Agent::SlowSql.new("select * from test2", "Database/test2/select", {}, 1.1)]
73
+ @sampler.harvest_slow_sql data
74
+
75
+ sql_traces = @sampler.harvest
76
+ assert_equal 2, sql_traces.size
77
+ end
78
+
79
+ def test_harvest_should_not_take_more_than_10
80
+ data = NewRelic::Agent::TransactionSqlData.new
81
+ data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {}, 'guid')
82
+ 15.times do |i|
83
+ data.sql_data << NewRelic::Agent::SlowSql.new("select * from test#{(i+97).chr}",
84
+ "Database/test#{(i+97).chr}/select", {}, i)
85
+ end
86
+
87
+ @sampler.harvest_slow_sql data
88
+ result = @sampler.harvest
89
+
90
+ assert_equal(10, result.size)
91
+ assert_equal(14, result.sort{|a,b| b.max_call_time <=> a.max_call_time}.first.total_call_time)
92
+ end
93
+
94
+ def test_harvest_should_aggregate_similar_queries
95
+ data = NewRelic::Agent::TransactionSqlData.new
96
+ data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {},
97
+ 'guid')
98
+ queries = [
99
+ NewRelic::Agent::SlowSql.new("select * from test where foo in (1, 2) ", "Database/test/select", {}, 1.5),
100
+ NewRelic::Agent::SlowSql.new("select * from test where foo in (1,2, 3 ,4, 5,6, 'snausage')", "Database/test/select", {}, 1.2),
101
+ NewRelic::Agent::SlowSql.new("select * from test2 where foo in (1,2)", "Database/test2/select", {}, 1.1)
102
+ ]
103
+ data.sql_data.concat(queries)
104
+ @sampler.harvest_slow_sql data
105
+
106
+ sql_traces = @sampler.harvest
107
+ assert_equal 2, sql_traces.size
108
+ end
109
+
110
+ def test_harvest_should_collect_explain_plans
111
+ @connection.expects(:execute).with("EXPLAIN select * from test") \
112
+ .returns([{"header0" => 'foo0', "header1" => 'foo1', "header2" => 'foo2'}])
113
+ @connection.expects(:execute).with("EXPLAIN select * from test2") \
114
+ .returns([{"header0" => 'bar0', "header1" => 'bar1', "header2" => 'bar2'}])
115
+
116
+ data = NewRelic::Agent::TransactionSqlData.new
117
+ data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {},
118
+ 'guid')
119
+ queries = [
120
+ NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5),
121
+ NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.2),
122
+ NewRelic::Agent::SlowSql.new("select * from test2", "Database/test2/select", {}, 1.1)
123
+ ]
124
+ data.sql_data.concat(queries)
125
+ @sampler.harvest_slow_sql data
126
+ sql_traces = @sampler.harvest
127
+ assert_equal(["header0", "header1", "header2"],
128
+ sql_traces[0].params[:explain_plan][0].sort)
129
+ assert_equal(["header0", "header1", "header2"],
130
+ sql_traces[1].params[:explain_plan][0].sort)
131
+ assert_equal(["foo0", "foo1", "foo2"],
132
+ sql_traces[0].params[:explain_plan][1][0].sort)
133
+ assert_equal(["bar0", "bar1", "bar2"],
134
+ sql_traces[1].params[:explain_plan][1][0].sort)
135
+ end
136
+
137
+ def test_sql_trace_should_include_transaction_guid
138
+ txn_sampler = NewRelic::Agent::TransactionSampler.new
139
+ NewRelic::Agent.instance.stats_engine.transaction_sampler = txn_sampler
140
+ txn_sampler.start_builder(Time.now)
141
+ txn_sampler.notice_transaction('a path', 'a uri', {:some => :params})
142
+ @sampler.create_transaction_data
143
+ @sampler.notice_transaction('a path', 'a uri', {:some => :params})
144
+
145
+ assert_equal(NewRelic::Agent.instance.transaction_sampler.builder.sample.guid,
146
+ NewRelic::Agent.instance.sql_sampler.transaction_data.guid)
147
+ end
148
+
149
+ def test_should_not_collect_explain_plans_when_disabled
150
+ NewRelic::Control.instance['transaction_tracer'] = { 'explain_enabled' => false }
151
+ data = NewRelic::Agent::TransactionSqlData.new
152
+ data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {},
153
+ 'guid')
154
+
155
+ queries = [
156
+ NewRelic::Agent::SlowSql.new("select * from test",
157
+ "Database/test/select", {}, 1.5)
158
+ ]
159
+ data.sql_data.concat(queries)
160
+ @sampler.harvest_slow_sql data
161
+ sql_traces = @sampler.harvest
162
+ assert_equal(nil, sql_traces[0].params[:explain_plan])
163
+ NewRelic::Control.instance['transaction_tracer'] = { 'explain_enabled' => true }
164
+ end
165
+
166
+ def test_sql_id_fits_in_a_mysql_int_11
167
+ sql_trace = NewRelic::Agent::SqlTrace.new("select * from test",
168
+ NewRelic::Agent::SlowSql.new("select * from test",
169
+ "Database/test/select", {}, 1.2),
170
+ "tx_name", "uri")
171
+
172
+ assert -2147483648 <= sql_trace.sql_id, "sql_id too small"
173
+ assert 2147483647 >= sql_trace.sql_id, "sql_id too large"
174
+ end
175
+
176
+ def test_sends_obfuscated_queries_when_configured
177
+ NewRelic::Control.instance['transaction_tracer'] = { 'record_sql' => 'obfuscated' }
178
+
179
+ data = NewRelic::Agent::TransactionSqlData.new
180
+ data.set_transaction_info("WebTransaction/Controller/c/a", "/c/a", {},
181
+ 'guid')
182
+ data.sql_data.concat([NewRelic::Agent::SlowSql.new("select * from test where foo = 'bar'",
183
+ "Database/test/select", {}, 1.5),
184
+ NewRelic::Agent::SlowSql.new("select * from test where foo in (1,2,3,4,5)",
185
+ "Database/test/select", {}, 1.2)])
186
+ @sampler.harvest_slow_sql(data)
187
+ sql_traces = @sampler.harvest
188
+
189
+ assert_equal('select * from test where foo = ?', sql_traces[0].sql)
190
+ assert_equal('select * from test where foo in (?,?,?,?,?)', sql_traces[1].sql)
191
+ end
192
+ end