RubyGems - newrelic_rpm - Versions diffs - 3.8.1.221 → 3.9.0.229 - Mend

newrelic_rpm 3.8.1.221 → 3.9.0.229

Files changed (288) hide show

data.tar.gz.sig +0 -0
data/.gitignore +1 -0
data/.yardopts +2 -0
data/CHANGELOG +95 -0
data/README.md +9 -3
data/Rakefile +6 -0
data/lib/new_relic/agent.rb +37 -52
data/lib/new_relic/agent/agent.rb +32 -64
data/lib/new_relic/agent/agent_logger.rb +3 -2
data/lib/new_relic/agent/audit_logger.rb +2 -1
data/lib/new_relic/agent/busy_calculator.rb +10 -8
data/lib/new_relic/agent/configuration.rb +0 -13
data/lib/new_relic/agent/configuration/default_source.rb +27 -20
data/lib/new_relic/agent/configuration/manager.rb +101 -27
data/lib/new_relic/agent/cross_app_monitor.rb +43 -50
data/lib/new_relic/agent/cross_app_tracing.rb +13 -12
data/lib/new_relic/agent/error_collector.rb +31 -35
data/lib/new_relic/agent/harvester.rb +5 -1
data/lib/new_relic/agent/hostname.rb +17 -0
data/lib/new_relic/agent/http_clients/curb_wrappers.rb +1 -1
data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +1 -1
data/lib/new_relic/agent/http_clients/uri_util.rb +13 -0
data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +18 -32
data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +15 -15
data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
data/lib/new_relic/agent/instrumentation/active_record.rb +6 -4
data/lib/new_relic/agent/instrumentation/active_record_helper.rb +3 -2
data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +18 -20
data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +79 -93
data/lib/new_relic/agent/instrumentation/curb.rb +3 -3
data/lib/new_relic/agent/instrumentation/data_mapper.rb +5 -4
data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +96 -0
data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +69 -0
data/lib/new_relic/agent/instrumentation/net.rb +1 -1
data/lib/new_relic/agent/instrumentation/queue_time.rb +21 -13
data/lib/new_relic/agent/instrumentation/rack.rb +85 -74
data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +3 -1
data/lib/new_relic/agent/instrumentation/rails_middleware.rb +39 -0
data/lib/new_relic/agent/instrumentation/rubyprof.rb +3 -3
data/lib/new_relic/agent/instrumentation/sidekiq.rb +28 -5
data/lib/new_relic/agent/instrumentation/sinatra.rb +4 -4
data/lib/new_relic/agent/instrumentation/typhoeus.rb +4 -2
data/lib/new_relic/agent/javascript_instrumentor.rb +34 -30
data/lib/new_relic/agent/memory_logger.rb +12 -12
data/lib/new_relic/agent/method_tracer.rb +34 -74
data/lib/new_relic/agent/new_relic_service.rb +1 -1
data/lib/new_relic/agent/pipe_channel_manager.rb +3 -3
data/lib/new_relic/agent/request_sampler.rb +10 -11
data/lib/new_relic/agent/samplers/vm_sampler.rb +6 -6
data/lib/new_relic/agent/shim_agent.rb +2 -1
data/lib/new_relic/agent/sql_sampler.rb +52 -27
data/lib/new_relic/agent/stats.rb +24 -10
data/lib/new_relic/agent/stats_engine/gc_profiler.rb +5 -17
data/lib/new_relic/agent/stats_engine/metric_stats.rb +106 -58
data/lib/new_relic/agent/stats_engine/stats_hash.rb +20 -24
data/lib/new_relic/agent/supported_versions.rb +3 -1
data/lib/new_relic/agent/threading/agent_thread.rb +42 -11
data/lib/new_relic/agent/threading/backtrace_service.rb +3 -7
data/lib/new_relic/agent/threading/thread_profile.rb +2 -2
data/lib/new_relic/agent/traced_method_stack.rb +28 -18
data/lib/new_relic/agent/transaction.rb +249 -196
data/lib/new_relic/agent/transaction_metrics.rb +57 -0
data/lib/new_relic/agent/transaction_sample_builder.rb +10 -7
data/lib/new_relic/agent/transaction_sampler.rb +81 -45
data/lib/new_relic/agent/transaction_state.rb +38 -49
data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +15 -18
data/lib/new_relic/agent/vm/rubinius_vm.rb +4 -2
data/lib/new_relic/cli/commands/deployments.rb +3 -2
data/lib/new_relic/control/frameworks/ruby.rb +2 -3
data/lib/new_relic/control/frameworks/sinatra.rb +0 -7
data/lib/new_relic/control/instance_methods.rb +3 -5
data/lib/new_relic/json_wrapper.rb +2 -0
data/lib/new_relic/language_support.rb +1 -1
data/lib/new_relic/local_environment.rb +0 -16
data/lib/new_relic/metric_spec.rb +10 -38
data/lib/new_relic/noticed_error.rb +16 -11
data/lib/new_relic/rack/agent_hooks.rb +4 -10
data/lib/new_relic/rack/agent_middleware.rb +31 -0
data/lib/new_relic/rack/browser_monitoring.rb +7 -13
data/lib/new_relic/rack/developer_mode.rb +16 -59
data/lib/new_relic/rack/error_collector.rb +16 -54
data/lib/new_relic/recipes.rb +8 -101
data/lib/new_relic/recipes/capistrano3.rb +66 -0
data/lib/new_relic/recipes/capistrano_legacy.rb +98 -0
data/lib/new_relic/transaction_sample.rb +6 -54
data/lib/new_relic/transaction_sample/composite_segment.rb +1 -1
data/lib/new_relic/transaction_sample/segment.rb +12 -4
data/lib/new_relic/transaction_sample/summary_segment.rb +1 -1
data/lib/new_relic/version.rb +2 -2
data/lib/newrelic_rpm.rb +1 -1
data/lib/sequel/extensions/newrelic_instrumentation.rb +19 -19
data/lib/tasks/tests.rake +20 -1
data/lib/tasks/versions.html.erb +0 -4
data/lib/tasks/versions.rake +4 -3
data/newrelic.yml +4 -12
data/newrelic_rpm.gemspec +1 -1
data/test/agent_helper.rb +146 -44
data/test/config/newrelic.yml +0 -1
data/test/environments/norails/Gemfile +1 -1
data/test/environments/rails21/Gemfile +1 -1
data/test/environments/rails22/Gemfile +1 -1
data/test/environments/rails23/Gemfile +1 -1
data/test/environments/rails30/Gemfile +1 -1
data/test/environments/rails31/Gemfile +1 -1
data/test/environments/rails32/Gemfile +1 -1
data/test/environments/rails40/Gemfile +1 -1
data/test/environments/rails41/Gemfile +1 -1
data/test/multiverse/lib/multiverse/runner.rb +13 -1
data/test/multiverse/lib/multiverse/suite.rb +26 -9
data/test/multiverse/suites/active_record/config/newrelic.yml +0 -1
data/test/multiverse/suites/activemerchant/Envfile +18 -1
data/test/multiverse/suites/agent_only/audit_log_test.rb +4 -3
data/test/multiverse/suites/agent_only/collector_exception_handling_test.rb +35 -0
data/test/multiverse/suites/agent_only/config/newrelic.yml +0 -1
data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb +1 -0
data/test/multiverse/suites/agent_only/encoding_handling_test.rb +3 -2
data/test/multiverse/suites/agent_only/exclusive_time_test.rb +178 -0
data/test/multiverse/suites/agent_only/logging_test.rb +10 -6
data/test/multiverse/suites/agent_only/marshaling_test.rb +11 -9
data/test/multiverse/suites/agent_only/script/loading.rb +1 -1
data/test/multiverse/suites/agent_only/service_timeout_test.rb +5 -1
data/test/multiverse/suites/agent_only/transaction_ignoring_test.rb +2 -1
data/test/multiverse/suites/agent_only/xray_sessions_test.rb +9 -9
data/test/multiverse/suites/capistrano/Capfile +26 -0
data/test/multiverse/suites/capistrano/Envfile +18 -0
data/test/multiverse/suites/capistrano/config/deploy.rb +10 -0
data/test/multiverse/suites/capistrano/config/deploy/production.rb +9 -0
data/test/multiverse/suites/capistrano/config/newrelic.yml +21 -0
data/test/multiverse/suites/capistrano/deployment_test.rb +47 -0
data/test/multiverse/suites/capistrano2/Capfile +4 -0
data/test/multiverse/suites/capistrano2/Envfile +4 -0
data/test/multiverse/suites/capistrano2/config/deploy.rb +19 -0
data/test/multiverse/suites/capistrano2/config/newrelic.yml +21 -0
data/test/multiverse/suites/capistrano2/deployment_test.rb +38 -0
data/test/multiverse/suites/curb/Envfile +10 -1
data/test/multiverse/suites/curb/config/newrelic.yml +0 -1
data/test/multiverse/suites/datamapper/config/newrelic.yml +0 -1
data/test/multiverse/suites/deferred_instrumentation/config/newrelic.yml +0 -1
data/test/multiverse/suites/excon/config/newrelic.yml +0 -1
data/test/multiverse/suites/httpclient/config/newrelic.yml +0 -1
data/test/multiverse/suites/mongo/config/newrelic.yml +0 -1
data/test/multiverse/suites/net_http/config/newrelic.yml +0 -1
data/test/multiverse/suites/padrino/config/newrelic.yml +0 -1
data/test/multiverse/suites/rack/Envfile +25 -0
data/test/multiverse/suites/rack/example_app.rb +50 -0
data/test/multiverse/suites/rack/nested_non_rack_app_test.rb +66 -0
data/test/multiverse/suites/rack/rack_auto_instrumentation_test.rb +143 -0
data/test/multiverse/suites/rack/rack_unsupported_version_test.rb +45 -0
data/test/multiverse/suites/rack/url_map_test.rb +120 -0
data/test/multiverse/suites/rails/Envfile +10 -0
data/test/multiverse/suites/rails/app.rb +28 -63
data/test/multiverse/suites/rails/bad_instrumentation_test.rb +2 -4
data/test/multiverse/suites/rails/config/newrelic.yml +1 -2
data/test/multiverse/suites/rails/dummy.txt +1 -0
data/test/multiverse/suites/rails/error_tracing_test.rb +46 -31
data/test/multiverse/suites/rails/gc_instrumentation_test.rb +0 -1
data/test/multiverse/suites/rails/ignore_test.rb +9 -3
data/test/multiverse/suites/rails/middleware_instrumentation_test.rb +41 -0
data/test/multiverse/suites/rails/middlewares.rb +19 -0
data/test/multiverse/suites/rails/parameter_capture_test.rb +169 -0
data/test/multiverse/suites/rails/queue_time_test.rb +14 -4
data/test/multiverse/suites/rails/rails2_app/app/controllers/application.rb +7 -0
data/test/multiverse/suites/rails/rails2_app/config/boot.rb +127 -0
data/test/multiverse/suites/rails/rails2_app/config/database.yml +18 -0
data/test/multiverse/suites/rails/rails2_app/config/environment.rb +16 -0
data/test/multiverse/suites/rails/rails2_app/config/environments/development.rb +10 -0
data/test/multiverse/suites/rails/rails2_app/config/initializers/load_newrelic_rpm.rb +9 -0
data/test/multiverse/suites/rails/rails2_app/config/preinitializer.rb +25 -0
data/test/multiverse/suites/rails/rails2_app/config/routes.rb +18 -0
data/test/multiverse/suites/rails/rails2_app/db/schema.rb +5 -0
data/test/multiverse/suites/rails/rails3_app/app_rails3_plus.rb +76 -0
data/test/multiverse/suites/rails/request_statistics_test.rb +2 -4
data/test/multiverse/suites/rails/transaction_ignoring_test.rb +3 -5
data/test/multiverse/suites/rails/view_instrumentation_test.rb +73 -42
data/test/multiverse/suites/resque/config/newrelic.yml +0 -1
data/test/multiverse/suites/sequel/config/newrelic.yml +0 -1
data/test/multiverse/suites/sidekiq/Envfile +4 -0
data/test/multiverse/suites/sidekiq/after_suite.rb +7 -0
data/test/multiverse/suites/sidekiq/config/newrelic.yml +0 -1
data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb +55 -34
data/test/multiverse/suites/sidekiq/sidekiq_server.rb +30 -0
data/test/multiverse/suites/sidekiq/test_worker.rb +60 -0
data/test/multiverse/suites/sinatra/config/newrelic.yml +0 -1
data/test/multiverse/suites/sinatra/ignoring_test.rb +33 -11
data/test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb +3 -1
data/test/multiverse/suites/typhoeus/Envfile +9 -0
data/test/multiverse/suites/typhoeus/config/newrelic.yml +0 -1
data/test/multiverse/suites/typhoeus/typhoeus_test.rb +10 -0
data/test/multiverse/test/suite_examples/one/a/config/newrelic.yml +0 -1
data/test/multiverse/test/suite_examples/one/b/config/newrelic.yml +0 -1
data/test/new_relic/agent/agent/connect_test.rb +3 -10
data/test/new_relic/agent/agent_logger_test.rb +24 -6
data/test/new_relic/agent/agent_test.rb +7 -8
data/test/new_relic/agent/agent_test_controller.rb +2 -2
data/test/new_relic/agent/audit_logger_test.rb +5 -1
data/test/new_relic/agent/busy_calculator_test.rb +1 -1
data/test/new_relic/agent/configuration/manager_test.rb +68 -69
data/test/new_relic/agent/cross_app_monitor_test.rb +32 -14
data/test/new_relic/agent/cross_app_tracing_test.rb +2 -2
data/test/new_relic/agent/error_collector/notice_error_test.rb +9 -33
data/test/new_relic/agent/error_collector_test.rb +45 -14
data/test/new_relic/agent/harvester_test.rb +9 -0
data/test/new_relic/agent/hostname_test.rb +41 -0
data/test/new_relic/agent/instrumentation/action_controller_subscriber_test.rb +27 -19
data/test/new_relic/agent/instrumentation/active_record_subscriber_test.rb +1 -1
data/test/new_relic/agent/instrumentation/active_record_test.rb +3 -3
data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb +95 -14
data/test/new_relic/agent/instrumentation/middleware_proxy_test.rb +189 -0
data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb +2 -2
data/test/new_relic/agent/instrumentation/queue_time_test.rb +18 -1
data/test/new_relic/agent/instrumentation/rack_test.rb +10 -1
data/test/new_relic/agent/instrumentation/sinatra_test.rb +3 -1
data/test/new_relic/agent/javascript_instrumentor_test.rb +28 -41
data/test/new_relic/agent/memory_logger_test.rb +14 -0
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 -30
data/test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb +5 -21
data/test/new_relic/agent/method_tracer_test.rb +5 -4
data/test/new_relic/agent/mock_scope_listener.rb +2 -2
data/test/new_relic/agent/obfuscator_test.rb +1 -1
data/test/new_relic/agent/pipe_channel_manager_test.rb +17 -5
data/test/new_relic/agent/request_sampler_test.rb +16 -16
data/test/new_relic/agent/rpm_agent_test.rb +23 -29
data/test/new_relic/agent/sql_sampler_test.rb +39 -31
data/test/new_relic/agent/stats_engine/metric_stats_test.rb +189 -117
data/test/new_relic/agent/stats_engine_test.rb +1 -1
data/test/new_relic/agent/stats_hash_test.rb +28 -1
data/test/new_relic/agent/stats_test.rb +1 -12
data/test/new_relic/agent/threading/agent_thread_test.rb +23 -9
data/test/new_relic/agent/threading/backtrace_service_test.rb +33 -32
data/test/new_relic/agent/threading/fake_thread.rb +4 -8
data/test/new_relic/agent/threading/threaded_test_case.rb +4 -14
data/test/new_relic/agent/traced_method_stack_test.rb +43 -27
data/test/new_relic/agent/transaction_interrobang_test.rb +1 -1
data/test/new_relic/agent/transaction_metrics_test.rb +113 -0
data/test/new_relic/agent/transaction_sample_builder_test.rb +1 -61
data/test/new_relic/agent/transaction_sampler_test.rb +176 -228
data/test/new_relic/agent/transaction_state_test.rb +62 -26
data/test/new_relic/agent/transaction_test.rb +198 -80
data/test/new_relic/agent/vm/monotonic_gc_profiler_test.rb +4 -4
data/test/new_relic/agent/vm/rubinius_vm_test.rb +68 -0
data/test/new_relic/agent_test.rb +31 -27
data/test/new_relic/cli/commands/deployments_test.rb +7 -2
data/test/new_relic/control/instance_methods_test.rb +4 -4
data/test/new_relic/control_test.rb +28 -22
data/test/new_relic/dependency_detection_test.rb +14 -0
data/test/new_relic/fake_external_server.rb +1 -0
data/test/new_relic/fake_rpm_site.rb +35 -0
data/test/new_relic/http_client_test_cases.rb +12 -3
data/test/new_relic/json_wrapper_test.rb +5 -0
data/test/new_relic/language_support_test.rb +7 -0
data/test/new_relic/license_test.rb +11 -5
data/test/new_relic/local_environment_test.rb +0 -18
data/test/new_relic/metric_data_test.rb +2 -2
data/test/new_relic/metric_spec_test.rb +4 -23
data/test/new_relic/multiverse_helpers.rb +1 -3
data/test/new_relic/noticed_error_test.rb +6 -22
data/test/new_relic/rack/agent_hooks_test.rb +5 -1
data/test/new_relic/rack/agent_middleware_test.rb +32 -0
data/test/new_relic/rack/browser_monitoring_test.rb +14 -1
data/test/new_relic/rack/developer_mode_helper_test.rb +0 -8
data/test/new_relic/rack/developer_mode_test.rb +1 -1
data/test/new_relic/rack/error_collector_test.rb +6 -30
data/test/new_relic/transaction_sample/fake_segment_test.rb +2 -2
data/test/new_relic/transaction_sample/segment_test.rb +47 -47
data/test/new_relic/transaction_sample_test.rb +9 -8
data/test/performance/lib/performance/instrumentation/stackprof.rb +11 -8
data/test/performance/script/runner +13 -0
data/test/performance/suites/config.rb +5 -2
data/test/performance/suites/rack_middleware.rb +84 -0
data/test/performance/suites/rum_autoinsertion.rb +1 -1
data/test/performance/suites/thread_profiling.rb +1 -1
data/test/test_helper.rb +12 -10
data/ui/helpers/developer_mode_helper.rb +3 -43
data/ui/views/layouts/newrelic_default.rhtml +2 -2
data/ui/views/newrelic/_sample.rhtml +2 -2
data/ui/views/newrelic/_sql_row.rhtml +11 -11
data/ui/views/newrelic/index.rhtml +21 -22
data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb +15 -10
data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser.rb +2 -0
data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/middleware.rb +34 -0
data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/nested.rb +24 -0
metadata +108 -31
metadata.gz.sig +0 -0
data/lib/new_relic/rack/transaction_reset.rb +0 -20
data/test/multiverse/suites/rails/mongrel_queue_depth_test.rb +0 -42
data/test/new_relic/rack/transaction_reset_test.rb +0 -35
data/ui/views/newrelic/show_source.rhtml +0 -3

