ghazel-newrelic_rpm 3.4.0.2 → 3.5.4
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +21 -0
- data/.project +23 -0
- data/.travis.yml +9 -0
- data/CHANGELOG +180 -1
- data/GUIDELINES_FOR_CONTRIBUTING.md +73 -0
- data/Gemfile +16 -0
- data/InstallationNotes.md +15 -0
- data/LICENSE +1 -1
- data/{README.rdoc → README.md} +71 -55
- data/Rakefile +54 -0
- data/config.dot +290 -0
- data/config/database.yml +5 -0
- data/init.rb +38 -0
- data/lib/new_relic/agent.rb +9 -4
- data/lib/new_relic/agent/agent.rb +189 -230
- data/lib/new_relic/agent/beacon_configuration.rb +34 -48
- data/lib/new_relic/agent/browser_monitoring.rb +108 -61
- data/lib/new_relic/agent/busy_calculator.rb +12 -4
- data/lib/new_relic/agent/configuration.rb +49 -0
- data/lib/new_relic/agent/configuration/defaults.rb +89 -0
- data/lib/new_relic/agent/configuration/environment_source.rb +56 -0
- data/lib/new_relic/agent/configuration/manager.rb +116 -0
- data/lib/new_relic/agent/configuration/server_source.rb +27 -0
- data/lib/new_relic/agent/configuration/yaml_source.rb +61 -0
- data/lib/new_relic/agent/database.rb +37 -22
- data/lib/new_relic/agent/error_collector.rb +47 -43
- data/lib/new_relic/agent/instrumentation/active_record.rb +1 -5
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +27 -6
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +2 -10
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +1 -1
- data/lib/new_relic/agent/instrumentation/memcache.rb +2 -2
- data/lib/new_relic/agent/instrumentation/metric_frame.rb +4 -14
- data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +4 -18
- data/lib/new_relic/agent/instrumentation/rack.rb +1 -1
- data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +3 -3
- data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +2 -2
- data/lib/new_relic/agent/instrumentation/rails3/errors.rb +5 -1
- data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
- data/lib/new_relic/agent/instrumentation/sinatra.rb +14 -10
- data/lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb +4 -3
- data/lib/new_relic/agent/method_tracer.rb +5 -1
- data/lib/new_relic/agent/new_relic_service.rb +231 -61
- data/lib/new_relic/agent/pipe_channel_manager.rb +37 -23
- data/lib/new_relic/agent/pipe_service.rb +5 -1
- data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +2 -5
- data/lib/new_relic/agent/samplers/memory_sampler.rb +2 -2
- data/lib/new_relic/agent/sql_sampler.rb +44 -68
- 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 +7 -3
- data/lib/new_relic/agent/stats_engine/transactions.rb +19 -11
- data/lib/new_relic/agent/thread.rb +27 -0
- data/lib/new_relic/agent/thread_profiler.rb +295 -0
- data/lib/new_relic/agent/transaction_info.rb +24 -4
- data/lib/new_relic/agent/transaction_sample_builder.rb +11 -11
- data/lib/new_relic/agent/transaction_sampler.rb +51 -61
- data/lib/new_relic/agent/worker_loop.rb +29 -15
- data/lib/new_relic/collection_helper.rb +1 -1
- data/lib/new_relic/commands/deployments.rb +19 -10
- data/lib/new_relic/control.rb +0 -1
- data/lib/new_relic/control/class_methods.rb +2 -3
- data/lib/new_relic/control/frameworks/rails.rb +24 -18
- data/lib/new_relic/control/frameworks/rails3.rb +18 -1
- data/lib/new_relic/control/frameworks/ruby.rb +2 -2
- data/lib/new_relic/control/instance_methods.rb +36 -53
- data/lib/new_relic/control/logging_methods.rb +5 -23
- data/lib/new_relic/control/server_methods.rb +11 -13
- data/lib/new_relic/delayed_job_injection.rb +1 -1
- data/lib/new_relic/helper.rb +13 -0
- data/lib/new_relic/language_support.rb +19 -22
- data/lib/new_relic/local_environment.rb +2 -3
- data/lib/new_relic/metric_data.rb +10 -2
- data/lib/new_relic/metric_spec.rb +6 -2
- data/lib/new_relic/noticed_error.rb +24 -9
- data/lib/new_relic/rack.rb +4 -0
- data/lib/new_relic/rack/browser_monitoring.rb +28 -10
- data/lib/new_relic/rack/developer_mode.rb +3 -0
- data/lib/new_relic/rack/error_collector.rb +56 -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 +3 -3
- data/lib/tasks/tests.rake +8 -8
- data/newrelic.yml +15 -32
- data/newrelic_rpm.gemspec +158 -38
- data/newrelic_rpm.gemspec.erb +55 -0
- data/test/config/newrelic.yml +3 -2
- data/test/intentional_fail.rb +10 -0
- 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/connect_test.rb +134 -164
- data/test/new_relic/agent/agent/start_test.rb +111 -81
- data/test/new_relic/agent/agent/start_worker_thread_test.rb +6 -33
- data/test/new_relic/agent/agent_test.rb +88 -9
- 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/beacon_configuration_test.rb +63 -67
- data/test/new_relic/agent/browser_monitoring_test.rb +150 -79
- data/test/new_relic/agent/configuration/environment_source_test.rb +74 -0
- data/test/new_relic/agent/configuration/manager_test.rb +149 -0
- data/test/new_relic/agent/configuration/server_source_test.rb +45 -0
- data/test/new_relic/agent/configuration/yaml_source_test.rb +56 -0
- data/test/new_relic/agent/error_collector/notice_error_test.rb +63 -50
- data/test/new_relic/agent/error_collector_test.rb +22 -12
- data/test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb +21 -11
- data/test/new_relic/agent/instrumentation/metric_frame_test.rb +6 -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 +5 -5
- data/test/new_relic/agent/method_tracer_test.rb +6 -6
- data/test/new_relic/agent/mock_scope_listener.rb +3 -0
- data/test/new_relic/agent/new_relic_service_test.rb +208 -23
- data/test/new_relic/agent/pipe_channel_manager_test.rb +34 -17
- data/test/new_relic/agent/rpm_agent_test.rb +27 -23
- 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 +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_info_test.rb +45 -4
- data/test/new_relic/agent/transaction_sample_builder_test.rb +8 -6
- data/test/new_relic/agent/transaction_sampler_test.rb +193 -204
- data/test/new_relic/agent/worker_loop_test.rb +20 -0
- data/test/new_relic/agent_test.rb +69 -41
- 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/frameworks/rails_test.rb +26 -0
- data/test/new_relic/control/logging_methods_test.rb +78 -52
- data/test/new_relic/control_test.rb +91 -129
- data/test/new_relic/fake_collector.rb +103 -31
- data/test/new_relic/fake_service.rb +8 -2
- data/test/new_relic/load_test.rb +13 -0
- data/test/new_relic/local_environment_test.rb +7 -10
- data/test/new_relic/metric_data_test.rb +45 -16
- data/test/new_relic/noticed_error_test.rb +14 -0
- data/test/new_relic/rack/browser_monitoring_test.rb +15 -9
- 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/transaction_sample/segment_test.rb +23 -4
- data/test/new_relic/transaction_sample_test.rb +47 -2
- data/test/script/build_test_gem.sh +9 -3
- data/test/script/ci.sh +48 -21
- data/test/script/ci_multiverse_runner.sh +11 -11
- data/test/test_helper.rb +37 -18
- data/ui/helpers/developer_mode_helper.rb +21 -11
- data/ui/views/layouts/newrelic_default.rhtml +1 -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 +132 -58
- data/lib/new_relic/control/configuration.rb +0 -206
- data/test/new_relic/control/configuration_test.rb +0 -77
@@ -0,0 +1,94 @@
|
|
1
|
+
|
2
|
+
require 'rubygems'
|
3
|
+
|
4
|
+
require 'active_record'
|
5
|
+
require 'test/unit'
|
6
|
+
require 'newrelic_rpm'
|
7
|
+
require 'multiverse/color'
|
8
|
+
|
9
|
+
|
10
|
+
class InstrumentActiveRecordMethods < Test::Unit::TestCase
|
11
|
+
extend Multiverse::Color
|
12
|
+
|
13
|
+
if RUBY_VERSION >= '1.8.7'
|
14
|
+
if RUBY_PLATFORM == 'java'
|
15
|
+
require 'jdbc/sqlite3'
|
16
|
+
@@adapter = 'jdbcsqlite3'
|
17
|
+
else
|
18
|
+
require 'sqlite3'
|
19
|
+
@@adapter = 'sqlite3'
|
20
|
+
end
|
21
|
+
|
22
|
+
class User < ActiveRecord::Base
|
23
|
+
include NewRelic::Agent::MethodTracer
|
24
|
+
has_many :aliases
|
25
|
+
|
26
|
+
add_method_tracer :save!
|
27
|
+
add_method_tracer :persisted?
|
28
|
+
end
|
29
|
+
|
30
|
+
class Alias < ActiveRecord::Base
|
31
|
+
include NewRelic::Agent::MethodTracer
|
32
|
+
|
33
|
+
add_method_tracer :save!
|
34
|
+
add_method_tracer :persisted?
|
35
|
+
add_method_tracer :destroyed?
|
36
|
+
end
|
37
|
+
|
38
|
+
def setup
|
39
|
+
puts "adapter : #{@@adapter}"
|
40
|
+
@db_connection = ActiveRecord::Base.establish_connection( :adapter => @@adapter, :database => "testdb.sqlite3")
|
41
|
+
ActiveRecord::Migration.class_eval do
|
42
|
+
@connection = @db_connection
|
43
|
+
create_table :users do |t|
|
44
|
+
t.string :name
|
45
|
+
end
|
46
|
+
|
47
|
+
create_table :aliases do |t|
|
48
|
+
t.integer :user_id
|
49
|
+
t.string :aka
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
def teardown
|
55
|
+
@db_connection = ActiveRecord::Base.establish_connection( :adapter => "sqlite3", :database => "testdb.sqlite3")
|
56
|
+
ActiveRecord::Migration.class_eval do
|
57
|
+
@connection = @db_connection
|
58
|
+
drop_table :users
|
59
|
+
drop_table :aliases
|
60
|
+
end
|
61
|
+
end
|
62
|
+
|
63
|
+
def test_basic_creation
|
64
|
+
a_user = User.new :name => "Bob"
|
65
|
+
assert a_user.new_record?
|
66
|
+
a_user.save!
|
67
|
+
assert User.connected?
|
68
|
+
assert a_user.persisted?
|
69
|
+
assert a_user.id == 1
|
70
|
+
end
|
71
|
+
|
72
|
+
def test_alias_collection_query_method
|
73
|
+
a_user = User.new :name => "Bob"
|
74
|
+
a_user.save!
|
75
|
+
a_user = User.find(1)
|
76
|
+
assert User.connected?
|
77
|
+
assert a_user.id = 1
|
78
|
+
|
79
|
+
an_alias = Alias.new :user_id => a_user.id, :aka => "the Blob"
|
80
|
+
assert an_alias.new_record?
|
81
|
+
an_alias.save!
|
82
|
+
assert an_alias.persisted?
|
83
|
+
an_alias.destroy
|
84
|
+
assert an_alias.destroyed?
|
85
|
+
end
|
86
|
+
|
87
|
+
else
|
88
|
+
def test_truth
|
89
|
+
assert true # jruby freaks out if there are no tests defined in the test class
|
90
|
+
end
|
91
|
+
puts yellow('SKIPPED! skipped until ruby 1.8.6 compatibilites ironed out')
|
92
|
+
end
|
93
|
+
end
|
94
|
+
|
@@ -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,26 @@
|
|
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 'new_relic/agent/instrumentation/active_record'
|
5
|
+
|
6
|
+
class DatabaseAdapter
|
7
|
+
# we patch in here
|
8
|
+
def log(*args)
|
9
|
+
end
|
10
|
+
include ::NewRelic::Agent::Instrumentation::ActiveRecord
|
11
|
+
end
|
12
|
+
|
13
|
+
class EncodingTest < Test::Unit::TestCase
|
14
|
+
|
15
|
+
def test_should_not_bomb_out_if_a_query_is_in_an_invalid_encoding
|
16
|
+
# Contains invalid UTF8 Byte
|
17
|
+
query = "select ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000"
|
18
|
+
if RUBY_VERSION >= '1.9'
|
19
|
+
# Force the query to an invalid encoding
|
20
|
+
query.force_encoding 'UTF-8'
|
21
|
+
assert_equal false, query.valid_encoding?
|
22
|
+
end
|
23
|
+
db = DatabaseAdapter.new
|
24
|
+
db.send(:log, query)
|
25
|
+
end
|
26
|
+
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: 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,53 @@
|
|
1
|
+
# https://newrelic.atlassian.net/browse/RUBY-765
|
2
|
+
require 'fake_collector'
|
3
|
+
|
4
|
+
class HttpResponseCodeTest < Test::Unit::TestCase
|
5
|
+
def setup
|
6
|
+
$collector ||= NewRelic::FakeCollector.new
|
7
|
+
$collector.reset
|
8
|
+
$collector.run
|
9
|
+
NewRelic::Agent.manual_start(:send_data_on_exit => false)
|
10
|
+
@agent = NewRelic::Agent.instance
|
11
|
+
end
|
12
|
+
|
13
|
+
def teardown
|
14
|
+
$collector.reset
|
15
|
+
NewRelic::Agent.shutdown
|
16
|
+
end
|
17
|
+
|
18
|
+
def test_request_entity_too_large
|
19
|
+
$collector.mock['metric_data'] = [413, {'exception' => {'error_type' => 'RuntimeError', 'message' => 'too much'}}]
|
20
|
+
|
21
|
+
@agent.stats_engine.get_stats_no_scope('Custom/too_big') \
|
22
|
+
.record_data_point(1)
|
23
|
+
assert_equal 1, @agent.stats_engine \
|
24
|
+
.get_stats_no_scope('Custom/too_big').call_count
|
25
|
+
|
26
|
+
@agent.send(:harvest_and_send_timeslice_data)
|
27
|
+
|
28
|
+
# make sure the data gets thrown away without crashing
|
29
|
+
assert_equal 0, @agent.stats_engine \
|
30
|
+
.get_stats_no_scope('Custom/too_big').call_count
|
31
|
+
|
32
|
+
# make sure we actually talked to the collector
|
33
|
+
assert_equal(1, $collector.agent_data.select{|x| x.action == 'metric_data'}.size)
|
34
|
+
end
|
35
|
+
|
36
|
+
def test_unsupported_media_type
|
37
|
+
$collector.mock['metric_data'] = [415, {'exception' => {'error_type' => 'RuntimeError', 'message' => 'looks bad'}}]
|
38
|
+
|
39
|
+
@agent.stats_engine.get_stats_no_scope('Custom/too_big') \
|
40
|
+
.record_data_point(1)
|
41
|
+
assert_equal 1, @agent.stats_engine \
|
42
|
+
.get_stats_no_scope('Custom/too_big').call_count
|
43
|
+
|
44
|
+
@agent.send(:harvest_and_send_timeslice_data)
|
45
|
+
|
46
|
+
# make sure the data gets thrown away without crashing
|
47
|
+
assert_equal 0, @agent.stats_engine \
|
48
|
+
.get_stats_no_scope('Custom/too_big').call_count
|
49
|
+
|
50
|
+
# make sure we actually talked to the collector
|
51
|
+
assert_equal(1, $collector.agent_data.select{|x| x.action == 'metric_data'}.size)
|
52
|
+
end
|
53
|
+
end
|
@@ -0,0 +1,109 @@
|
|
1
|
+
# https://newrelic.atlassian.net/wiki/display/eng/The+Terror+and+Glory+of+Transaction+Traces
|
2
|
+
# https://newrelic.atlassian.net/browse/RUBY-914
|
3
|
+
|
4
|
+
class MarshalingTest < Test::Unit::TestCase
|
5
|
+
def setup
|
6
|
+
NewRelic::Agent.manual_start(:'transaction_tracer.transaction_threshold' => 0.0)
|
7
|
+
@agent = NewRelic::Agent.instance
|
8
|
+
@sampler = @agent.transaction_sampler
|
9
|
+
|
10
|
+
$collector ||= NewRelic::FakeCollector.new
|
11
|
+
$collector.reset
|
12
|
+
$collector.mock['connect'] = [200, {'return_value' => { 'agent_run_id' => 666 }}]
|
13
|
+
$collector.run
|
14
|
+
end
|
15
|
+
|
16
|
+
def teardown
|
17
|
+
Thread.current[:transaction_sample_builder] = nil
|
18
|
+
$collector.reset
|
19
|
+
end
|
20
|
+
|
21
|
+
def test_transaction_trace_marshaling
|
22
|
+
# create fake transaction trace
|
23
|
+
time = Time.now.to_f
|
24
|
+
@sampler.notice_first_scope_push time
|
25
|
+
@sampler.notice_transaction '/path', nil, {}
|
26
|
+
@sampler.notice_push_scope "a"
|
27
|
+
@sampler.notice_push_scope "ab"
|
28
|
+
sleep 1
|
29
|
+
@sampler.notice_pop_scope "ab"
|
30
|
+
@sampler.notice_pop_scope "a"
|
31
|
+
@sampler.notice_scope_empty
|
32
|
+
|
33
|
+
expected_sample = @sampler.instance_variable_get(:@slowest_sample)
|
34
|
+
|
35
|
+
@agent.service.connect
|
36
|
+
@agent.send(:harvest_and_send_slowest_sample)
|
37
|
+
|
38
|
+
if NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported?
|
39
|
+
marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new
|
40
|
+
else
|
41
|
+
marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
|
42
|
+
end
|
43
|
+
|
44
|
+
assert_equal(666,
|
45
|
+
$collector.agent_data.select{|x| x.action == 'transaction_sample_data'}[0].body[0])
|
46
|
+
assert_equal(expected_sample.to_collector_array(marshaller),
|
47
|
+
$collector.agent_data.select{|x| x.action == 'transaction_sample_data'}[0].body[1][0])
|
48
|
+
end
|
49
|
+
|
50
|
+
def test_metric_data_marshalling
|
51
|
+
stats = NewRelic::Agent.instance.stats_engine.get_stats_no_scope('Custom/test/method')
|
52
|
+
stats.record_data_point(1.0)
|
53
|
+
stats.record_data_point(2.0, 1.0)
|
54
|
+
expected = [ [ {'name' => 'Custom/test/method', 'scope' => ''},
|
55
|
+
[2, 3.0, 2.0, 1.0, 2.0, 5.0] ] ]
|
56
|
+
|
57
|
+
@agent.service.connect
|
58
|
+
@agent.send(:harvest_and_send_timeslice_data)
|
59
|
+
|
60
|
+
assert_equal(666,
|
61
|
+
$collector.agent_data.select{|x| x.action == 'metric_data'}[0].body[0])
|
62
|
+
|
63
|
+
metric_data = $collector.agent_data \
|
64
|
+
.select{|x| x.action == 'metric_data'}[0].body[3]
|
65
|
+
assert metric_data
|
66
|
+
|
67
|
+
custom_metric = metric_data \
|
68
|
+
.select{|m| m[0]['name'] == 'Custom/test/method' }
|
69
|
+
assert_equal(expected, custom_metric)
|
70
|
+
end
|
71
|
+
|
72
|
+
def test_error_data_marshalling
|
73
|
+
@agent.error_collector.notice_error(Exception.new('test error'))
|
74
|
+
@agent.service.connect
|
75
|
+
@agent.send(:harvest_and_send_errors)
|
76
|
+
|
77
|
+
assert_equal(666,
|
78
|
+
$collector.agent_data.select{|x| x.action == 'error_data'}[0].body[0])
|
79
|
+
|
80
|
+
error_data = $collector.agent_data \
|
81
|
+
.select{|x| x.action == 'error_data'}[0].body[1][0]
|
82
|
+
assert_equal('test error', error_data[2])
|
83
|
+
end
|
84
|
+
|
85
|
+
def test_sql_trace_data_marshalling
|
86
|
+
@agent.sql_sampler.notice_first_scope_push(nil)
|
87
|
+
@agent.sql_sampler.notice_sql("select * from test",
|
88
|
+
"Database/test/select",
|
89
|
+
nil, 1.5)
|
90
|
+
@agent.sql_sampler.notice_scope_empty
|
91
|
+
|
92
|
+
@agent.service.connect
|
93
|
+
@agent.send(:harvest_and_send_slowest_sql)
|
94
|
+
|
95
|
+
sql_data = $collector.agent_data \
|
96
|
+
.select{|x| x.action == 'sql_trace_data'}[0].body[0]
|
97
|
+
assert_equal('select * from test', sql_data[0][3])
|
98
|
+
end
|
99
|
+
|
100
|
+
def test_connect_marshalling
|
101
|
+
@agent.service.connect('pid' => 1, 'agent_version' => '9000',
|
102
|
+
'app_name' => 'test')
|
103
|
+
|
104
|
+
connect_data = $collector.agent_data \
|
105
|
+
.select{|x| x.action == 'connect'}[0].body[0]
|
106
|
+
assert_equal '9000', connect_data['agent_version']
|
107
|
+
end
|
108
|
+
end
|
109
|
+
|
@@ -0,0 +1,98 @@
|
|
1
|
+
require 'multiverse/color'
|
2
|
+
|
3
|
+
class MethodVisibilityTest < Test::Unit::TestCase
|
4
|
+
extend Multiverse::Color
|
5
|
+
|
6
|
+
class InstrumentedClass
|
7
|
+
include NewRelic::Agent::MethodTracer
|
8
|
+
include NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
9
|
+
|
10
|
+
def public_method!
|
11
|
+
end
|
12
|
+
|
13
|
+
def public_transaction!
|
14
|
+
end
|
15
|
+
|
16
|
+
private
|
17
|
+
def private_method!
|
18
|
+
end
|
19
|
+
|
20
|
+
def private_transaction!
|
21
|
+
end
|
22
|
+
|
23
|
+
protected
|
24
|
+
def protected_method!
|
25
|
+
end
|
26
|
+
|
27
|
+
def protected_transaction!
|
28
|
+
end
|
29
|
+
|
30
|
+
add_method_tracer :public_method!
|
31
|
+
add_method_tracer :private_method!
|
32
|
+
add_method_tracer :protected_method!
|
33
|
+
|
34
|
+
add_transaction_tracer :public_transaction!
|
35
|
+
add_transaction_tracer :private_transaction!
|
36
|
+
add_transaction_tracer :protected_transaction!
|
37
|
+
end
|
38
|
+
|
39
|
+
|
40
|
+
class ObjectWithInstrumentation
|
41
|
+
include NewRelic::Agent::MethodTracer
|
42
|
+
include NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
43
|
+
end
|
44
|
+
|
45
|
+
class ObjectWithTracers < ObjectWithInstrumentation
|
46
|
+
private
|
47
|
+
def a_private_method
|
48
|
+
end
|
49
|
+
def a_private_transaction
|
50
|
+
end
|
51
|
+
protected
|
52
|
+
def a_protected_method
|
53
|
+
end
|
54
|
+
def a_protected_transaction
|
55
|
+
end
|
56
|
+
|
57
|
+
add_method_tracer :a_private_method
|
58
|
+
add_method_tracer :a_protected_method
|
59
|
+
add_transaction_tracer :a_private_transaction
|
60
|
+
add_transaction_tracer :a_protected_transaction
|
61
|
+
end
|
62
|
+
|
63
|
+
|
64
|
+
def setup
|
65
|
+
@instance = InstrumentedClass.new
|
66
|
+
end
|
67
|
+
|
68
|
+
if NewRelic::VERSION::STRING >= '3.4.0.2'
|
69
|
+
%w| public private protected |.each do |visibility|
|
70
|
+
define_method "test_should_preserve_visibility_of_#{visibility}_traced_method" do
|
71
|
+
assert @instance.send("#{visibility}_methods").map{|s|s.to_sym}.include?(:"#{visibility}_method!"), "Method #{visibility}_method should be #{visibility}"
|
72
|
+
end
|
73
|
+
|
74
|
+
define_method "test_should_preserve_visibility_of_#{visibility}_traced_transaction" do
|
75
|
+
assert @instance.send("#{visibility}_methods").map{|s|s.to_sym}.include?(:"#{visibility}_transaction!"), "Transcation #{visibility}_transaction should be #{visibility}"
|
76
|
+
end
|
77
|
+
end
|
78
|
+
|
79
|
+
def test_tracing_non_public_methods_doesnt_add_public_methods
|
80
|
+
assert_equal [], ObjectWithTracers.public_instance_methods - ObjectWithInstrumentation.public_instance_methods
|
81
|
+
end
|
82
|
+
|
83
|
+
# FIXME: Currently including MethodTracer and ControllerInstrumentation
|
84
|
+
# adds a bunch of public methods to the class. It probably shouldn't do this.
|
85
|
+
#def test_instrumentation_doesnt_add_any_public_methods
|
86
|
+
# assert_equal [], ObjectWithInstrumentation.public_instance_methods - Object.public_instance_methods
|
87
|
+
#end
|
88
|
+
#
|
89
|
+
|
90
|
+
|
91
|
+
|
92
|
+
else
|
93
|
+
def test_truth
|
94
|
+
assert true # jruby freaks out if there are no tests defined in the test class
|
95
|
+
end
|
96
|
+
puts yellow('SKIPPED! 3.4.0.1 and earlier fail preserve_visibility tests')
|
97
|
+
end
|
98
|
+
end
|