newrelic_rpm 3.7.2.195 → 3.7.3.199
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 +25 -1
- data/Rakefile +7 -0
- data/lib/new_relic/agent/agent.rb +19 -13
- data/lib/new_relic/agent/configuration/default_source.rb +23 -0
- data/lib/new_relic/agent/cross_app_tracing.rb +2 -0
- data/lib/new_relic/agent/database.rb +123 -94
- data/lib/new_relic/agent/database/obfuscation_helpers.rb +37 -0
- data/lib/new_relic/agent/database/obfuscator.rb +65 -0
- data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +49 -0
- data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +2 -1
- data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +1 -1
- data/lib/new_relic/agent/instrumentation/active_record_helper.rb +9 -8
- data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -38
- data/lib/new_relic/agent/instrumentation/rubyprof.rb +26 -0
- data/lib/new_relic/agent/instrumentation/typhoeus.rb +3 -2
- data/lib/new_relic/agent/pipe_channel_manager.rb +45 -12
- data/lib/new_relic/agent/pipe_service.rb +14 -8
- data/lib/new_relic/agent/request_sampler.rb +63 -6
- data/lib/new_relic/agent/sampler_collection.rb +5 -2
- data/lib/new_relic/agent/shim_agent.rb +1 -1
- data/lib/new_relic/agent/transaction.rb +41 -22
- data/lib/new_relic/agent/transaction_sample_builder.rb +0 -4
- data/lib/new_relic/agent/transaction_sampler.rb +2 -5
- data/lib/new_relic/agent/transaction_state.rb +43 -11
- data/lib/new_relic/agent/vm.rb +32 -0
- data/lib/new_relic/agent/vm/jruby_vm.rb +40 -0
- data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +36 -0
- data/lib/new_relic/agent/vm/mri_vm.rb +86 -0
- data/lib/new_relic/agent/vm/rubinius_vm.rb +40 -0
- data/lib/new_relic/agent/vm/snapshot.rb +16 -0
- data/lib/new_relic/control.rb +0 -6
- data/lib/new_relic/language_support.rb +20 -0
- data/lib/new_relic/latest_changes.rb +41 -12
- data/lib/new_relic/rack/developer_mode.rb +8 -1
- data/lib/new_relic/rack/transaction_reset.rb +1 -1
- data/lib/new_relic/transaction_sample.rb +0 -13
- data/lib/new_relic/version.rb +1 -1
- data/lib/tasks/install.rake +5 -0
- data/newrelic_rpm.gemspec +2 -1
- data/test/active_record_fixtures.rb +7 -9
- data/test/agent_helper.rb +11 -50
- data/test/environments/lib/environments/runner.rb +3 -5
- data/test/environments/rails40/Gemfile +12 -3
- data/test/environments/rails41/Gemfile +34 -0
- data/test/environments/rails41/Rakefile +11 -0
- data/test/environments/rails41/config/application.rb +18 -0
- data/test/environments/rails41/config/boot.rb +10 -0
- data/test/environments/rails41/config/database.yml +26 -0
- data/test/environments/rails41/config/environment.rb +6 -0
- data/test/environments/rails41/db/schema.rb +5 -0
- data/test/fixtures/cross_agent_tests/README.md +12 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/basic_where.colon_obfuscated.txt +3 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/basic_where.explain.txt +3 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/basic_where.obfuscated.txt +3 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/basic_where.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/current_date.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/current_date.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/current_date.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/current_date.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/date.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/date.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/date.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/date.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/embedded_newline.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/embedded_newline.explain.txt +3 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/embedded_newline.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/embedded_newline.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/embedded_quote.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/embedded_quote.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/embedded_quote.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/embedded_quote.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/floating_point.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/floating_point.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/floating_point.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/floating_point.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/function_with_strings.colon_obfuscated.txt +5 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/function_with_strings.explain.txt +5 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/function_with_strings.obfuscated.txt +5 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/function_with_strings.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/quote_in_table_name.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/quote_in_table_name.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/quote_in_table_name.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/quote_in_table_name.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/subplan.colon_obfuscated.txt +5 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/subplan.explain.txt +5 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/subplan.obfuscated.txt +5 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/subplan.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_integer.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_integer.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_integer.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_integer.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_regex_chars.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_regex_chars.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_regex_chars.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_regex_chars.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_substring.colon_obfuscated.txt +3 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_substring.explain.txt +3 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_substring.obfuscated.txt +3 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/where_with_substring.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case1.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case1.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case1.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case1.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case2.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case2.explain.txt +3 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case2.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case2.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case3.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case3.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case3.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case3.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case4.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case4.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case4.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case4.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case5.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case5.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case5.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case5.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case6.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case6.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case6.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case6.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case7.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case7.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case7.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case7.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case8.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case8.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case8.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case8.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case9.colon_obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case9.explain.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case9.obfuscated.txt +2 -0
- data/test/fixtures/cross_agent_tests/postgres_explain_obfuscation/with_escape_case9.query.txt +1 -0
- data/test/fixtures/cross_agent_tests/rules.json +165 -0
- data/test/fixtures/cross_agent_tests/rum_client_config.json +142 -0
- data/test/fixtures/cross_agent_tests/rum_cookie.json +17 -0
- data/test/fixtures/cross_agent_tests/rum_footer_insertion_location/close-body-in-comment.html +10 -0
- data/test/fixtures/cross_agent_tests/rum_footer_insertion_location/dynamic-iframe.html +19 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/basic.html +10 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/body_with_attributes.html +3 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/charset_tag.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/charset_tag_after_x_ua_tag.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/charset_tag_before_x_ua_tag.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/charset_tag_with_spaces.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/comments1.html +24 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/comments2.html +24 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/content_type_charset_tag.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/content_type_charset_tag_after_x_ua_tag.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/content_type_charset_tag_before_x_ua_tag.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/gt_in_quotes1.html +27 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/gt_in_quotes2.html +24 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/gt_in_quotes_mismatch.html +24 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/gt_in_single_quotes1.html +25 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/gt_in_single_quotes_mismatch.html +25 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/head_with_attributes.html +10 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/incomplete_non_meta_tags.html +10 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/no_header.html +7 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/no_html_and_no_header.html +3 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/no_start_header.html +9 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/script1.html +19 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/script2.html +17 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag.html +10 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_multiline.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_spaces_around_equals.html +10 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_with_others.html +11 -0
- data/test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_with_spaces.html +10 -0
- data/test/fixtures/cross_agent_tests/sql_parsing.json +55 -0
- data/test/fixtures/cross_agent_tests/url_clean.json +15 -0
- data/test/fixtures/cross_agent_tests/url_domain_extraction.json +35 -0
- data/test/flaky_proxy/README.md +91 -33
- data/test/flaky_proxy/lib/flaky_proxy.rb +1 -0
- data/test/flaky_proxy/lib/flaky_proxy/http_message.rb +2 -0
- data/test/flaky_proxy/lib/flaky_proxy/proxy.rb +19 -4
- data/test/flaky_proxy/lib/flaky_proxy/rule.rb +13 -16
- data/test/flaky_proxy/lib/flaky_proxy/rule_set.rb +10 -2
- data/test/flaky_proxy/lib/flaky_proxy/sequence.rb +14 -0
- data/test/helpers/file_searching.rb +1 -1
- data/test/intentional_fail.rb +1 -1
- data/test/multiverse/lib/multiverse/suite.rb +26 -3
- data/test/multiverse/suites/active_record/Envfile +1 -1
- data/test/multiverse/suites/active_record/ar_method_aliasing.rb +1 -1
- data/test/multiverse/suites/agent_only/audit_log_test.rb +1 -1
- data/test/multiverse/suites/agent_only/collector_exception_handling_test.rb +1 -1
- data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb +1 -1
- data/test/multiverse/suites/agent_only/encoding_handling_test.rb +1 -1
- data/test/multiverse/suites/agent_only/harvest_timestamps_test.rb +1 -1
- data/test/multiverse/suites/agent_only/http_response_code_test.rb +1 -1
- data/test/multiverse/suites/agent_only/key_transactions_test.rb +1 -1
- data/test/multiverse/suites/agent_only/logging_test.rb +1 -1
- data/test/multiverse/suites/agent_only/marshaling_test.rb +1 -1
- data/test/multiverse/suites/agent_only/pipe_manager_test.rb +1 -1
- data/test/multiverse/suites/agent_only/rename_rule_test.rb +1 -1
- data/test/multiverse/suites/agent_only/rum_instrumentation_test.rb +1 -1
- data/test/multiverse/suites/agent_only/service_timeout_test.rb +1 -1
- data/test/multiverse/suites/agent_only/set_transaction_name_test.rb +1 -1
- data/test/multiverse/suites/agent_only/ssl_test.rb +1 -1
- data/test/multiverse/suites/agent_only/start_up_test.rb +1 -1
- data/test/multiverse/suites/agent_only/thread_profiling_test.rb +1 -1
- data/test/multiverse/suites/agent_only/xray_sessions_test.rb +1 -1
- data/test/multiverse/suites/bare/standalone_instrumentation_test.rb +1 -1
- data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb +1 -1
- data/test/multiverse/suites/curb/curb_test.rb +1 -1
- data/test/multiverse/suites/datamapper/datamapper_test.rb +1 -1
- data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb +1 -1
- data/test/multiverse/suites/excon/excon_test.rb +1 -1
- data/test/multiverse/suites/httpclient/httpclient_test.rb +1 -1
- data/test/multiverse/suites/mongo/helpers/mongo_operation_tests.rb +7 -3
- data/test/multiverse/suites/mongo/mongo_instrumentation_test.rb +1 -1
- data/test/multiverse/suites/mongo/mongo_unsupported_version_test.rb +2 -2
- data/test/multiverse/suites/net_http/net_http_test.rb +1 -1
- data/test/multiverse/suites/padrino/Envfile +1 -1
- data/test/multiverse/suites/padrino/padrino_test.rb +1 -1
- data/test/multiverse/suites/rails/Envfile +10 -0
- data/test/multiverse/suites/rails/request_statistics_test.rb +59 -6
- data/test/multiverse/suites/rails/view_instrumentation_test.rb +1 -0
- data/test/multiverse/suites/resque/instrumentation_test.rb +1 -1
- data/test/multiverse/suites/sequel/sequel_instrumentation_test.rb +5 -18
- data/test/multiverse/suites/sequel/sequel_safety_test.rb +1 -1
- data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb +1 -1
- data/test/multiverse/suites/sinatra/ignoring_test.rb +1 -1
- data/test/multiverse/suites/sinatra/sinatra_classic_test.rb +1 -1
- data/test/multiverse/suites/sinatra/sinatra_error_tracing_test.rb +1 -1
- data/test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb +1 -1
- data/test/multiverse/suites/sinatra/sinatra_modular_test.rb +1 -1
- data/test/multiverse/suites/sinatra/sinatra_routes_test.rb +1 -1
- data/test/multiverse/suites/typhoeus/typhoeus_test.rb +36 -2
- data/test/new_relic/FAKECHANGELOG +21 -0
- data/test/new_relic/agent/agent/connect_test.rb +1 -1
- data/test/new_relic/agent/agent/start_test.rb +1 -1
- data/test/new_relic/agent/agent/start_worker_thread_test.rb +1 -1
- data/test/new_relic/agent/agent_logger_test.rb +1 -1
- data/test/new_relic/agent/agent_test.rb +14 -8
- data/test/new_relic/agent/apdex_from_server_test.rb +1 -1
- data/test/new_relic/agent/audit_logger_test.rb +1 -1
- data/test/new_relic/agent/autostart_test.rb +1 -1
- data/test/new_relic/agent/browser_token_test.rb +1 -1
- data/test/new_relic/agent/busy_calculator_test.rb +1 -1
- data/test/new_relic/agent/commands/agent_command_router_test.rb +1 -1
- data/test/new_relic/agent/commands/agent_command_test.rb +1 -1
- data/test/new_relic/agent/commands/thread_profiler_session_test.rb +2 -2
- data/test/new_relic/agent/commands/xray_session_collection_test.rb +1 -1
- data/test/new_relic/agent/commands/xray_session_test.rb +1 -1
- data/test/new_relic/agent/configuration/default_source_test.rb +1 -1
- data/test/new_relic/agent/configuration/environment_source_test.rb +1 -1
- data/test/new_relic/agent/configuration/manager_test.rb +1 -1
- data/test/new_relic/agent/configuration/orphan_configuration_test.rb +1 -1
- data/test/new_relic/agent/configuration/server_source_test.rb +1 -1
- data/test/new_relic/agent/configuration/yaml_source_test.rb +1 -1
- data/test/new_relic/agent/cpu_sampler_test.rb +1 -1
- data/test/new_relic/agent/cross_app_monitor_test.rb +3 -3
- data/test/new_relic/agent/cross_app_tracing_test.rb +1 -1
- data/test/new_relic/agent/database/postgres_explain_obfuscator_test.rb +34 -0
- data/test/new_relic/agent/database_test.rb +192 -5
- data/test/new_relic/agent/datastores/mongo/metric_generator_test.rb +1 -1
- data/test/new_relic/agent/datastores/mongo/metric_translator_test.rb +11 -1
- data/test/new_relic/agent/datastores/mongo/obfuscator_test.rb +1 -1
- data/test/new_relic/agent/datastores/mongo/statement_formatter_test.rb +1 -1
- data/test/new_relic/agent/error_collector/notice_error_test.rb +1 -1
- data/test/new_relic/agent/error_collector_test.rb +1 -1
- data/test/new_relic/agent/event_listener_test.rb +1 -1
- data/test/new_relic/agent/harvester_test.rb +1 -1
- data/test/new_relic/agent/http_clients/uri_util_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/action_controller_subscriber_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/action_view_subscriber_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/active_record_helper_test.rb +4 -4
- data/test/new_relic/agent/instrumentation/active_record_subscriber_test.rb +2 -2
- data/test/new_relic/agent/instrumentation/active_record_test.rb +385 -0
- data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/instrumentation_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/metric_frame_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/queue_time_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/rack_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/sinatra/transaction_namer_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/sinatra_test.rb +1 -1
- data/test/new_relic/agent/instrumentation/task_instrumentation_test.rb +1 -1
- data/test/new_relic/agent/javascript_instrumentor_test.rb +3 -3
- data/test/new_relic/agent/memcache_instrumentation_test.rb +1 -1
- data/test/new_relic/agent/memory_logger_test.rb +1 -1
- data/test/new_relic/agent/method_interrobang_test.rb +1 -1
- data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb +1 -1
- data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb +1 -1
- data/test/new_relic/agent/method_tracer_test.rb +1 -1
- data/test/new_relic/agent/method_visibility_test.rb +1 -1
- data/test/new_relic/agent/new_relic_service_test.rb +2 -2
- data/test/new_relic/agent/obfuscator_test.rb +1 -1
- data/test/new_relic/agent/pipe_channel_manager_test.rb +216 -143
- data/test/new_relic/agent/pipe_service_test.rb +26 -15
- data/test/new_relic/agent/request_sampler_test.rb +65 -18
- data/test/new_relic/agent/rpm_agent_test.rb +1 -1
- data/test/new_relic/agent/rules_engine_test.rb +1 -1
- data/test/new_relic/agent/sampled_buffer_test.rb +1 -1
- data/test/new_relic/agent/sampler_collection_test.rb +8 -1
- data/test/new_relic/agent/sampler_test.rb +1 -1
- data/test/new_relic/agent/shim_agent_test.rb +3 -3
- data/test/new_relic/agent/sql_sampler_test.rb +7 -6
- data/test/new_relic/agent/stats_engine/gc_profiler_test.rb +1 -1
- data/test/new_relic/agent/stats_engine/metric_stats_test.rb +1 -1
- data/test/new_relic/agent/stats_engine/samplers_test.rb +1 -1
- data/test/new_relic/agent/stats_engine_test.rb +1 -1
- data/test/new_relic/agent/stats_hash_test.rb +1 -1
- data/test/new_relic/agent/stats_test.rb +1 -1
- data/test/new_relic/agent/threading/agent_thread_test.rb +1 -1
- data/test/new_relic/agent/threading/backtrace_node_test.rb +1 -1
- data/test/new_relic/agent/threading/backtrace_service_test.rb +3 -3
- data/test/new_relic/agent/threading/thread_profile_test.rb +1 -1
- data/test/new_relic/agent/transaction/developer_mode_sample_buffer_test.rb +1 -1
- data/test/new_relic/agent/transaction/force_persist_sample_buffer_test.rb +1 -1
- data/test/new_relic/agent/transaction/pop_test.rb +1 -1
- data/test/new_relic/agent/transaction/slowest_sample_buffer_test.rb +1 -1
- data/test/new_relic/agent/transaction/xray_sample_buffer_test.rb +1 -1
- data/test/new_relic/agent/transaction_interrobang_test.rb +1 -1
- data/test/new_relic/agent/transaction_sample_builder_test.rb +1 -1
- data/test/new_relic/agent/transaction_sampler_test.rb +17 -17
- data/test/new_relic/agent/transaction_state_test.rb +61 -6
- data/test/new_relic/agent/transaction_test.rb +60 -3
- data/test/new_relic/agent/transaction_timings_test.rb +1 -1
- data/test/new_relic/agent/vm/monotonic_gc_profiler_test.rb +42 -0
- data/test/new_relic/agent/vm/mri_vm_test.rb +35 -0
- data/test/new_relic/agent/vm/snapshot_test.rb +8 -0
- data/test/new_relic/agent/vm_test.rb +48 -0
- data/test/new_relic/agent/worker_loop_test.rb +1 -1
- data/test/new_relic/agent_test.rb +1 -1
- data/test/new_relic/cli/deployments_test.rb +1 -1
- data/test/new_relic/coerce_test.rb +1 -1
- data/test/new_relic/collection_helper_test.rb +1 -1
- data/test/new_relic/control/class_methods_test.rb +1 -1
- data/test/new_relic/control/frameworks/rails_test.rb +1 -1
- data/test/new_relic/control_test.rb +1 -1
- data/test/new_relic/dependency_detection_test.rb +1 -1
- data/test/new_relic/dispatcher_test.rb +1 -1
- data/test/new_relic/environment_report_test.rb +1 -1
- data/test/new_relic/framework_test.rb +1 -1
- data/test/new_relic/http_client_test_cases.rb +1 -1
- data/test/new_relic/json_wrapper_test.rb +1 -1
- data/test/new_relic/language_support_test.rb +42 -1
- data/test/new_relic/latest_changes_test.rb +45 -0
- data/test/new_relic/license_test.rb +2 -2
- data/test/new_relic/load_test.rb +1 -1
- data/test/new_relic/local_environment_test.rb +1 -1
- data/test/new_relic/metric_data_test.rb +1 -1
- data/test/new_relic/metric_parser/metric_parser_test.rb +1 -1
- data/test/new_relic/metric_spec_test.rb +1 -1
- data/test/new_relic/multiverse_helpers.rb +0 -27
- data/test/new_relic/noticed_error_test.rb +1 -1
- data/test/new_relic/rack/agent_hooks_test.rb +1 -1
- data/test/new_relic/rack/all_test.rb +1 -1
- data/test/new_relic/rack/browser_monitoring_test.rb +2 -2
- data/test/new_relic/rack/deferred_instrumentation_test.rb +1 -1
- data/test/new_relic/rack/developer_mode_helper_test.rb +1 -1
- data/test/new_relic/rack/developer_mode_test.rb +2 -19
- data/test/new_relic/rack/error_collector_test.rb +1 -1
- data/test/new_relic/rack/transaction_reset_test.rb +1 -1
- data/test/new_relic/transaction_analysis/segment_summary_test.rb +1 -1
- data/test/new_relic/transaction_analysis_test.rb +1 -1
- data/test/new_relic/transaction_sample/composite_segment_test.rb +1 -1
- data/test/new_relic/transaction_sample/fake_segment_test.rb +1 -1
- data/test/new_relic/transaction_sample/segment_test.rb +2 -2
- data/test/new_relic/transaction_sample/summary_segment_test.rb +1 -1
- data/test/new_relic/transaction_sample_subtest_test.rb +1 -1
- data/test/new_relic/transaction_sample_test.rb +3 -3
- data/test/new_relic/version_number_test.rb +1 -1
- data/test/performance/lib/performance/instrumentation/stackprof.rb +33 -0
- data/test/performance/lib/performance/platform.rb +1 -0
- data/test/performance/suites/marshalling.rb +2 -1
- data/test/test_helper.rb +33 -3
- data/ui/views/newrelic/index.rhtml +2 -2
- metadata +169 -31
- metadata.gz.sig +0 -0
- data/lib/new_relic/control/profiling.rb +0 -29
- data/test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb +0 -648
metadata.gz.sig
CHANGED
Binary file
|
@@ -1,29 +0,0 @@
|
|
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 NewRelic
|
6
|
-
class Control
|
7
|
-
module Profiling
|
8
|
-
|
9
|
-
# A flag used in dev mode to indicate if profiling is available
|
10
|
-
def profiling?
|
11
|
-
@profiling
|
12
|
-
end
|
13
|
-
|
14
|
-
def profiling_available?
|
15
|
-
@profiling_available ||=
|
16
|
-
begin
|
17
|
-
require 'ruby-prof'
|
18
|
-
true
|
19
|
-
rescue LoadError; end
|
20
|
-
end
|
21
|
-
# Set the flag for capturing profiles in dev mode. If RubyProf is not
|
22
|
-
# loaded a true value is ignored.
|
23
|
-
def profiling=(val)
|
24
|
-
@profiling = profiling_available? && val && defined?(RubyProf)
|
25
|
-
end
|
26
|
-
end
|
27
|
-
include Profiling
|
28
|
-
end
|
29
|
-
end
|
@@ -1,648 +0,0 @@
|
|
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
|
-
if defined?(::Rails)
|
6
|
-
|
7
|
-
require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
|
8
|
-
|
9
|
-
class NewRelic::Agent::Instrumentation::ActiveRecordInstrumentationTest < MiniTest::Unit::TestCase
|
10
|
-
require 'active_record_fixtures'
|
11
|
-
include NewRelic::Agent::Instrumentation::ControllerInstrumentation
|
12
|
-
|
13
|
-
# the db adapter library the tests are running under (e.g. sqlite3)
|
14
|
-
def adapter
|
15
|
-
if ActiveRecord::Base.respond_to?(:connection_config)
|
16
|
-
ActiveRecord::Base.connection_config[:adapter]
|
17
|
-
else
|
18
|
-
# old versions of rails are usually tested against mysql
|
19
|
-
'mysql'
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
def setup
|
24
|
-
super
|
25
|
-
NewRelic::Agent.manual_start
|
26
|
-
ActiveRecord::Base.establish_connection unless ActiveRecord::Base.connection.active?
|
27
|
-
ActiveRecordFixtures.setup
|
28
|
-
NewRelic::Agent.instance.transaction_sampler.reset!
|
29
|
-
NewRelic::Agent.instance.stats_engine.clear_stats
|
30
|
-
rescue => e
|
31
|
-
puts e
|
32
|
-
puts e.backtrace.join("\n")
|
33
|
-
end
|
34
|
-
|
35
|
-
def teardown
|
36
|
-
super
|
37
|
-
NewRelic::Agent::TransactionState.reset
|
38
|
-
NewRelic::Agent.shutdown
|
39
|
-
end
|
40
|
-
|
41
|
-
#####################################################################
|
42
|
-
# Note: If these tests are failing, most likely the problem is that #
|
43
|
-
# the active record instrumentation is not loading for whichever #
|
44
|
-
# version of rails you're testing at the moment. #
|
45
|
-
#####################################################################
|
46
|
-
|
47
|
-
def test_agent_setup
|
48
|
-
assert NewRelic::Agent.instance.class == NewRelic::Agent::Agent
|
49
|
-
end
|
50
|
-
|
51
|
-
def test_finder
|
52
|
-
ActiveRecordFixtures::Order.create :id => 0, :name => 'jeff'
|
53
|
-
find_metric = "ActiveRecord/ActiveRecordFixtures::Order/find"
|
54
|
-
|
55
|
-
assert_calls_metrics(find_metric) do
|
56
|
-
all_finder(ActiveRecordFixtures::Order)
|
57
|
-
check_metric_count(find_metric, 1)
|
58
|
-
if NewRelic::Control.instance.rails_version >= "4"
|
59
|
-
ActiveRecordFixtures::Order.where(:name => "jeff").load
|
60
|
-
else
|
61
|
-
ActiveRecordFixtures::Order.find_all_by_name "jeff"
|
62
|
-
end
|
63
|
-
check_metric_count(find_metric, 2)
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
def test_exists
|
68
|
-
return if NewRelic::Control.instance.rails_version < "2.3.4" ||
|
69
|
-
NewRelic::Control.instance.rails_version >= "3.0.7"
|
70
|
-
|
71
|
-
ActiveRecordFixtures::Order.create :id => 0, :name => 'jeff'
|
72
|
-
|
73
|
-
find_metric = "ActiveRecord/ActiveRecordFixtures::Order/find"
|
74
|
-
|
75
|
-
assert_calls_metrics(find_metric) do
|
76
|
-
ActiveRecordFixtures::Order.exists?(["name=?", 'jeff'])
|
77
|
-
check_metric_count(find_metric, 1)
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
def test_metric_names_jruby
|
82
|
-
# fails due to a bug in rails 3 - log does not provide the correct
|
83
|
-
# transaction type - it returns 'SQL' instead of 'Foo Create', for example.
|
84
|
-
return if rails3? || !defined?(JRuby)
|
85
|
-
expected = %W[
|
86
|
-
ActiveRecord/all
|
87
|
-
ActiveRecord/find
|
88
|
-
ActiveRecord/ActiveRecordFixtures::Order/find
|
89
|
-
Database/SQL/insert
|
90
|
-
RemoteService/sql/#{adapter}/localhost
|
91
|
-
]
|
92
|
-
|
93
|
-
if NewRelic::Control.instance.rails_version < '2.1.0'
|
94
|
-
expected += %W[ActiveRecord/save ActiveRecord/ActiveRecordFixtures::Order/save]
|
95
|
-
end
|
96
|
-
|
97
|
-
assert_calls_metrics(*expected) do
|
98
|
-
m = ActiveRecordFixtures::Order.create :id => 0, :name => 'jeff'
|
99
|
-
m = ActiveRecordFixtures::Order.find(m.id)
|
100
|
-
m.id = 999
|
101
|
-
m.save!
|
102
|
-
end
|
103
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
104
|
-
|
105
|
-
compare_metrics expected, metrics
|
106
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/find", 1)
|
107
|
-
# zero because jruby uses a different mysql adapter
|
108
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/create", 0)
|
109
|
-
end
|
110
|
-
|
111
|
-
def test_metric_names_sqlite
|
112
|
-
# fails due to a bug in rails 3 - log does not provide the correct
|
113
|
-
# transaction type - it returns 'SQL' instead of 'Foo Create', for example.
|
114
|
-
return if rails3? || !isSqlite? || defined?(JRuby)
|
115
|
-
|
116
|
-
expected = %W[
|
117
|
-
ActiveRecord/all
|
118
|
-
ActiveRecord/find
|
119
|
-
ActiveRecord/ActiveRecordFixtures::Order/find
|
120
|
-
ActiveRecord/create
|
121
|
-
ActiveRecord/ActiveRecordFixtures::Order/create]
|
122
|
-
|
123
|
-
if NewRelic::Control.instance.rails_version < '2.1.0'
|
124
|
-
expected += %W[ActiveRecord/save ActiveRecord/ActiveRecordFixtures::Order/save]
|
125
|
-
end
|
126
|
-
|
127
|
-
assert_calls_metrics(*expected) do
|
128
|
-
m = ActiveRecordFixtures::Order.create :id => 0, :name => 'jeff'
|
129
|
-
m = ActiveRecordFixtures::Order.find(m.id)
|
130
|
-
m.id = 999
|
131
|
-
m.save!
|
132
|
-
end
|
133
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
134
|
-
|
135
|
-
compare_metrics expected, metrics
|
136
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/find", 1)
|
137
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/create", 1)
|
138
|
-
end
|
139
|
-
|
140
|
-
def test_metric_names_standard
|
141
|
-
# fails due to a bug in rails 3 - log does not provide the correct
|
142
|
-
# transaction type - it returns 'SQL' instead of 'Foo Create', for example.
|
143
|
-
return if defined?(JRuby) || isSqlite?
|
144
|
-
|
145
|
-
expected = %W[
|
146
|
-
ActiveRecord/all
|
147
|
-
ActiveRecord/find
|
148
|
-
ActiveRecord/create
|
149
|
-
ActiveRecord/ActiveRecordFixtures::Order/find
|
150
|
-
ActiveRecord/ActiveRecordFixtures::Order/create
|
151
|
-
Database/SQL/other
|
152
|
-
Database/SQL/show
|
153
|
-
RemoteService/sql/#{adapter}/localhost]
|
154
|
-
|
155
|
-
if NewRelic::Control.instance.rails_version < '2.1.0'
|
156
|
-
expected += ['ActiveRecord/save',
|
157
|
-
'ActiveRecord/ActiveRecordFixtures::Order/save']
|
158
|
-
end
|
159
|
-
|
160
|
-
if NewRelic::Control.instance.rails_version >= '3.0.0'
|
161
|
-
expected << 'Database/SQL/insert'
|
162
|
-
end
|
163
|
-
|
164
|
-
if NewRelic::Control.instance.rails_version >= '4.0'
|
165
|
-
expected << 'Database/SQL/update'
|
166
|
-
end
|
167
|
-
|
168
|
-
assert_calls_metrics(*expected) do
|
169
|
-
m = ActiveRecordFixtures::Order.create :id => 1, :name => 'donkey'
|
170
|
-
m = ActiveRecordFixtures::Order.find(m.id)
|
171
|
-
m.id = 999
|
172
|
-
m.save!
|
173
|
-
end
|
174
|
-
|
175
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
176
|
-
|
177
|
-
compare_metrics expected, metrics
|
178
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/find", 1)
|
179
|
-
if NewRelic::Control.instance.rails_version < '3.0.0'
|
180
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/create", 1)
|
181
|
-
else
|
182
|
-
check_metric_count("Database/SQL/insert", 1)
|
183
|
-
end
|
184
|
-
end
|
185
|
-
|
186
|
-
def test_join_metrics_jruby
|
187
|
-
return unless defined?(JRuby)
|
188
|
-
return if rails3?
|
189
|
-
|
190
|
-
expected_metrics = %W[
|
191
|
-
ActiveRecord/all
|
192
|
-
ActiveRecord/destroy
|
193
|
-
ActiveRecord/ActiveRecordFixtures::Order/destroy
|
194
|
-
Database/SQL/insert
|
195
|
-
Database/SQL/delete
|
196
|
-
Database/SQL/show
|
197
|
-
ActiveRecord/find
|
198
|
-
ActiveRecord/ActiveRecordFixtures::Order/find
|
199
|
-
ActiveRecord/ActiveRecordFixtures::Shipment/find
|
200
|
-
RemoteService/sql/#{adapter}/localhost
|
201
|
-
]
|
202
|
-
|
203
|
-
assert_calls_metrics(*expected_metrics) do
|
204
|
-
m = ActiveRecordFixtures::Order.create :name => 'jeff'
|
205
|
-
m = ActiveRecordFixtures::Order.find(m.id)
|
206
|
-
s = m.shipments.create
|
207
|
-
m.shipments.to_a
|
208
|
-
m.destroy
|
209
|
-
end
|
210
|
-
|
211
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
212
|
-
|
213
|
-
compare_metrics expected_metrics, metrics
|
214
|
-
|
215
|
-
check_metric_time('ActiveRecord/all', NewRelic::Agent.get_stats("ActiveRecord/all").total_exclusive_time, 0)
|
216
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/find", 1)
|
217
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Shipment/find", 1)
|
218
|
-
check_metric_count("Database/SQL/insert", 3)
|
219
|
-
check_metric_count("Database/SQL/delete", 1)
|
220
|
-
end
|
221
|
-
|
222
|
-
def test_join_metrics_sqlite
|
223
|
-
return if (defined?(Rails) && Rails::VERSION::MAJOR.to_i == 3)
|
224
|
-
return if defined?(JRuby)
|
225
|
-
return unless isSqlite?
|
226
|
-
|
227
|
-
expected_metrics = %W[
|
228
|
-
ActiveRecord/all
|
229
|
-
ActiveRecord/destroy
|
230
|
-
ActiveRecord/ActiveRecordFixtures::Order/destroy
|
231
|
-
Database/SQL/insert
|
232
|
-
Database/SQL/delete
|
233
|
-
ActiveRecord/find
|
234
|
-
ActiveRecord/ActiveRecordFixtures::Order/find
|
235
|
-
ActiveRecord/ActiveRecordFixtures::Shipment/find
|
236
|
-
ActiveRecord/create
|
237
|
-
ActiveRecord/ActiveRecordFixtures::Shipment/create
|
238
|
-
ActiveRecord/ActiveRecordFixtures::Order/create
|
239
|
-
]
|
240
|
-
|
241
|
-
assert_calls_metrics(*expected_metrics) do
|
242
|
-
m = ActiveRecordFixtures::Order.create :name => 'jeff'
|
243
|
-
m = ActiveRecordFixtures::Order.find(m.id)
|
244
|
-
s = m.shipments.create
|
245
|
-
m.shipments.to_a
|
246
|
-
m.destroy
|
247
|
-
end
|
248
|
-
|
249
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
250
|
-
compare_metrics expected_metrics, metrics
|
251
|
-
if !(defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Enterprise Edition/)
|
252
|
-
check_metric_time('ActiveRecord/all', NewRelic::Agent.get_stats("ActiveRecord/all").total_exclusive_time, 0)
|
253
|
-
end
|
254
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/find", 1)
|
255
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Shipment/find", 1)
|
256
|
-
check_metric_count("Database/SQL/insert", 3)
|
257
|
-
check_metric_count("Database/SQL/delete", 1)
|
258
|
-
end
|
259
|
-
|
260
|
-
def test_join_metrics_standard
|
261
|
-
return if (defined?(Rails) && Rails::VERSION::MAJOR.to_i >= 3)
|
262
|
-
return if defined?(JRuby) || isSqlite?
|
263
|
-
|
264
|
-
expected_metrics = %W[
|
265
|
-
ActiveRecord/all
|
266
|
-
RemoteService/sql/#{adapter}/localhost
|
267
|
-
ActiveRecord/destroy
|
268
|
-
ActiveRecord/ActiveRecordFixtures::Order/destroy
|
269
|
-
Database/SQL/insert
|
270
|
-
Database/SQL/delete
|
271
|
-
ActiveRecord/find
|
272
|
-
ActiveRecord/ActiveRecordFixtures::Order/find
|
273
|
-
ActiveRecord/ActiveRecordFixtures::Shipment/find
|
274
|
-
Database/SQL/other
|
275
|
-
Database/SQL/show
|
276
|
-
ActiveRecord/create
|
277
|
-
ActiveRecord/ActiveRecordFixtures::Shipment/create
|
278
|
-
ActiveRecord/ActiveRecordFixtures::Order/create
|
279
|
-
]
|
280
|
-
|
281
|
-
assert_calls_metrics(*expected_metrics) do
|
282
|
-
m = ActiveRecordFixtures::Order.create :name => 'jeff'
|
283
|
-
m = ActiveRecordFixtures::Order.find(m.id)
|
284
|
-
s = m.shipments.create
|
285
|
-
m.shipments.to_a
|
286
|
-
m.destroy
|
287
|
-
end
|
288
|
-
|
289
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
290
|
-
|
291
|
-
compare_metrics expected_metrics, metrics
|
292
|
-
if !(defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /Enterprise Edition/)
|
293
|
-
check_metric_time('ActiveRecord/all', NewRelic::Agent.get_stats("ActiveRecord/all").total_exclusive_time, 0)
|
294
|
-
end
|
295
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Order/find", 1)
|
296
|
-
check_metric_count("ActiveRecord/ActiveRecordFixtures::Shipment/find", 1)
|
297
|
-
check_metric_count("Database/SQL/insert", 1)
|
298
|
-
check_metric_count("Database/SQL/delete", 1)
|
299
|
-
end
|
300
|
-
|
301
|
-
def test_direct_sql
|
302
|
-
assert_nil NewRelic::Agent::Transaction.current
|
303
|
-
assert_equal 0, NewRelic::Agent.instance.stats_engine.metrics.size, NewRelic::Agent.instance.stats_engine.metrics.inspect
|
304
|
-
|
305
|
-
expected_metrics = %W[
|
306
|
-
ActiveRecord/all
|
307
|
-
Database/SQL/select
|
308
|
-
RemoteService/sql/#{adapter}/localhost
|
309
|
-
]
|
310
|
-
|
311
|
-
assert_calls_unscoped_metrics(*expected_metrics) do
|
312
|
-
ActiveRecordFixtures::Order.connection.select_rows "select * from #{ActiveRecordFixtures::Order.table_name}"
|
313
|
-
end
|
314
|
-
|
315
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
316
|
-
compare_metrics(expected_metrics, metrics)
|
317
|
-
|
318
|
-
check_unscoped_metric_count('Database/SQL/select', 1)
|
319
|
-
|
320
|
-
end
|
321
|
-
|
322
|
-
def test_other_sql
|
323
|
-
expected_metrics = %W[
|
324
|
-
ActiveRecord/all
|
325
|
-
Database/SQL/other
|
326
|
-
RemoteService/sql/#{adapter}/localhost
|
327
|
-
]
|
328
|
-
assert_calls_unscoped_metrics(*expected_metrics) do
|
329
|
-
ActiveRecordFixtures::Order.connection.execute "begin"
|
330
|
-
end
|
331
|
-
|
332
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
333
|
-
|
334
|
-
compare_metrics expected_metrics, metrics
|
335
|
-
check_unscoped_metric_count('Database/SQL/other', 1)
|
336
|
-
ensure
|
337
|
-
# Make sure we get the transaction closed up for other tests
|
338
|
-
ActiveRecordFixtures::Order.connection.execute "commit"
|
339
|
-
end
|
340
|
-
|
341
|
-
def test_show_sql
|
342
|
-
return if isSqlite?
|
343
|
-
return if isPostgres?
|
344
|
-
|
345
|
-
expected_metrics = %W[ActiveRecord/all Database/SQL/show RemoteService/sql/#{adapter}/localhost]
|
346
|
-
assert_calls_metrics(*expected_metrics) do
|
347
|
-
ActiveRecordFixtures::Order.connection.execute "show tables"
|
348
|
-
end
|
349
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
350
|
-
compare_metrics expected_metrics, metrics
|
351
|
-
check_unscoped_metric_count('Database/SQL/show', 1)
|
352
|
-
end
|
353
|
-
|
354
|
-
def test_blocked_instrumentation
|
355
|
-
ActiveRecordFixtures::Order.add_delay
|
356
|
-
NewRelic::Agent.disable_all_tracing do
|
357
|
-
perform_action_with_newrelic_trace :name => 'bogosity' do
|
358
|
-
all_finder(ActiveRecordFixtures::Order)
|
359
|
-
end
|
360
|
-
end
|
361
|
-
assert_nil NewRelic::Agent.instance.transaction_sampler.last_sample
|
362
|
-
metrics = NewRelic::Agent.instance.stats_engine.metrics
|
363
|
-
compare_metrics [], metrics
|
364
|
-
end
|
365
|
-
|
366
|
-
def test_run_explains
|
367
|
-
perform_action_with_newrelic_trace :name => 'bogosity' do
|
368
|
-
ActiveRecordFixtures::Order.add_delay
|
369
|
-
all_finder(ActiveRecordFixtures::Order)
|
370
|
-
end
|
371
|
-
|
372
|
-
# that's a mouthful. perhaps we should ponder our API.
|
373
|
-
segment = last_segment(NewRelic::Agent.instance.transaction_sampler.last_sample)
|
374
|
-
regex = /^SELECT (["`]?#{ActiveRecordFixtures::Order.table_name}["`]?.)?\* FROM ["`]?#{ActiveRecordFixtures::Order.table_name}["`]?$/
|
375
|
-
assert_match regex, segment.params[:sql].strip
|
376
|
-
end
|
377
|
-
|
378
|
-
def test_prepare_to_send
|
379
|
-
with_config(:'transaction_tracer.explain_enabled' => true,
|
380
|
-
:'transaction_tracer.explain_threshold' => 0.0) do
|
381
|
-
perform_action_with_newrelic_trace :name => 'bogosity' do
|
382
|
-
ActiveRecordFixtures::Order.add_delay
|
383
|
-
all_finder(ActiveRecordFixtures::Order)
|
384
|
-
end
|
385
|
-
sample = NewRelic::Agent.instance.transaction_sampler.last_sample
|
386
|
-
refute_nil sample
|
387
|
-
|
388
|
-
includes_gc = false
|
389
|
-
sample.each_segment {|s| includes_gc ||= s.metric_name =~ /GC/ }
|
390
|
-
|
391
|
-
sql_segment = last_segment(sample)
|
392
|
-
refute_nil sql_segment, sample.to_s
|
393
|
-
assert_match /^SELECT /, sql_segment.params[:sql]
|
394
|
-
assert sql_segment.duration > 0.0, "Segment duration must be greater than zero."
|
395
|
-
sample = sample.prepare_to_send!
|
396
|
-
sql_segment = last_segment(sample)
|
397
|
-
assert_match /^SELECT /, sql_segment.params[:sql]
|
398
|
-
explanations = sql_segment.params[:explain_plan]
|
399
|
-
if (isMysql? || isPostgres?) && !NewRelic::LanguageSupport.using_engine?('jruby')
|
400
|
-
refute_nil explanations, "No explains in segment: #{sql_segment}"
|
401
|
-
assert_equal(2, explanations.size,
|
402
|
-
"No explains in segment: #{sql_segment}")
|
403
|
-
end
|
404
|
-
end
|
405
|
-
end
|
406
|
-
|
407
|
-
def test_transaction_mysql
|
408
|
-
return unless isMysql? && !defined?(JRuby)
|
409
|
-
|
410
|
-
with_config(:record_sql => :obfuscated,
|
411
|
-
:'transaction_tracer.explain_enabled' => true,
|
412
|
-
:'transaction_tracer.explain_threshold' => 0.0) do
|
413
|
-
ActiveRecordFixtures.setup
|
414
|
-
sample = NewRelic::Agent.instance.transaction_sampler.reset!
|
415
|
-
perform_action_with_newrelic_trace :name => 'bogosity' do
|
416
|
-
ActiveRecordFixtures::Order.add_delay
|
417
|
-
all_finder(ActiveRecordFixtures::Order)
|
418
|
-
end
|
419
|
-
|
420
|
-
sample = NewRelic::Agent.instance.transaction_sampler.last_sample
|
421
|
-
sample = sample.prepare_to_send!
|
422
|
-
segment = last_segment(sample)
|
423
|
-
explanation = segment.params[:explain_plan]
|
424
|
-
refute_nil explanation, "No explains in segment: #{segment}"
|
425
|
-
assert_equal 2, explanation.size,"No explains in segment: #{segment}"
|
426
|
-
|
427
|
-
assert_equal 10, explanation[0].size
|
428
|
-
['id', 'select_type', 'table'].each do |c|
|
429
|
-
assert explanation[0].include?(c)
|
430
|
-
end
|
431
|
-
['1', 'SIMPLE', ActiveRecordFixtures::Order.table_name].each do |c|
|
432
|
-
assert explanation[1][0].include?(c)
|
433
|
-
end
|
434
|
-
|
435
|
-
s = NewRelic::Agent.get_stats("ActiveRecord/ActiveRecordFixtures::Order/find")
|
436
|
-
assert_equal 1, s.call_count
|
437
|
-
end
|
438
|
-
end
|
439
|
-
|
440
|
-
def test_transaction_postgres
|
441
|
-
return unless isPostgres?
|
442
|
-
|
443
|
-
with_config(:record_sql => :obfuscated,
|
444
|
-
:'transaction_tracer.explain_enabled' => true,
|
445
|
-
:'transaction_tracer.explain_threshold' => 0.0) do
|
446
|
-
# note that our current test builds do not use postgres, this is
|
447
|
-
# here strictly for troubleshooting, not CI builds
|
448
|
-
sample = NewRelic::Agent.instance.transaction_sampler.reset!
|
449
|
-
perform_action_with_newrelic_trace :name => 'bogosity' do
|
450
|
-
ActiveRecordFixtures::Order.add_delay
|
451
|
-
all_finder(ActiveRecordFixtures::Order)
|
452
|
-
end
|
453
|
-
|
454
|
-
sample = NewRelic::Agent.instance.transaction_sampler.last_sample
|
455
|
-
|
456
|
-
sample = sample.prepare_to_send!
|
457
|
-
segment = last_segment(sample)
|
458
|
-
explanations = segment.params[:explain_plan]
|
459
|
-
|
460
|
-
refute_nil explanations, "No explains in segment: #{segment}"
|
461
|
-
assert_equal 1, explanations.size,"No explains in segment: #{segment}"
|
462
|
-
assert_equal 1, explanations.first.size
|
463
|
-
|
464
|
-
assert_equal("Explain Plan", explanations[0][0])
|
465
|
-
assert_match /Seq Scan on test_data/, explanations[0][1].join(";")
|
466
|
-
|
467
|
-
s = NewRelic::Agent.get_stats("ActiveRecord/ActiveRecordFixtures::Order/find")
|
468
|
-
assert_equal 1, s.call_count
|
469
|
-
end
|
470
|
-
end
|
471
|
-
|
472
|
-
def test_transaction_other
|
473
|
-
return if isMysql? || isPostgres?
|
474
|
-
|
475
|
-
with_config(:record_sql => :obfuscated,
|
476
|
-
:'transaction_tracer.explain_enabled' => true,
|
477
|
-
:'transaction_tracer.explain_threshold' => 0.0) do
|
478
|
-
sample = NewRelic::Agent.instance.transaction_sampler.reset!
|
479
|
-
perform_action_with_newrelic_trace :name => 'bogosity' do
|
480
|
-
ActiveRecordFixtures::Order.add_delay
|
481
|
-
all_finder(ActiveRecordFixtures::Order)
|
482
|
-
end
|
483
|
-
|
484
|
-
sample = NewRelic::Agent.instance.transaction_sampler.last_sample
|
485
|
-
|
486
|
-
sample = sample.prepare_to_send!
|
487
|
-
segment = last_segment(sample)
|
488
|
-
|
489
|
-
s = NewRelic::Agent.get_stats("ActiveRecord/ActiveRecordFixtures::Order/find")
|
490
|
-
assert_equal 1, s.call_count
|
491
|
-
end
|
492
|
-
end
|
493
|
-
|
494
|
-
# These are only valid for rails 2.1 and later
|
495
|
-
if NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("2.1.0")
|
496
|
-
ActiveRecordFixtures::Order.class_eval do
|
497
|
-
if NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("4")
|
498
|
-
scope :jeffs, lambda { where(:name => 'Jeff') }
|
499
|
-
elsif NewRelic::Control.instance.rails_version >= NewRelic::VersionNumber.new("3.1")
|
500
|
-
scope :jeffs, :conditions => { :name => 'Jeff' }
|
501
|
-
else
|
502
|
-
named_scope :jeffs, :conditions => { :name => 'Jeff' }
|
503
|
-
end
|
504
|
-
end
|
505
|
-
def test_named_scope
|
506
|
-
ActiveRecordFixtures::Order.create :name => 'Jeff'
|
507
|
-
|
508
|
-
find_metric = "ActiveRecord/ActiveRecordFixtures::Order/find"
|
509
|
-
|
510
|
-
check_metric_count(find_metric, 0)
|
511
|
-
assert_calls_metrics(find_metric) do
|
512
|
-
if NewRelic::Control.instance.rails_version >= "4"
|
513
|
-
x = ActiveRecordFixtures::Order.jeffs.load
|
514
|
-
else
|
515
|
-
x = ActiveRecordFixtures::Order.jeffs.find(:all)
|
516
|
-
end
|
517
|
-
end
|
518
|
-
check_metric_count(find_metric, 1)
|
519
|
-
end
|
520
|
-
end
|
521
|
-
|
522
|
-
# This is to make sure the all metric is recorded for exceptional cases
|
523
|
-
def test_error_handling
|
524
|
-
# have the AR select throw an error
|
525
|
-
ActiveRecordFixtures::Order.connection.stubs(:log_info).with do | sql, x, y |
|
526
|
-
raise "Error" if sql =~ /select/
|
527
|
-
true
|
528
|
-
end
|
529
|
-
|
530
|
-
in_web_transaction do
|
531
|
-
begin
|
532
|
-
ActiveRecordFixtures::Order.connection.select_rows "select * from #{ActiveRecordFixtures::Order.table_name}"
|
533
|
-
rescue RuntimeError => e
|
534
|
-
# catch only the error we raise above
|
535
|
-
raise unless e.message == 'Error'
|
536
|
-
end
|
537
|
-
end
|
538
|
-
|
539
|
-
assert_metrics_recorded(
|
540
|
-
'ActiveRecord/all' => { :call_count => 1 },
|
541
|
-
'Database/SQL/select' => { :call_count => 1 }
|
542
|
-
)
|
543
|
-
|
544
|
-
if !NewRelic::LanguageSupport.using_engine?('jruby')
|
545
|
-
assert_metrics_recorded("RemoteService/sql/#{adapter}/localhost" => { :call_count => 1 })
|
546
|
-
end
|
547
|
-
end
|
548
|
-
|
549
|
-
def test_rescue_handling
|
550
|
-
# Not sure why we get a transaction error with sqlite
|
551
|
-
return if isSqlite?
|
552
|
-
|
553
|
-
begin
|
554
|
-
ActiveRecordFixtures::Order.transaction do
|
555
|
-
raise ActiveRecord::ActiveRecordError.new('preserve-me!')
|
556
|
-
end
|
557
|
-
rescue ActiveRecord::ActiveRecordError => e
|
558
|
-
assert_equal 'preserve-me!', e.message
|
559
|
-
end
|
560
|
-
end
|
561
|
-
|
562
|
-
def test_remote_service_metric_respects_dynamic_connection_config
|
563
|
-
return unless isMysql? && !NewRelic::LanguageSupport.using_engine?('jruby')
|
564
|
-
|
565
|
-
ActiveRecordFixtures::Shipment.connection.execute('SHOW TABLES');
|
566
|
-
assert_metrics_recorded(["RemoteService/sql/#{adapter}/localhost"])
|
567
|
-
|
568
|
-
config = ActiveRecordFixtures::Shipment.connection.instance_eval { @config }
|
569
|
-
config[:host] = '127.0.0.1'
|
570
|
-
connection = ActiveRecordFixtures::Shipment.establish_connection(config)
|
571
|
-
|
572
|
-
ActiveRecordFixtures::Shipment.connection.execute('SHOW TABLES');
|
573
|
-
assert_metrics_recorded(["RemoteService/sql/#{adapter}/127.0.0.1"])
|
574
|
-
|
575
|
-
config[:host] = 'localhost'
|
576
|
-
ActiveRecordFixtures::Shipment.establish_connection(config)
|
577
|
-
end
|
578
|
-
|
579
|
-
private
|
580
|
-
|
581
|
-
def rails3?
|
582
|
-
(defined?(Rails) && Rails::VERSION::MAJOR.to_i >= 3)
|
583
|
-
end
|
584
|
-
|
585
|
-
def rails_env
|
586
|
-
rails3? ? ::Rails.env : RAILS_ENV
|
587
|
-
end
|
588
|
-
|
589
|
-
def isPostgres?
|
590
|
-
ActiveRecordFixtures::Order.configurations[rails_env]['adapter'] =~ /postgres/i
|
591
|
-
end
|
592
|
-
def isMysql?
|
593
|
-
ActiveRecordFixtures::Order.connection.class.name =~ /mysql/i
|
594
|
-
end
|
595
|
-
|
596
|
-
def isSqlite?
|
597
|
-
ActiveRecord::Base.configurations[rails_env]['adapter'] =~ /sqlite/i
|
598
|
-
end
|
599
|
-
|
600
|
-
def all_finder(relation)
|
601
|
-
if defined?(::ActiveRecord::VERSION)
|
602
|
-
if ::ActiveRecord::VERSION::MAJOR.to_i >= 4
|
603
|
-
relation.all.load
|
604
|
-
elsif ::ActiveRecord::VERSION::MAJOR.to_i >= 3
|
605
|
-
relation.all
|
606
|
-
else
|
607
|
-
relation.find(:all)
|
608
|
-
end
|
609
|
-
else
|
610
|
-
relation.find(:all)
|
611
|
-
end
|
612
|
-
end
|
613
|
-
|
614
|
-
def last_segment(txn_sample)
|
615
|
-
last = nil
|
616
|
-
txn_sample.root_segment.each_segment do |segment|
|
617
|
-
last = segment
|
618
|
-
end
|
619
|
-
last
|
620
|
-
end
|
621
|
-
end
|
622
|
-
|
623
|
-
|
624
|
-
class ActiveRecordQueryEncodingTest < MiniTest::Unit::TestCase
|
625
|
-
|
626
|
-
class DatabaseAdapter
|
627
|
-
# we patch in here
|
628
|
-
def log(*args)
|
629
|
-
end
|
630
|
-
include ::NewRelic::Agent::Instrumentation::ActiveRecord
|
631
|
-
end
|
632
|
-
|
633
|
-
def test_should_not_bomb_out_if_a_query_is_in_an_invalid_encoding
|
634
|
-
# Contains invalid UTF8 Byte
|
635
|
-
query = "select ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000"
|
636
|
-
if RUBY_VERSION >= '1.9'
|
637
|
-
# Force the query to an invalid encoding
|
638
|
-
query.force_encoding 'UTF-8'
|
639
|
-
assert_equal false, query.valid_encoding?
|
640
|
-
end
|
641
|
-
db = DatabaseAdapter.new
|
642
|
-
db.send(:log, query)
|
643
|
-
end
|
644
|
-
end
|
645
|
-
|
646
|
-
else
|
647
|
-
puts "Skipping tests in #{__FILE__} because Rails is unavailable"
|
648
|
-
end
|