data/test/new_relic/http_client_test_cases.rb CHANGED Viewed

@@ -159,7 +159,7 @@ module HttpClientTestCases
   def test_background
     res = nil
-    perform_action_with_newrelic_trace("task", :category => :task) do
+    perform_action_with_newrelic_trace(:name => "task", :category => :task) do
       res = get_response
     end
@@ -176,7 +176,7 @@ module HttpClientTestCases
   def test_transactional_metrics
     res = nil
-    perform_action_with_newrelic_trace("task") do
+    perform_action_with_newrelic_trace(:name => "task") do
       res = get_response
     end
@@ -193,7 +193,7 @@ module HttpClientTestCases
   def test_transactional_traces_nodes
-    perform_action_with_newrelic_trace("task") do
+    perform_action_with_newrelic_trace(:name => "task") do
       res = get_response
       last_segment = find_last_transaction_segment()
@@ -231,6 +231,15 @@ module HttpClientTestCases
     assert_externals_recorded_for("localhost", "DELETE")
   end
+  if defined?(::Addressable)
+    def test_url_not_supported_by_stdlib_uri
+      res = get_response("#{protocol}://foo:^password*12@localhost:#{server.port}/status")
+      assert_match %r/<head>/i, body(res)
+      assert_externals_recorded_for("localhost", "GET")
+    end
+  end
   # When an http call is made, the agent should add a request header named
   # X-NewRelic-ID with a value equal to the encoded cross_app_id.

