newrelic_rpm 3.7.3.204 → 3.8.0.218

data/test/new_relic/dispatcher_test.rb

@@ -12,6 +12,11 @@ class DispatcherTest < Minitest::Test
     NewRelic::Agent.reset_config
   end
 
+  def teardown
+    NewRelic::Agent.reset_config
+    NewRelic::Control.reset
+  end
+
   def assert_dispatcher_reported_to_environment_report(dispatcher)
     assert_equal dispatcher.to_s, NewRelic::EnvironmentReport.new["Dispatcher"]
   end

data/test/new_relic/local_environment_test.rb

@@ -5,17 +5,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 class NewRelic::LocalEnvironmentTest < Minitest::Test
 
-  def self.teardown
-    # To remove mock server instances from ObjectSpace
-    ObjectSpace.garbage_collect
-    super
+  def teardown
+    NewRelic::Control.reset
   end
-  class MockOptions
-    def fetch (*args)
-      1000
-    end
-  end
-  MOCK_OPTIONS = MockOptions.new
 
   def test_passenger
     class << self
@@ -44,9 +36,7 @@ class NewRelic::LocalEnvironmentTest < Minitest::Test
 
       define_mongrel
 
-      # One call from LocalEnvironment's initialize, second from first #mongrel call.
-      # All the rest shouldn't call into ObjectSpace
-      ObjectSpace.expects(:each_object).with(::Mongrel::HttpServer).twice
+      ObjectSpace.expects(:each_object).with(::Mongrel::HttpServer).once
 
       e = NewRelic::LocalEnvironment.new
       5.times { e.mongrel }
@@ -54,19 +44,6 @@ class NewRelic::LocalEnvironmentTest < Minitest::Test
     ensure
       Object.send(:remove_const, :Mongrel) if defined?(Mongrel)
     end
-
-    def test_check_for_mongrel_allows_one_more_check
-      return unless NewRelic::LanguageSupport.object_space_usable?
-
-      define_mongrel
-
-      ObjectSpace.expects(:each_object).with(::Mongrel::HttpServer).at_least(2)
-
-      e = NewRelic::LocalEnvironment.new
-      e.send(:check_for_mongrel)
-    ensure
-      Object.send(:remove_const, :Mongrel) if defined?(Mongrel)
-    end
   end
 
   def define_mongrel

data/test/new_relic/multiverse_helpers.rb

@@ -2,6 +2,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__), "..", "agent_helper"))
+
 module MultiverseHelpers
 
   #
@@ -65,6 +67,9 @@ module MultiverseHelpers
     NewRelic::Agent.instance.transaction_sampler.reset!
 
     NewRelic::Agent.shutdown
+
+    # If we didn't start up right, our Control might not have reset on shutdown
+    NewRelic::Control.reset
   end
 
   def run_agent(options={}, &block)

data/test/new_relic/noticed_error_test.rb

@@ -100,4 +100,11 @@ class NewRelic::Agent::NoticedErrorTest < Minitest::Test
       assert_truthy error.whitelisted?
     end
   end
+  def test_handles_exception_with_nil_original_exception
+    e = Exception.new('Buffy FOREVER')
+    e.stubs(:original_exception).returns(nil)
+    error = NewRelic::NoticedError.new(@path, @params, e, @time)
+    assert_equal(error.message.to_s, 'Buffy FOREVER')
+  end
+
 end

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -100,37 +100,36 @@ EOL
   end
 
   # RUM header auto-insertion testing
-  # We read *.source.html files from the test/rum directory, and then
-  # compare the results of them to *.result.html files.
+  # We read *.html files from the rum_loader_insertion_location directory in
+  # cross_agent_tests, strip out the placeholder tokens representing the RUM
+  # header manually, and then re-insert, verifying that it ends up in the right
+  # place.
 
-  source_files = Dir[File.join(File.dirname(__FILE__), "..", "..", "rum", "*.source.html")]
+  source_files = Dir[File.join(cross_agent_tests_dir, 'rum_loader_insertion_location', "*.html")]
 
