newrelic_rpm 3.6.5.130 → 3.6.6.147
Sign up to get free protection for your applications and to get access to all the features.
- data.tar.gz.sig +0 -0
- data/CHANGELOG +27 -3
- data/Gemfile +1 -14
- data/Rakefile +15 -5
- data/config.dot +1 -1
- data/lib/new_relic/agent/agent.rb +15 -0
- data/lib/new_relic/agent/agent_logger.rb +19 -14
- data/lib/new_relic/agent/configuration/defaults.rb +4 -3
- data/lib/new_relic/agent/configuration/environment_source.rb +6 -4
- data/lib/new_relic/agent/configuration/manager.rb +7 -2
- data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -2
- data/lib/new_relic/agent/cross_app_monitor.rb +5 -4
- data/lib/new_relic/agent/cross_app_tracing.rb +0 -1
- data/lib/new_relic/agent/error_collector.rb +30 -1
- data/lib/new_relic/agent/http_clients/curb_wrappers.rb +67 -0
- data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +59 -0
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +12 -0
- data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -3
- data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +3 -3
- data/lib/new_relic/agent/instrumentation/authlogic.rb +3 -3
- data/lib/new_relic/agent/instrumentation/curb.rb +179 -0
- data/lib/new_relic/agent/instrumentation/data_mapper.rb +3 -3
- data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +35 -26
- data/lib/new_relic/agent/instrumentation/httpclient.rb +46 -0
- data/lib/new_relic/agent/instrumentation/merb/controller.rb +3 -3
- data/lib/new_relic/agent/instrumentation/puma.rb +23 -0
- data/lib/new_relic/agent/instrumentation/rack.rb +40 -0
- data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +4 -4
- data/lib/new_relic/agent/instrumentation/rails/errors.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sequel.rb +0 -1
- data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
- data/lib/new_relic/agent/internal_agent_error.rb +18 -0
- data/lib/new_relic/agent/new_relic_service.rb +2 -8
- data/lib/new_relic/agent/request_sampler.rb +4 -6
- data/lib/new_relic/agent/samplers/cpu_sampler.rb +0 -1
- data/lib/new_relic/agent/stats.rb +9 -0
- data/lib/new_relic/agent/stats_engine/stats_hash.rb +44 -6
- data/lib/new_relic/agent/system_info.rb +1 -1
- data/lib/new_relic/agent/thread_profiler.rb +6 -6
- data/lib/new_relic/agent/transaction.rb +1 -1
- data/lib/new_relic/agent/transaction_info.rb +0 -1
- data/lib/new_relic/agent/transaction_sample_builder.rb +6 -5
- data/lib/new_relic/agent/transaction_sampler.rb +1 -1
- data/lib/new_relic/commands/deployments.rb +6 -0
- data/lib/new_relic/commands/install.rb +2 -2
- data/lib/new_relic/control/frameworks/rails.rb +1 -2
- data/lib/new_relic/control/instrumentation.rb +2 -2
- data/lib/new_relic/control/server_methods.rb +1 -2
- data/lib/new_relic/delayed_job_injection.rb +0 -40
- data/lib/new_relic/helper.rb +0 -1
- data/lib/new_relic/latest_changes.rb +1 -1
- data/lib/new_relic/local_environment.rb +9 -4
- data/lib/new_relic/metric_spec.rb +19 -3
- data/lib/new_relic/noticed_error.rb +2 -1
- data/lib/new_relic/rack/agent_hooks.rb +0 -1
- data/lib/new_relic/rack/developer_mode.rb +1 -1
- data/lib/new_relic/rack/error_collector.rb +42 -21
- data/lib/new_relic/recipes.rb +0 -1
- data/lib/new_relic/transaction_analysis.rb +0 -1
- data/lib/new_relic/transaction_sample/segment.rb +4 -4
- data/lib/new_relic/version.rb +1 -1
- data/lib/sequel/extensions/newrelic_instrumentation.rb +6 -7
- data/lib/sequel/plugins/newrelic_instrumentation.rb +0 -1
- data/lib/tasks/install.rake +2 -2
- data/newrelic_rpm.gemspec +11 -1
- data/test/active_record_fixtures.rb +2 -2
- data/test/agent_helper.rb +46 -3
- data/test/config/newrelic.yml +2 -2
- data/test/multiverse/.gitignore +2 -0
- data/test/multiverse/lib/multiverse/envfile.rb +6 -9
- data/test/multiverse/lib/multiverse/environment.rb +0 -1
- data/test/multiverse/lib/multiverse/output_collector.rb +43 -11
- data/test/multiverse/lib/multiverse/runner.rb +37 -5
- data/test/multiverse/lib/multiverse/suite.rb +149 -67
- data/test/multiverse/script/run_one +4 -2
- data/test/multiverse/script/runner +1 -5
- data/test/multiverse/suites/active_record/Envfile +3 -2
- data/test/multiverse/suites/active_record/ar_method_aliasing.rb +13 -12
- data/test/multiverse/suites/active_record/config/newrelic.yml +0 -3
- data/test/multiverse/suites/agent_only/audit_log_test.rb +30 -34
- data/test/multiverse/suites/agent_only/before_suite.rb +7 -0
- data/test/multiverse/suites/agent_only/config/newrelic.yml +1 -7
- data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb +12 -20
- data/test/multiverse/suites/agent_only/http_response_code_test.rb +16 -34
- data/test/multiverse/suites/agent_only/key_transactions_test.rb +18 -28
- data/test/multiverse/suites/agent_only/logging_test.rb +25 -49
- data/test/multiverse/suites/agent_only/marshaling_test.rb +30 -38
- data/test/multiverse/suites/agent_only/pipe_manager_test.rb +12 -6
- data/test/multiverse/suites/agent_only/rename_rule_test.rb +30 -38
- data/test/multiverse/suites/agent_only/rum_instrumentation_test.rb +16 -18
- data/test/multiverse/suites/agent_only/service_timeout_test.rb +6 -7
- data/test/multiverse/suites/agent_only/set_transaction_name_test.rb +26 -32
- data/test/multiverse/suites/agent_only/ssl_test.rb +10 -14
- data/test/multiverse/suites/agent_only/start_up_test.rb +1 -1
- data/test/multiverse/suites/agent_only/testing_app.rb +2 -0
- data/test/multiverse/suites/agent_only/thread_profiling_test.rb +23 -24
- data/test/multiverse/suites/config_file_loading/Envfile +6 -2
- data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb +8 -4
- data/test/multiverse/suites/curb/Envfile +19 -0
- data/test/multiverse/suites/curb/config/newrelic.yml +19 -0
- data/test/multiverse/suites/curb/curb_test.rb +195 -0
- data/test/multiverse/suites/datamapper/Envfile +2 -0
- data/test/multiverse/suites/datamapper/config/newrelic.yml +0 -2
- data/test/multiverse/suites/datamapper/datamapper_test.rb +6 -10
- data/test/multiverse/suites/deferred_instrumentation/Envfile +19 -0
- data/test/multiverse/suites/deferred_instrumentation/config/newrelic.yml +22 -0
- data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb +103 -0
- data/test/multiverse/suites/excon/config/newrelic.yml +0 -2
- data/test/multiverse/suites/excon/excon_test.rb +3 -3
- data/test/multiverse/suites/httpclient/Envfile +15 -0
- data/test/multiverse/suites/httpclient/config/newrelic.yml +19 -0
- data/test/multiverse/suites/httpclient/httpclient_test.rb +70 -0
- data/test/multiverse/suites/net_http/config/newrelic.yml +0 -2
- data/test/multiverse/suites/net_http/net_http_test.rb +9 -4
- data/test/multiverse/suites/padrino/Envfile +2 -0
- data/test/multiverse/suites/padrino/config/newrelic.yml +0 -3
- data/test/multiverse/suites/padrino/padrino_test.rb +5 -4
- data/test/multiverse/suites/rails/Envfile +3 -0
- data/test/multiverse/suites/rails/app.rb +1 -0
- data/test/multiverse/suites/rails/bad_instrumentation_test.rb +31 -0
- data/test/multiverse/suites/rails/config/newrelic.yml +2 -3
- data/test/multiverse/suites/rails/error_tracing_test.rb +32 -41
- data/test/multiverse/suites/rails/gc_instrumentation_test.rb +6 -16
- data/test/multiverse/suites/rails/queue_time_test.rb +4 -20
- data/test/multiverse/suites/rails/request_statistics_test.rb +7 -32
- data/test/multiverse/suites/rails/view_instrumentation_test.rb +6 -10
- data/test/multiverse/suites/resque/config/newrelic.yml +1 -3
- data/test/multiverse/suites/resque/instrumentation_test.rb +10 -7
- data/test/multiverse/suites/sequel/Envfile +8 -0
- data/test/multiverse/suites/sequel/config/newrelic.yml +0 -3
- data/test/multiverse/suites/sequel/sequel_test.rb +1 -2
- data/test/multiverse/suites/sidekiq/Envfile +0 -12
- data/test/multiverse/suites/sidekiq/config/newrelic.yml +1 -3
- data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb +44 -100
- data/test/multiverse/suites/sinatra/config/newrelic.yml +0 -3
- data/test/multiverse/suites/sinatra/ignoring_test.rb +8 -5
- data/test/multiverse/suites/sinatra/sinatra_classic_test.rb +8 -1
- data/test/multiverse/suites/sinatra/sinatra_error_tracing_test.rb +9 -12
- data/test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb +9 -8
- data/test/multiverse/suites/sinatra/sinatra_modular_test.rb +1 -1
- data/test/multiverse/suites/sinatra/sinatra_routes_test.rb +6 -5
- data/test/multiverse/suites/sinatra/sinatra_test_cases.rb +10 -13
- data/test/multiverse/suites/typhoeus/config/newrelic.yml +0 -2
- data/test/multiverse/suites/typhoeus/typhoeus_test.rb +7 -4
- data/test/multiverse/test/suite_examples/one/a/a_test.rb +0 -1
- data/test/multiverse/test/suite_examples/one/a/config/newrelic.yml +0 -1
- data/test/multiverse/test/suite_examples/one/b/b_test.rb +0 -1
- data/test/multiverse/test/suite_examples/one/b/config/newrelic.yml +0 -1
- data/test/new_relic/agent/agent/connect_test.rb +1 -1
- data/test/new_relic/agent/agent/start_test.rb +0 -1
- data/test/new_relic/agent/agent/start_worker_thread_test.rb +0 -1
- data/test/new_relic/agent/agent_logger_test.rb +37 -3
- data/test/new_relic/agent/agent_test.rb +23 -1
- data/test/new_relic/agent/browser_monitoring_test.rb +0 -1
- data/test/new_relic/agent/busy_calculator_test.rb +2 -2
- data/test/new_relic/agent/configuration/environment_source_test.rb +22 -0
- data/test/new_relic/agent/error_collector/notice_error_test.rb +1 -1
- data/test/new_relic/agent/error_collector_test.rb +95 -13
- data/test/new_relic/agent/event_listener_test.rb +0 -1
- data/test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb +23 -0
- data/test/new_relic/agent/instrumentation/active_record_subscriber_test.rb +4 -2
- data/test/new_relic/agent/instrumentation/instrumentation_test.rb +0 -1
- data/test/new_relic/agent/instrumentation/queue_time_test.rb +16 -11
- data/test/new_relic/agent/instrumentation/rack_test.rb +0 -1
- data/test/new_relic/agent/memcache_instrumentation_test.rb +7 -7
- data/test/{multiverse/suites/agent_only/test_trace_method_with_punctuation.rb → new_relic/agent/method_interrobang_test.rb} +3 -5
- data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb +1 -2
- data/test/{multiverse/suites/agent_only → new_relic/agent}/method_visibility_test.rb +17 -29
- data/test/new_relic/agent/new_relic_service_test.rb +1 -1
- data/test/new_relic/agent/pipe_service_test.rb +1 -1
- data/test/new_relic/agent/request_sampler_test.rb +10 -10
- data/test/new_relic/agent/rpm_agent_test.rb +1 -2
- data/test/new_relic/agent/stats_hash_test.rb +83 -5
- data/test/new_relic/agent/stats_test.rb +0 -1
- data/test/new_relic/agent/thread_profiler_test.rb +7 -7
- data/test/new_relic/agent/threaded_test.rb +1 -2
- data/test/new_relic/agent/transaction/pop_test.rb +0 -1
- data/test/{multiverse/suites/agent_only/test_trace_transaction_with_punctuation.rb → new_relic/agent/transaction_interrobang_test.rb} +2 -4
- data/test/new_relic/agent/transaction_sample_builder_test.rb +13 -0
- data/test/new_relic/agent/transaction_test.rb +7 -5
- data/test/new_relic/agent/worker_loop_test.rb +0 -1
- data/test/new_relic/agent_test.rb +0 -27
- data/test/new_relic/collection_helper_test.rb +17 -17
- data/test/new_relic/control/class_methods_test.rb +1 -1
- data/test/new_relic/control_test.rb +6 -6
- data/test/new_relic/dependency_detection_test.rb +28 -0
- data/test/new_relic/evil_server.rb +0 -1
- data/test/new_relic/fake_collector.rb +20 -2
- data/test/new_relic/fake_server.rb +0 -12
- data/test/new_relic/http_client_test_cases.rb +20 -24
- data/test/new_relic/metric_spec_test.rb +18 -0
- data/test/new_relic/multiverse_helpers.rb +164 -0
- data/test/new_relic/rack/agent_hooks_test.rb +0 -1
- data/test/new_relic/rack/all_test.rb +0 -1
- data/test/new_relic/rack/deferred_instrumentation_test.rb +35 -0
- data/test/new_relic/rack/developer_mode_helper_test.rb +8 -9
- data/test/new_relic/rack/developer_mode_test.rb +0 -2
- data/test/new_relic/rack/error_collector_test.rb +52 -8
- data/test/new_relic/transaction_sample/composite_segment_test.rb +0 -1
- data/test/new_relic/transaction_sample/fake_segment_test.rb +0 -1
- data/test/new_relic/transaction_sample/segment_test.rb +0 -1
- data/test/new_relic/transaction_sample/summary_segment_test.rb +0 -1
- data/test/performance/README.md +162 -0
- data/test/performance/lib/performance.rb +28 -0
- data/test/performance/lib/performance/console_reporter.rb +51 -0
- data/test/performance/lib/performance/hako_client.rb +31 -0
- data/test/performance/lib/performance/hako_reporter.rb +26 -0
- data/test/performance/lib/performance/instrumentation/cpu_usage.rb +26 -0
- data/test/performance/lib/performance/instrumentation/gc_stats.rb +53 -0
- data/test/performance/lib/performance/instrumentation/perf_tools.rb +30 -0
- data/test/performance/lib/performance/instrumentor.rb +110 -0
- data/test/performance/lib/performance/json_reporter.rb +15 -0
- data/test/performance/lib/performance/result.rb +80 -0
- data/test/performance/lib/performance/runner.rb +207 -0
- data/test/performance/lib/performance/test_case.rb +65 -0
- data/test/performance/lib/performance/timer.rb +38 -0
- data/test/performance/script/mega-runner +37 -0
- data/test/performance/script/runner +81 -0
- data/test/performance/suites/startup.rb +12 -0
- data/test/performance/suites/transaction_tracing.rb +66 -0
- data/test/script/ci_agent-tests_runner.sh +4 -4
- data/test/script/ci_multiverse_runner.sh +3 -3
- data/test/test_helper.rb +0 -11
- data/ui/helpers/developer_mode_helper.rb +1 -1
- data/ui/views/layouts/newrelic_default.rhtml +1 -1
- data/ui/views/newrelic/_segment.rhtml +2 -2
- data/ui/views/newrelic/_segment_limit_message.rhtml +1 -1
- data/ui/views/newrelic/_show_sample_detail.rhtml +1 -1
- data/ui/views/newrelic/_show_sample_sql.rhtml +4 -4
- data/ui/views/newrelic/_stack_trace.rhtml +2 -2
- data/ui/views/newrelic/file/javascript/transaction_sample.js +3 -3
- data/ui/views/newrelic/file/stylesheets/style.css +13 -13
- data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb +18 -4
- data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/metric_parser.rb +0 -1
- metadata +186 -17
- metadata.gz.sig +0 -0
- data/test/multiverse/suites/active_record/encoding_test.rb +0 -30
- data/test/multiverse/suites/agent_only/no_dns_resolv.rb +0 -21
- data/test/multiverse/suites/sidekiq/app.rb +0 -25
- data/test/new_relic/delayed_job_injection_test.rb +0 -25
@@ -0,0 +1,207 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
|
5
|
+
require 'socket'
|
6
|
+
|
7
|
+
module Performance
|
8
|
+
class Runner
|
9
|
+
attr_reader :instrumentors
|
10
|
+
|
11
|
+
DEFAULTS = {
|
12
|
+
:instrumentors => [],
|
13
|
+
:inline => false,
|
14
|
+
:iterations => 10000,
|
15
|
+
:reporter_classes => ['ConsoleReporter'],
|
16
|
+
:brief => false,
|
17
|
+
:tags => {},
|
18
|
+
:dir => File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'suites')),
|
19
|
+
:agent_path => ENV['AGENT_PATH'] || File.join(File.dirname(__FILE__), '..', '..', '..', '..')
|
20
|
+
}
|
21
|
+
|
22
|
+
def initialize(options={})
|
23
|
+
@options = DEFAULTS.merge(options)
|
24
|
+
create_instrumentors(options[:instrumentors] || [])
|
25
|
+
load_test_files(@options[:dir])
|
26
|
+
@reporter_classes = @options[:reporter_classes].map { |cls| Performance.const_get(cls) }
|
27
|
+
@hostname = Socket.gethostname
|
28
|
+
end
|
29
|
+
|
30
|
+
def artifacts_base_dir
|
31
|
+
File.expand_path(File.join('.', 'artifacts'))
|
32
|
+
end
|
33
|
+
|
34
|
+
def create_instrumentors(names)
|
35
|
+
instrumentor_classes = names.map do |name|
|
36
|
+
Performance::Instrumentation.instrumentor_class_by_name(name)
|
37
|
+
end.compact
|
38
|
+
|
39
|
+
instrumentor_classes |= Instrumentation.default_instrumentors
|
40
|
+
|
41
|
+
@instrumentors = []
|
42
|
+
instrumentor_classes.each do |cls|
|
43
|
+
cls.setup if cls.respond_to?(:setup)
|
44
|
+
@instrumentors << cls.new(artifacts_base_dir)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
|
48
|
+
def load_test_files(dir)
|
49
|
+
Dir.glob(File.join(dir, "**", "*.rb")).each do |filename|
|
50
|
+
require filename
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
def add_progress_callbacks(test_case)
|
55
|
+
test_case.on(:before_each) do |test_case, name|
|
56
|
+
print "#{name}: "
|
57
|
+
end
|
58
|
+
test_case.on(:after_each) do |test_case, name, result|
|
59
|
+
print "#{result.elapsed} s\n"
|
60
|
+
end
|
61
|
+
end
|
62
|
+
|
63
|
+
def add_instrumentor_callbacks(test_case)
|
64
|
+
test_case.on(:before_each) do |test, test_name|
|
65
|
+
instrumentors.each do |i|
|
66
|
+
i.reset
|
67
|
+
i.before(test, test_name)
|
68
|
+
end
|
69
|
+
end
|
70
|
+
test_case.on(:after_each) do |test, test_name, result|
|
71
|
+
instrumentors.reverse.each { |i| i.after(test, test_name) }
|
72
|
+
instrumentors.each do |i|
|
73
|
+
result.measurements.merge!(i.results)
|
74
|
+
result.artifacts.concat(i.artifacts)
|
75
|
+
end
|
76
|
+
end
|
77
|
+
end
|
78
|
+
|
79
|
+
def add_metadata_callbacks(test_case)
|
80
|
+
test_case.on(:after_each) do |test, test_name, result|
|
81
|
+
result.tags.merge!(
|
82
|
+
:newrelic_rpm_version => @newrelic_rpm_version,
|
83
|
+
:newrelic_rpm_git_sha => @newrelic_rpm_git_sha,
|
84
|
+
:ruby_version => RUBY_DESCRIPTION,
|
85
|
+
:host => @hostname
|
86
|
+
)
|
87
|
+
result.tags.merge!(@options[:tags])
|
88
|
+
end
|
89
|
+
end
|
90
|
+
|
91
|
+
def create_test_case(cls)
|
92
|
+
test_case = cls.new
|
93
|
+
test_case.iterations = @options[:iterations]
|
94
|
+
add_progress_callbacks(test_case) if @options[:progress]
|
95
|
+
add_instrumentor_callbacks(test_case)
|
96
|
+
add_metadata_callbacks(test_case)
|
97
|
+
test_case
|
98
|
+
end
|
99
|
+
|
100
|
+
def methods_for_test_case(test_case)
|
101
|
+
methods = test_case.runnable_test_methods
|
102
|
+
methods = methods.shuffle if @options[:randomize]
|
103
|
+
if @options[:name]
|
104
|
+
filter = Regexp.new(@options[:name])
|
105
|
+
methods = methods.select { |m| m.match(filter) }
|
106
|
+
elsif @options[:identifier]
|
107
|
+
suite, method = @options[:identifier].split('#')
|
108
|
+
methods = methods.select { |m| m == method }
|
109
|
+
end
|
110
|
+
methods
|
111
|
+
end
|
112
|
+
|
113
|
+
def newrelic_rpm_path
|
114
|
+
File.expand_path(File.join(@options[:agent_path], 'lib'))
|
115
|
+
end
|
116
|
+
|
117
|
+
def load_newrelic_rpm
|
118
|
+
unless @loaded_newrelic_rpm
|
119
|
+
path = newrelic_rpm_path
|
120
|
+
$:.unshift(path)
|
121
|
+
require "newrelic_rpm"
|
122
|
+
@newrelic_rpm_version = NewRelic::VERSION::STRING
|
123
|
+
@newrelic_rpm_git_sha = find_newrelic_rpm_git_sha(path)
|
124
|
+
@loaded_newrelic_rpm = true
|
125
|
+
end
|
126
|
+
end
|
127
|
+
|
128
|
+
def find_newrelic_rpm_git_sha(path)
|
129
|
+
build_file_path = File.join(path, 'new_relic', 'build.rb')
|
130
|
+
if File.exist?(build_file_path)
|
131
|
+
build_file_contents = File.read(build_file_path)
|
132
|
+
return $1.strip if build_file_contents =~ /GITSHA: (.*)/
|
133
|
+
else
|
134
|
+
%x((cd '#{path}' && git log --pretty='%h' -n 1)).strip
|
135
|
+
end
|
136
|
+
end
|
137
|
+
|
138
|
+
def run_test_subprocess(test_case, method)
|
139
|
+
test_case_name = test_case.class.name
|
140
|
+
test_identifier = "#{test_case_name}##{method}"
|
141
|
+
runner_script = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'script', 'runner'))
|
142
|
+
cmd = "#{runner_script} -T #{test_identifier} -N #{@options[:iterations]} -A #{@options[:agent_path]} -j -q -I"
|
143
|
+
output = nil
|
144
|
+
IO.popen(cmd) do |io|
|
145
|
+
output = io.read
|
146
|
+
end
|
147
|
+
results = JSON.parse(output)
|
148
|
+
result = Result.from_hash(results.first)
|
149
|
+
result.tags.merge!(@options[:tags])
|
150
|
+
result
|
151
|
+
end
|
152
|
+
|
153
|
+
def run_test_inline(test_case, method)
|
154
|
+
begin
|
155
|
+
load_newrelic_rpm
|
156
|
+
GC.start
|
157
|
+
test_case.run(method)
|
158
|
+
rescue => e
|
159
|
+
result = Result.new(test_case.class.name, method)
|
160
|
+
result.exception = e
|
161
|
+
result
|
162
|
+
end
|
163
|
+
end
|
164
|
+
|
165
|
+
def run_test_case(test_case)
|
166
|
+
methods_for_test_case(test_case).map do |method|
|
167
|
+
if @options[:inline]
|
168
|
+
run_test_inline(test_case, method)
|
169
|
+
else
|
170
|
+
run_test_subprocess(test_case, method)
|
171
|
+
end
|
172
|
+
end
|
173
|
+
end
|
174
|
+
|
175
|
+
def suites_to_run
|
176
|
+
if @options[:identifier]
|
177
|
+
suite, method = @options[:identifier].split('#')
|
178
|
+
TestCase.subclasses.select { |cls| cls.name == suite }
|
179
|
+
elsif @options[:suite]
|
180
|
+
TestCase.subclasses.select { |cls| cls.name == @options[:suite] }
|
181
|
+
else
|
182
|
+
TestCase.subclasses
|
183
|
+
end
|
184
|
+
end
|
185
|
+
|
186
|
+
def run_all_test_cases
|
187
|
+
results = []
|
188
|
+
suites_to_run.each do |cls|
|
189
|
+
test_case = create_test_case(cls)
|
190
|
+
results += run_test_case(test_case)
|
191
|
+
end
|
192
|
+
results
|
193
|
+
end
|
194
|
+
|
195
|
+
def run_and_report
|
196
|
+
t0 = Time.now
|
197
|
+
results = run_all_test_cases
|
198
|
+
report_results(results, Time.now - t0)
|
199
|
+
end
|
200
|
+
|
201
|
+
def report_results(results, elapsed)
|
202
|
+
@reporter_classes.each do |cls|
|
203
|
+
cls.new(results, elapsed, @options).report
|
204
|
+
end
|
205
|
+
end
|
206
|
+
end
|
207
|
+
end
|
@@ -0,0 +1,65 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
|
5
|
+
module Performance
|
6
|
+
class TestCase
|
7
|
+
@subclasses = []
|
8
|
+
|
9
|
+
def self.inherited(cls)
|
10
|
+
@subclasses << cls
|
11
|
+
end
|
12
|
+
|
13
|
+
def self.subclasses
|
14
|
+
@subclasses
|
15
|
+
end
|
16
|
+
|
17
|
+
attr_accessor :iterations
|
18
|
+
|
19
|
+
def initialize
|
20
|
+
@callbacks = {}
|
21
|
+
@iterations = 10000
|
22
|
+
on(:before_each, &method(:setup))
|
23
|
+
on(:after_each, &method(:teardown))
|
24
|
+
end
|
25
|
+
|
26
|
+
def setup; end
|
27
|
+
def teardown; end
|
28
|
+
|
29
|
+
def on(event, &action)
|
30
|
+
@callbacks[event] ||= []
|
31
|
+
@callbacks[event] << action
|
32
|
+
end
|
33
|
+
|
34
|
+
def fire(event, *args)
|
35
|
+
if @callbacks[event]
|
36
|
+
@callbacks[event].each { |cb| cb.arity > 0 ? cb.call(*args) : cb.call }
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
def runnable_test_methods
|
41
|
+
self.methods.map { |m| m.to_s }.select { |m| m =~ /^test_/ }
|
42
|
+
end
|
43
|
+
|
44
|
+
def with_callbacks(name)
|
45
|
+
fire(:before_each, self, name)
|
46
|
+
result = yield
|
47
|
+
fire(:after_each, self, name, result)
|
48
|
+
end
|
49
|
+
|
50
|
+
def run(name)
|
51
|
+
result = Result.new(self.class, name)
|
52
|
+
begin
|
53
|
+
with_callbacks(name) do
|
54
|
+
result.timer.measure do
|
55
|
+
self.send(name)
|
56
|
+
end
|
57
|
+
result
|
58
|
+
end
|
59
|
+
rescue => e
|
60
|
+
result.exception = e
|
61
|
+
end
|
62
|
+
result
|
63
|
+
end
|
64
|
+
end
|
65
|
+
end
|
@@ -0,0 +1,38 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
|
5
|
+
module Performance
|
6
|
+
class Timer
|
7
|
+
def initialize
|
8
|
+
@start_timestamp = nil
|
9
|
+
@end_timestamp = nil
|
10
|
+
end
|
11
|
+
|
12
|
+
def start(t=Time.now)
|
13
|
+
@start_timestamp = t
|
14
|
+
end
|
15
|
+
|
16
|
+
def stopped?
|
17
|
+
!!@stop_timestamp
|
18
|
+
end
|
19
|
+
|
20
|
+
def stop(t=Time.now)
|
21
|
+
@stop_timestamp = t
|
22
|
+
end
|
23
|
+
|
24
|
+
def measure
|
25
|
+
start
|
26
|
+
yield
|
27
|
+
stop
|
28
|
+
end
|
29
|
+
|
30
|
+
def elapsed
|
31
|
+
if @stop_timestamp && @start_timestamp
|
32
|
+
@stop_timestamp - @start_timestamp
|
33
|
+
else
|
34
|
+
nil
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
@@ -0,0 +1,37 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
|
3
|
+
require 'json'
|
4
|
+
require File.join(File.dirname(__FILE__), '..', 'lib', 'performance')
|
5
|
+
|
6
|
+
start_commit = ARGV[0]
|
7
|
+
stop_commit = ARGV[1]
|
8
|
+
repo_path = ARGV[2]
|
9
|
+
|
10
|
+
def commits_between(start_commit, stop_commit, repo)
|
11
|
+
output = `cd #{repo} && git log --reverse --pretty=%H #{start_commit}..#{stop_commit}`
|
12
|
+
output.split("\n")
|
13
|
+
end
|
14
|
+
|
15
|
+
def checkout_commit(commit, repo)
|
16
|
+
system("cd #{repo} && git checkout #{commit} >/dev/null 2>&1")
|
17
|
+
end
|
18
|
+
|
19
|
+
runner_options = {
|
20
|
+
:agent_path => repo_path,
|
21
|
+
:reporter_classes => ['HakoReporter'],
|
22
|
+
:isolate => true,
|
23
|
+
:tags => {
|
24
|
+
:run_id => 'ben-perf-test'
|
25
|
+
}
|
26
|
+
}
|
27
|
+
commits = commits_between(start_commit, stop_commit, repo_path)
|
28
|
+
|
29
|
+
Performance.logger.info "Testing #{commits.size} commits"
|
30
|
+
commits.each_with_index do |commit, i|
|
31
|
+
checkout_commit(commit, repo_path)
|
32
|
+
runner_options[:tags][:sequence_number] = i
|
33
|
+
runner = Performance::Runner.new(runner_options)
|
34
|
+
t0 = Time.now
|
35
|
+
results = runner.run_all_test_cases
|
36
|
+
runner.report_results(results, Time.now - t0)
|
37
|
+
end
|
@@ -0,0 +1,81 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
|
3
|
+
# encoding: utf-8
|
4
|
+
# This file is distributed under New Relic's license terms.
|
5
|
+
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
6
|
+
|
7
|
+
require 'optparse'
|
8
|
+
require 'rubygems'
|
9
|
+
require 'json'
|
10
|
+
|
11
|
+
require File.join(File.dirname(__FILE__), '..', 'lib', 'performance')
|
12
|
+
|
13
|
+
target_versions = nil
|
14
|
+
|
15
|
+
options = {}
|
16
|
+
parser = OptionParser.new do |opts|
|
17
|
+
opts.banner = "Usage: #{$0} [options]"
|
18
|
+
|
19
|
+
opts.on("-p", "--progress", "Print out test names as they run") do |p|
|
20
|
+
options[:progress] = true
|
21
|
+
end
|
22
|
+
opts.on("-i", "--instrumentor=NAME", "Use the named instrumentor") do |name|
|
23
|
+
options[:instrumentors] = [name]
|
24
|
+
end
|
25
|
+
opts.on("-n", "--name=NAME", "Filter tests to those matching NAME") do |name|
|
26
|
+
options[:name] = name
|
27
|
+
end
|
28
|
+
opts.on("-N", "--iterations=NUM", "Change the number of iterations for each test") do |iterations|
|
29
|
+
options[:iterations] = iterations.to_i
|
30
|
+
end
|
31
|
+
opts.on("-I", "--inline", "Run tests inline - do not isolate each test into a sub-invocation") do |i|
|
32
|
+
options[:inline] = true
|
33
|
+
end
|
34
|
+
opts.on("-j", "--json", "Produce JSON output") do |q|
|
35
|
+
options[:reporter_classes] = ['JSONReporter']
|
36
|
+
end
|
37
|
+
opts.on("-R", "--reporters=NAMES", "Use the specified reporters (comma-separated list of class names)") do |reporter_names|
|
38
|
+
reporter_names = reporter_names.split(',')
|
39
|
+
options[:reporter_classes] = reporter_names
|
40
|
+
end
|
41
|
+
opts.on("-r", "--randomize", "Randomize test order") do |r|
|
42
|
+
options[:randomize] = r
|
43
|
+
end
|
44
|
+
opts.on("-b", "--brief", "Don't print out details for each test, just the elapsed time") do |b|
|
45
|
+
options[:brief] = b
|
46
|
+
end
|
47
|
+
opts.on("-T", "--test=NAME", "Run one specific test, identified by <suite name>#<test_name>") do |identifier|
|
48
|
+
options[:identifier] = identifier
|
49
|
+
end
|
50
|
+
opts.on("-q", "--quiet", "Disable diagnostic logging") do
|
51
|
+
Performance.log_path = "/dev/null"
|
52
|
+
end
|
53
|
+
opts.on("-L", "--log=PATH", "Log diagnostic information to PATH") do |log_path|
|
54
|
+
Performance.log_path = log_path
|
55
|
+
end
|
56
|
+
opts.on("-A", "--agent=PATH", "Run tests against the copy of the agent at PATH") do |path|
|
57
|
+
options[:agent_path] = path
|
58
|
+
end
|
59
|
+
opts.on("-c", "--compare=VERSIONS", "Run tests against the specified VERSIONS of the agent. Use with -A") do |versions|
|
60
|
+
target_versions = versions.split(',')
|
61
|
+
end
|
62
|
+
opts.on("-m", "--metadata=METADATA", "Attach metadata to the run. Format: 'key:value'. May be specified multiple times.") do |tag_string|
|
63
|
+
key, value = tag_string.split(":", 2)
|
64
|
+
options[:tags] ||= {}
|
65
|
+
options[:tags][key] = value
|
66
|
+
end
|
67
|
+
end
|
68
|
+
parser.parse!
|
69
|
+
|
70
|
+
runner = Performance::Runner.new(options)
|
71
|
+
|
72
|
+
if target_versions
|
73
|
+
target_versions.each do |version|
|
74
|
+
Performance.logger.info("Running tests against version #{version}")
|
75
|
+
cmd = "cd #{options[:agent_path]} && git checkout #{version}"
|
76
|
+
system(cmd)
|
77
|
+
runner.run_and_report
|
78
|
+
end
|
79
|
+
else
|
80
|
+
runner.run_and_report
|
81
|
+
end
|
@@ -0,0 +1,12 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
# This file is distributed under New Relic's license terms.
|
3
|
+
# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
|
4
|
+
|
5
|
+
class StartupShutdown < Performance::TestCase
|
6
|
+
def test_startup_shutdown
|
7
|
+
(iterations / 100).times do
|
8
|
+
NewRelic::Agent.manual_start
|
9
|
+
NewRelic::Agent.shutdown
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|