data/test/new_relic/json_wrapper_test.rb CHANGED Viewed

@@ -72,5 +72,10 @@ class JSONWrapperTest < Minitest::Test
       expected = [string.dup.force_encoding('ISO-8859-1').encode('UTF-8')]
       assert_equal(expected, decoded)
     end
+    def test_normalize_converts_symbols_to_strings
+      result = NewRelic::JSONWrapper.normalize([:foo, :bar])
+      assert_equal(['foo', 'bar'], result)
+    end
   end
 end

data/test/new_relic/language_support_test.rb CHANGED Viewed

@@ -56,6 +56,13 @@ class NewRelic::LanguageSupportTest < Minitest::Test
       ::GC::Profiler.stubs(:enabled?).returns(0)
       assert_equal true, NewRelic::LanguageSupport.gc_profiler_enabled?
     end
+    def test_gc_profiler_enabled_when_config_is_disabled
+      ::GC::Profiler.stubs(:enabled?).returns(true)
+      with_config(:disable_gc_profiler => true) do
+        refute NewRelic::LanguageSupport.gc_profiler_enabled?
+      end
+    end
   end
   def test_gc_profiler_disabled_on_jruby

data/test/new_relic/license_test.rb CHANGED Viewed

@@ -73,7 +73,9 @@ class LicenseTest < Minitest::Test
       # skip tags file
       path =~ %r{/tags$}i ||
       # skip multiverse auto-generated gemfiles