-  RUM_LOADER = "|||I AM THE RUM HEADER|||"
-  RUM_CONFIG = "|||I AM THE RUM FOOTER|||"
+  RUM_PLACEHOLDER = "EXPECTED_RUM_LOADER_LOCATION"
 
   source_files.each do |source_file|
     source_filename = File.basename(source_file).gsub(".", "_")
-    source_html = File.read(source_file)
-
-    result_file = source_file.gsub(".source.", ".result.")
+    instrumented_html = File.read(source_file)
+    uninstrumented_html = instrumented_html.gsub(RUM_PLACEHOLDER, '')
 
     define_method("test_#{source_filename}") do
-      TestApp.doc = source_html
-      NewRelic::Agent.stubs(:browser_timing_header).returns(RUM_CONFIG + RUM_LOADER)
+      TestApp.doc = uninstrumented_html
+      NewRelic::Agent.stubs(:browser_timing_header).returns(RUM_PLACEHOLDER)
 
       get '/'
 
-      expected_content = File.read(result_file)
-      assert_equal(expected_content, last_response.body)
+      assert_equal(instrumented_html, last_response.body)
     end
 
     define_method("test_dont_touch_#{source_filename}") do
-      TestApp.doc = source_html
+      TestApp.doc = uninstrumented_html
       NewRelic::Rack::BrowserMonitoring.any_instance.stubs(:should_instrument?).returns(false)
 
       get '/'
 
-      assert_equal(source_html, last_response.body)
+      assert_equal(uninstrumented_html, last_response.body)
     end
   end
 

data/test/test_helper.rb

@@ -76,7 +76,8 @@ def default_service(stubbed_method_overrides = {})
     :sql_trace_data => nil,
     :get_agent_commands => [],
     :agent_command_results => nil,
-    :analytic_event_data => nil
+    :analytic_event_data => nil,
+    :valid_to_marshal? => true
   }
 
   service.stubs(stubbed_method_defaults.merge(stubbed_method_overrides))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.7.3.204
+  version: 3.8.0.218
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
   d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,17 +144,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.8
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +354,6 @@ files:
 - lib/new_relic/agent/instrumentation/net.rb
 - lib/new_relic/agent/instrumentation/padrino.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
-- lib/new_relic/agent/instrumentation/puma.rb
 - lib/new_relic/agent/instrumentation/queue_time.rb
 - lib/new_relic/agent/instrumentation/rack.rb
 - lib/new_relic/agent/instrumentation/rails/action_controller.rb
@@ -375,7 +374,6 @@ files:
 - lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
 - lib/new_relic/agent/instrumentation/typhoeus.rb
-- lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb
 - lib/new_relic/agent/internal_agent_error.rb
 - lib/new_relic/agent/javascript_instrumentor.rb
 - lib/new_relic/agent/memory_logger.rb
@@ -394,6 +392,7 @@ files:
 - lib/new_relic/agent/samplers/delayed_job_sampler.rb
 - lib/new_relic/agent/samplers/memory_sampler.rb
 - lib/new_relic/agent/samplers/object_sampler.rb
+- lib/new_relic/agent/samplers/vm_sampler.rb
 - lib/new_relic/agent/shim_agent.rb
 - lib/new_relic/agent/sql_sampler.rb
 - lib/new_relic/agent/stats.rb
@@ -716,17 +715,19 @@ files:
 - test/multiverse/lib/multiverse/output_collector.rb
 - test/multiverse/lib/multiverse/runner.rb
 - test/multiverse/lib/multiverse/suite.rb
-- test/multiverse/script/run_one
 - test/multiverse/script/runner
 - test/multiverse/suites/active_record/Envfile
 - test/multiverse/suites/active_record/ar_method_aliasing.rb
 - test/multiverse/suites/active_record/config/newrelic.yml
+- test/multiverse/suites/activemerchant/Envfile
+- test/multiverse/suites/activemerchant/activemerchant_test.rb
 - test/multiverse/suites/agent_only/Envfile
 - test/multiverse/suites/agent_only/audit_log_test.rb
 - test/multiverse/suites/agent_only/before_suite.rb
 - test/multiverse/suites/agent_only/collector_exception_handling_test.rb
 - test/multiverse/suites/agent_only/config/newrelic.yml
 - test/multiverse/suites/agent_only/cross_application_tracing_test.rb