-      path =~ %r{/test/multiverse/suites/.*/Gemfile\.\d+(\.lock)?$}
+      path =~ %r{/test/multiverse/suites/.*/Gemfile\.\d+(\.lock)?$} ||
+      # skip the artifacts directory
+      path =~ %r{/artifacts/}
     )
   end
@@ -105,10 +107,14 @@ class LicenseTest < Minitest::Test
     files_to_check = all_files.reject { |f| should_skip?(f) }
     files_to_check.each do |filename|
       LICENSE_TERMS.each do |key, pattern|
-        # we're checking this one.  We'll update the count of checked files below.
-        occurrences = File.readlines(filename).grep(pattern).size
-        expected = (EXPECTED_LICENSE_OCCURRENCES[[filename.sub(gem_root, ''), key]] || 0)
-        assert_equal expected, occurrences, "#{filename} contains #{key} #{occurrences} times. Should be #{expected}"
+        begin
+          # we're checking this one.  We'll update the count of checked files below.
+          occurrences = File.readlines(filename).grep(pattern).size
+          expected = (EXPECTED_LICENSE_OCCURRENCES[[filename.sub(gem_root, ''), key]] || 0)
+          assert_equal expected, occurrences, "#{filename} contains #{key} #{occurrences} times. Should be #{expected}"
+        rescue => e
+          raise "Error when checking file #{filename}: #{e}"
+        end
       end
     end
     # sanity check that we are not skipping all the files.