+- test/multiverse/suites/agent_only/custom_queue_time_test.rb
 - test/multiverse/suites/agent_only/encoding_handling_test.rb
 - test/multiverse/suites/agent_only/harvest_timestamps_test.rb
 - test/multiverse/suites/agent_only/http_response_code_test.rb
@@ -813,6 +814,7 @@ files:
 - test/multiverse/suites/sinatra/Envfile
 - test/multiverse/suites/sinatra/config/newrelic.yml
 - test/multiverse/suites/sinatra/ignoring_test.rb
+- test/multiverse/suites/sinatra/nested_middleware_test.rb
 - test/multiverse/suites/sinatra/sinatra_classic_test.rb
 - test/multiverse/suites/sinatra/sinatra_error_tracing_test.rb
 - test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb
@@ -858,7 +860,6 @@ files:
 - test/new_relic/agent/configuration/orphan_configuration_test.rb
 - test/new_relic/agent/configuration/server_source_test.rb
 - test/new_relic/agent/configuration/yaml_source_test.rb
-- test/new_relic/agent/cpu_sampler_test.rb
 - test/new_relic/agent/cross_app_monitor_test.rb
 - test/new_relic/agent/cross_app_tracing_test.rb
 - test/new_relic/agent/database/postgres_explain_obfuscator_test.rb
@@ -905,6 +906,8 @@ files:
 - test/new_relic/agent/sampled_buffer_test.rb
 - test/new_relic/agent/sampler_collection_test.rb
 - test/new_relic/agent/sampler_test.rb
+- test/new_relic/agent/samplers/cpu_sampler_test.rb
+- test/new_relic/agent/samplers/vm_sampler_test.rb
 - test/new_relic/agent/shim_agent_test.rb
 - test/new_relic/agent/sql_sampler_test.rb
 - test/new_relic/agent/stats_engine/gc_profiler_test.rb
@@ -941,6 +944,7 @@ files:
 - test/new_relic/collection_helper_test.rb
 - test/new_relic/control/class_methods_test.rb
 - test/new_relic/control/frameworks/rails_test.rb
+- test/new_relic/control/instance_methods_test.rb
 - test/new_relic/control_test.rb
 - test/new_relic/data_container_tests.rb
 - test/new_relic/dependency_detection_test.rb
@@ -1006,46 +1010,6 @@ files:
 - test/performance/suites/thread_profiling.rb
 - test/performance/suites/trace_execution_scoped.rb
 - test/performance/suites/transaction_tracing.rb
-- test/rum/basic.result.html
-- test/rum/basic.source.html
-- test/rum/comments1.result.html
-- test/rum/comments1.source.html
-- test/rum/comments2.result.html
-- test/rum/comments2.source.html
-- test/rum/gt_in_quotes1.result.html
-- test/rum/gt_in_quotes1.source.html
-- test/rum/gt_in_quotes2.result.html
-- test/rum/gt_in_quotes2.source.html
-- test/rum/gt_in_quotes_mismatch.result.html
-- test/rum/gt_in_quotes_mismatch.source.html
-- test/rum/gt_in_single_quotes1.result.html
-- test/rum/gt_in_single_quotes1.source.html
-- test/rum/gt_in_single_quotes_mismatch.result.html
-- test/rum/gt_in_single_quotes_mismatch.source.html
-- test/rum/incomplete_non_meta_tags.result.html
-- test/rum/incomplete_non_meta_tags.source.html
-- test/rum/no_body.result.html
-- test/rum/no_body.source.html
-- test/rum/no_header.result.html
-- test/rum/no_header.source.html
-- test/rum/no_html_and_no_header.result.html
-- test/rum/no_html_and_no_header.source.html
-- test/rum/no_start_header.result.html
-- test/rum/no_start_header.source.html
-- test/rum/script1.result.html
-- test/rum/script1.source.html
-- test/rum/script2.result.html
-- test/rum/script2.source.html
-- test/rum/x_ua_meta_tag.result.html
-- test/rum/x_ua_meta_tag.source.html
-- test/rum/x_ua_meta_tag_multiline.result.html
-- test/rum/x_ua_meta_tag_multiline.source.html
-- test/rum/x_ua_meta_tag_spaces_around_equals.result.html
-- test/rum/x_ua_meta_tag_spaces_around_equals.source.html
-- test/rum/x_ua_meta_tag_with_others.result.html
-- test/rum/x_ua_meta_tag_with_others.source.html
-- test/rum/x_ua_meta_tag_with_spaces.result.html
-- test/rum/x_ua_meta_tag_with_spaces.source.html
 - test/script/build_test_gem.sh
 - test/script/ci.sh
 - test/script/ci_agent-tests_runner.sh
@@ -1136,24 +1100,48 @@ licenses:
 - New Relic
 - MIT
 - Ruby
-post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.7.3 ##\n\n*
-  Obfuscation for PostgreSQL explain plans\n\n  Fixes an agent bug with PostgreSQL
-  where parameters from the original query\n  could appear in explain plans sent to
-  New Relic servers, even when SQL\n  obfuscation was enabled. Parameters from the
-  query are now masked in explain\n  plans prior to transmission when transaction_tracer.record_sql
-  is set to\n  'obfuscated' (the default setting).\n\n  For more information, see:\n
-  \ https://docs.newrelic.com/docs/traces/security-for-postgresql-explain-plans\n\n*
-  More accurate categorization of SQL statements\n\n  Some SQL SELECT statements that
-  were previously being mis-categorized as\n  'SQL - OTHER' will now correctly be
-  tagged as 'SQL - SELECT'. This\n  particularly affected ActiveRecord users using
-  PostgreSQL.\n\n* More reliable Typhoeus instrumentation\n\n  Fixed an issue where
-  an exception raised from a user-specified on_complete\n  block would cause our Typhoeus
-  instrumentation to fail to record the request.\n\n* Fix for Puma 2.8.0 cluster mode
-  (3.7.3.204)\n\n  Puma's 2.8.0 release renamed a hook New Relic used to support Puma's
-  cluster\n  mode.  This resulted in missing data for users running Puma. Thanks Benjamin\n
-  \ Kudria for the fix!\n\n* Fix for deployment command bug (3.7.3.204)\n\n  Problems
-  with file loading order could result in `newrelic deployments`\n  failing with an
-  unrecognized command error. This has been fixed.\n\n    See https://github.com/newrelic/rpm/blob/master/CHANGELOG
+post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.8.0 ##\n\n*
+  Better support for forking and daemonizing dispatchers (e.g. Puma, Unicorn)\n\n
+  \ The agent should now work out-of-the box with no special configuration on\n  servers
+  that fork or daemonize themselves (such as Unicorn or Puma in some\n  configurations).
+  The agent's background thread will be automatically restarted\n  after the first
+  transaction processed within each child process.\n\n  This change means it's no
+  longer necessary to set the\n  'restart_thread_in_children setting' in your agent
+  configuration file if you\n  were doing so previously.\n\n* Rails 4.1 support\n\n
+  \ Rails 4.1 has shipped, and the Ruby agent is ready for it! We've been running\n
+  \ our test suites against the release candidates with no significant issues, so\n
+  \ we're happy to announce full compatibility with this new release of Rails.\n\n*
+  Ruby VM measurements\n\n  The Ruby agent now records more detailed information about
+  the performance and\n  behavior of the Ruby VM, mainly focused around Ruby's garbage
+  collector. This\n  information is exposed on the new 'Ruby VM' tab in the UI. For
+  details about\n  what is recorded, see:\n\n  http://docs.newrelic.com/docs/ruby/ruby-vm-stats\n\n*
+  Separate in-transaction GC timings for web and background processes\n\n  Previously,
+  an application with GC instrumentation enabled, and both web and\n  background processes
+  reporting in to it would show an overly inflated GC band\n  on the application overview
+  graph, because data from both web and non-web\n  transactions would be included.
+  This has been fixed, and GC time during web\n  and non-web transactions is now tracked
+  separately.\n\n* More accurate GC measurements on multi-threaded web servers\n\n
+  \ The agent could previously have reported inaccurate GC times on multi-threaded\n
+  \ web servers such as Puma. It will now correctly report GC timings in\n  multi-threaded
+  contexts.\n\n* Improved ActiveMerchant instrumentation\n\n  The agent will now trace
+  the store, unstore, and update methods on\n  ActiveMerchant gateways. In addition,
+  a bug preventing ActiveMerchant\n  instrumentation from working on Ruby 1.9+ has
+  been fixed.\n\n  Thanks to Troex Nevelin for the contribution!\n\n* More robust
+  Real User Monitoring script injection with charset meta tags\n\n  Previous versions
+  of the agent with Real User Monitoring enabled could have\n  injected JavaScript
+  code into the page above a charset meta tag. By the HTML5\n  spec, the charset tag
+  must appear in the first 1024 bytes of the page, so the\n  Ruby agent will now attempt
+  to inject RUM script after a charset tag, if one\n  is present.\n\n* More robust
+  connection sequence with New Relic servers\n\n  A rare bug that could cause the
+  agent's initial connection handshake with\n  New Relic servers to silently fail
+  has been fixed, and better logging has been\n  added to the related code path to
+  ease diagnosis of any future issues.\n\n* Prevent over-counting of queue time with
+  nested transactions\n\n  When using add_transaction_tracer on methods called from
+  within a Rails or\n  Sinatra action, it was previously possible to get inflated
+  queue time\n  measurements, because queue time would be recorded for both the outer\n
+  \ transaction (the Rails or Sinatra action) and the inner transaction (the\n  method
+  given to add_transaction_tracer). This has been fixed, so only the\n  outermost
+  transaction will now record queue time.\n\n    See https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\n    changes.\n"
 rdoc_options:
 - --line-numbers