data/test/new_relic/local_environment_test.rb CHANGED Viewed

@@ -22,22 +22,4 @@ class NewRelic::LocalEnvironmentTest < Minitest::Test
       end
     end
   end
-  # LocalEnvironment won't talk to ObjectSpace on JRuby, and these tests are
-  # around that interaction, so we don't run them on JRuby.
-  unless defined?(JRuby)
-    def test_mongrel_only_checks_once
-      return unless NewRelic::LanguageSupport.object_space_usable?
-      with_constant_defined(:'Mongrel', Module.new) do
-        with_constant_defined(:'Mongrel::HttpServer', Class.new) do
-          ObjectSpace.expects(:each_object).with(::Mongrel::HttpServer).once
-          e = NewRelic::LocalEnvironment.new
-          5.times { e.mongrel }
-          assert_nil e.mongrel
-        end
-      end
-    end
-  end
 end

data/test/new_relic/metric_data_test.rb CHANGED Viewed

@@ -122,12 +122,12 @@ class NewRelic::MetricDataTest < Minitest::Test
   def test_to_s_with_metric_spec
     md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new, 12345)
-    assert_equal('Custom/test/method(): [ 0 calls 0.0000s]', md.to_s, "should not include the metric id and should include the metric spec")
+    assert_equal('Custom/test/method(): [ 0 calls 0.0000s / 0.0000s ex]', md.to_s, "should not include the metric id and should include the metric spec")
   end
   def test_to_s_without_metric_spec
     md = NewRelic::MetricData.new(nil, NewRelic::Agent::Stats.new, 12345)
-    assert_equal('12345: [ 0 calls 0.0000s]', md.to_s, "should include the metric id and not have a metric spec")
+    assert_equal('12345: [ 0 calls 0.0000s / 0.0000s ex]', md.to_s, "should include the metric id and not have a metric spec")
   end
   def test_to_collector_array_with_spec

data/test/new_relic/metric_spec_test.rb CHANGED Viewed

@@ -67,33 +67,14 @@ class NewRelic::MetricSpecTest < Minitest::Test
     puts "Skipping tests in #{__FILE__} because ActiveSupport is unavailable"
   end
-  def test_truncate!
-    spec = NewRelic::MetricSpec.new('a', 'b')
-    spec.name = "a" * 300
-    spec.scope = "b" * 300
-    spec.truncate!
+  def test_initialize_truncates_name_and_scope
+    long_name = "a" * 300
+    long_scope = "b" * 300
+    spec = NewRelic::MetricSpec.new(long_name, long_scope)
     assert_equal("a" * 255, spec.name, "should have shortened the name")
     assert_equal("b" * 255, spec.scope, "should have shortened the scope")
   end
-  def test_invalid_name_setting_nil
-    NewRelic::Agent.instance.error_collector.errors.clear
-    spec = NewRelic::MetricSpec.new
-    spec.scope = nil
-    assert_has_error(NewRelic::MetricSpec::InvalidScopeSettingError)
-  end
-  def test_invalid_name_setting_false
-    NewRelic::Agent.instance.error_collector.errors.clear
-    spec = NewRelic::MetricSpec.new
-    spec.scope = false
-    assert_has_error(NewRelic::MetricSpec::InvalidScopeSettingError)
-  end
   private
   def compare_spec(spec, import)

data/test/new_relic/multiverse_helpers.rb CHANGED Viewed

@@ -60,9 +60,7 @@ module MultiverseHelpers
     NewRelic::Agent.instance.error_collector.instance_variable_set(:@ignore_filter, nil)
     # Clean up any thread-local variables starting with 'newrelic'
-    Thread.current.keys.select { |k| k.to_s =~ /^newrelic/i }.each do |key|
-      Thread.current[key] = nil
-    end
+    NewRelic::Agent::TransactionState.tl_clear_for_testing
     NewRelic::Agent.instance.transaction_sampler.reset!

data/test/new_relic/noticed_error_test.rb CHANGED Viewed

@@ -56,50 +56,34 @@ class NewRelic::Agent::NoticedErrorTest < Minitest::Test
   def test_whitelisted_returns_nil_with_an_empty_whitelist
     with_config(:'strip_exception_messages.whitelist' => '') do
-      e = TestError.new('whitelisted test exception')
-      error = NewRelic::NoticedError.new(@path, @params, e, @time)
-      assert_falsy error.whitelisted?
+      assert_falsy NewRelic::NoticedError.passes_message_whitelist(TestError)
     end
   end
   def test_whitelisted_returns_nil_when_error_is_not_in_whitelist
     with_config(:'strip_exception_messages.whitelist' => 'YourErrorIsInAnotherCastle') do