metadata.gz.sig

@@ -1 +1 @@
-EP�N�w���˯.&
QŇ��6Pc��NC��������-���� n}5�h�3>z/h�J?�5,�].�"]�,8 �7+��w?E�t)v����T����A�x*��m�`���P>$��K�� -塖�IG@�]�����@��T0\Wur�����=�K
	�
+M�U]��{��5�C�O��2��\4�=U�]�W��`��/K���/���s�����ε��1fiU�T���e_�4�[�ko#̔�s�z��7�B����e;�(B���i6�Ҽ{�)_���hDt��������T7�>�T��߮%2s8���Z�]=sͮw���t���9��u�~��

data/lib/new_relic/agent/instrumentation/puma.rb

@@ -1,25 +0,0 @@
-# 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.
-
-DependencyDetection.defer do
-  named :puma
-
-  depends_on do
-    defined?(::Puma) &&
-      defined?(::Puma::Const::VERSION) &&
-      NewRelic::VersionNumber.new(::Puma::Const::VERSION) > NewRelic::VersionNumber.new("2.0.0") &&
-      ::Puma.respond_to?(:cli_config)
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Puma cluster mode support'
-  end
-
-  executes do
-    option_name = [:worker_boot, :before_worker_boot].detect {|option| Puma.cli_config.options.has_key? option }
-    Puma.cli_config.options[option_name] << Proc.new do
-      ::NewRelic::Agent.after_fork(:force_reconnect => true)
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb

@@ -1,26 +0,0 @@
-# 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.
-
-DependencyDetection.defer do
-  @name = :unicorn
-
-  depends_on do
-    defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Unicorn instrumentation'
-    ::NewRelic::Agent.logger.info 'Detected Unicorn, please see additional documentation: https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data'
-  end
-
-  executes do
-    Unicorn::HttpServer.class_eval do
-      old_worker_loop = instance_method(:worker_loop)
-      define_method(:worker_loop) do |worker|
-        NewRelic::Agent.after_fork(:force_reconnect => true)
-        old_worker_loop.bind(self).call(worker)
-      end
-    end
-  end
-end

data/test/multiverse/script/run_one

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'multiverse', 'environment'))
-
-Multiverse::Runner.run_one ARGV[0]

data/test/rum/basic.result.html

@@ -1,10 +0,0 @@
-<html>
-  <head>|||I AM THE RUM FOOTER||||||I AM THE RUM HEADER|||
-    <title>im a title</title>
-    <meta some-crap="1"/>
-    <script>
-      junk
-    </script>
-  </head>
-  <body>im some body text</body>
-</html>