-      e = TestError.new('whitelisted test exception')
-      error = NewRelic::NoticedError.new(@path, @params, e, @time)
-      assert_falsy error.whitelisted?
+      assert_falsy NewRelic::NoticedError.passes_message_whitelist(TestError)
     end
   end
   def test_whitelisted_is_true_when_error_is_in_whitelist
     with_config(:'strip_exception_messages.whitelist' => 'OtherException,NewRelic::TestHelpers::Exceptions::TestError') do
-      test_exception_class = TestError
-      e = test_exception_class.new('whitelisted test exception')
-      error = NewRelic::NoticedError.new(@path, @params, e, @time)
-      assert_truthy error.whitelisted?
+      assert_truthy NewRelic::NoticedError.passes_message_whitelist(TestError)
     end
   end
   def test_whitelisted_ignores_nonexistent_exception_types_in_whitelist
     with_config(:'strip_exception_messages.whitelist' => 'NonExistent::Exception,NewRelic::TestHelpers::Exceptions::TestError') do
-      test_exception_class = TestError
-      e = test_exception_class.new('whitelisted test exception')
-      error = NewRelic::NoticedError.new(@path, @params, e, @time)
-      assert_truthy error.whitelisted?
+      assert_truthy NewRelic::NoticedError.passes_message_whitelist(TestError)
     end
   end
   def test_whitelisted_is_true_when_an_exceptions_ancestor_is_whitelisted
     with_config(:'strip_exception_messages.whitelist' => 'NewRelic::TestHelpers::Exceptions::ParentException') do
-      e = ChildException.new('whitelisted test exception')
-      error = NewRelic::NoticedError.new(@path, @params, e, @time)
-      assert_truthy error.whitelisted?
+      assert_truthy NewRelic::NoticedError.passes_message_whitelist(ChildException)
     end
   end
   def test_handles_exception_with_nil_original_exception
     e = Exception.new('Buffy FOREVER')
     e.stubs(:original_exception).returns(nil)

data/test/new_relic/rack/agent_hooks_test.rb CHANGED Viewed

@@ -14,8 +14,10 @@ class AgentHooksTest < Minitest::Test
   end
   def test_before_call
+    NewRelic::Agent.instance.events.expects(:notify).with(:start_transaction)
     NewRelic::Agent.instance.events.expects(:notify).with(:before_call, @env)
     NewRelic::Agent.instance.events.stubs(:notify).with(:after_call, anything, anything)
+    NewRelic::Agent.instance.events.expects(:notify).with(:transaction_finished, anything)
     @hooks.call(@env)
   end
@@ -24,8 +26,10 @@ class AgentHooksTest < Minitest::Test
     result = stub
     @app.stubs(:call).returns(result)
+    NewRelic::Agent.instance.events.expects(:notify).with(:start_transaction)
     NewRelic::Agent.instance.events.stubs(:notify).with(:before_call, anything)
     NewRelic::Agent.instance.events.expects(:notify).with(:after_call, @env, result)
+    NewRelic::Agent.instance.events.expects(:notify).with(:transaction_finished, anything)
     @hooks.call(@env)
   end
@@ -33,7 +37,7 @@ class AgentHooksTest < Minitest::Test
   def test_nested_agent_hooks_still_fire_only_once
     nested = NewRelic::Rack::AgentHooks.new(@hooks)
-    NewRelic::Agent.instance.events.expects(:notify).times(2)
+    NewRelic::Agent.instance.events.expects(:notify).times(4)
     nested.call(@env)
   end

data/test/new_relic/rack/agent_middleware_test.rb ADDED Viewed

@@ -0,0 +1,32 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'new_relic/rack/agent_middleware'
+require 'new_relic/agent/transaction_state'
+module NewRelic
+  module Rack
+    class AgentMiddlewareTest < Minitest::Test
+      class ExampleMiddleware < AgentMiddleware
+        def traced_call(env)
+          @app.call(env)
+        end
+      end
+      attr_reader :middleware, :env
+      def setup
+        @app = lambda { |env| [200, {}, ['yeah!']]}
+        @middleware = ExampleMiddleware.new(@app)
+        @env = {}
+      end
+      def test_with_tracing_creates_a_transaction
+        middleware.call(env)
+        assert_metrics_recorded('Controller/Middleware/Rack/NewRelic::Rack::AgentMiddlewareTest::ExampleMiddleware/call')
+      end
+    end
+  end
+end

data/test/new_relic/rack/browser_monitoring_test.rb CHANGED Viewed

@@ -30,6 +30,7 @@ class BrowserMonitoringTest < Minitest::Test
     end
     def call(env)
+      advance_time(0.1)
       @@doc ||= <<-EOL
 <html>
   <head>
@@ -56,6 +57,8 @@ EOL
   def setup
     super
+    freeze_time
     @config = {
       :application_id => 5,
       :beacon => 'beacon',
@@ -64,7 +67,7 @@ EOL
       :license_key => 'a' * 40,
       :js_agent_loader => 'loader',
     }
-    NewRelic::Agent.config.apply_config(@config)
+    NewRelic::Agent.config.add_config_for_testing(@config)
   end
   def teardown
@@ -142,6 +145,16 @@ EOL
     assert last_response.ok?
   end
+  def test_with_invalid_us_ascii_encoding
+    response = "<html><body>Jürgen</body></html>"
+    response.force_encoding(Encoding.find("US-ASCII")) if RUBY_VERSION >= '1.9'
+    TestApp.next_response = Rack::Response.new(response)
+    get '/'
+    assert last_response.ok?
+  end
   def test_should_not_close_if_not_responded_to
     TestApp.next_response = Rack::Response.new("<html/>")
     TestApp.next_response.stubs(:respond_to?).with(:close).returns(false)

data/test/new_relic/rack/developer_mode_helper_test.rb CHANGED Viewed

@@ -22,14 +22,6 @@ class DeveloperModeTest < Minitest::Test
     assert_equal 29, trace.size
     trace = application_stack_trace(Fixtures::WINDOWS_TRACE)
     assert_equal 14, trace.size
-  end
-  def test_url_for_source
-    for line in Fixtures::NORMAL_TRACE + Fixtures::WINDOWS_TRACE do
-      line = url_for_source(line)
-      assert line =~ /^show_source\?file=.*&amp;line=\d+&amp;/, line
-    end
   end
   private

data/test/new_relic/rack/developer_mode_test.rb CHANGED Viewed

@@ -22,7 +22,7 @@ class DeveloperModeTest < Minitest::Test
   def setup
     @test_config = { :developer_mode => true }
-    NewRelic::Agent.config.apply_config(@test_config)
+    NewRelic::Agent.config.add_config_for_testing(@test_config)
     run_sample_trace('/here')
     run_sample_trace('/there')
     run_sample_trace('/somewhere')

data/test/new_relic/rack/error_collector_test.rb CHANGED Viewed

@@ -13,12 +13,6 @@ module NewRelic::Rack
     class TestApp
       def call(env)
-        if env['PATH_INFO'] == '/ignored'
-          env['action_dispatch.request.parameters'] = {
-            'controller' => 'test_ignore',
-            'action'     => 'ignored'
-          }
-        end
         raise 'unhandled error'
       end
     end
@@ -35,9 +29,6 @@ module NewRelic::Rack
       # sanity checks
       assert NewRelic::Agent.instance.error_collector.enabled?
-      NewRelic::Agent.instance.error_collector \
-        .instance_variable_set(:@ignore_filter, nil)
-      assert !NewRelic::Agent.instance.error_collector.ignore_error_filter
     end
     def test_notice_and_reraise_errors
@@ -49,37 +40,26 @@ module NewRelic::Rack
     end
     def test_ignore_filtered_errors
-      NewRelic::Agent.instance.error_collector.ignore_error_filter do |error|
+      filter = Proc.new do |error|
         !error.kind_of?(RuntimeError)
       end
-      assert_raises RuntimeError do
-        get '/'
+      with_ignore_error_filter(filter) do
+        assert_raises RuntimeError do
+          get '/'
+        end
       end
       assert(NewRelic::Agent.instance.error_collector.errors.empty?,
              'noticed an error that should have been ignored')
     end
-    if defined?(::Rails)
-      def test_ignore_errors_from_ignored_actions
-        assert_raises RuntimeError do
-          get '/ignored'
-        end
-        assert(NewRelic::Agent.instance.error_collector.errors.empty?,
-               'noticed an error that should have been ignored')
-      end
-    else
-      puts "Skipping tests in #{__FILE__} because Rails is unavailable"
-    end
     def test_handles_parameter_parsing_exceptions
       if defined?(ActionDispatch::Request)
         bad_request = stub.stubs(:filtered_params).raises(TypeError, "can't convert nil into Hash")
         ActionDispatch::Request.stubs(:new).returns(bad_request)
       else
-        bad_request = stub(:env => {}, :path => '/', :referer => '')
+        bad_request = stub(:env => {}, :path => '/', :referer => '', :cookies => {})
         bad_request.stubs(:params).raises(TypeError, "whatever, man")
         Rack::Request.stubs(:new).returns(bad_request)
       end
@@ -136,7 +116,3 @@ module NewRelic::Rack
     end
   end
 end
-class TestIgnoreController
-  @do_not_trace = { :only => :ignored }
-end