newrelic_rpm 3.9.9.275 → 3.10.0.279

data/lib/new_relic/agent/vm/rubinius_vm.rb

@@ -15,26 +15,116 @@ module NewRelic
         end
 
         def gather_stats(snap)
+          gather_gc_stats(snap)
+          gather_thread_stats(snap)
+        end
+
+        def gather_gc_stats(snap)
           snap.gc_runs = GC.count
 
+          # Rubinius::Metrics is available since Rubinius 2.3
+          if has_metrics?
+            gather_stats_from_metrics(snap)
+          else
+            gather_stats_from_gc_stat(snap)
+          end
+
+          gather_gc_time(snap)
+        end
+
+        # The '+ 0' bits in here are a workaround for a Rubinius bug wherein
+        # Rubinius::Metrics.data returns 0's as Bignums, and these Bignums
+        # cannot be safely subtraced from Fixnums. The + 0  has the effect of
+        # truncating to a Fixnum if possible without loss of precision.
+        # See https://github.com/rubinius/rubinius/issues/3316
+        def gather_stats_from_metrics(snap)
+          snap.major_gc_count = metric(:'gc.immix.count') + 0
+          snap.minor_gc_count = metric(:'gc.young.count') + 0
+
+          snap.heap_live = metric(:'memory.large.objects.current') +
+            metric(:'memory.young.objects.current') +
+            metric(:'memory.immix.objects.current')
+
+          snap.total_allocated_object =
+            metric(:'memory.large.objects.total') +
+            metric(:'memory.young.objects.total') +
+            metric(:'memory.immix.objects.total')
+
+          snap.method_cache_invalidations = metric(:'vm.inline_cache.resets') + 0
+        end
+
+        def gather_stats_from_gc_stat(snap)
           gc_stats = GC.stat[:gc]
+
           if gc_stats
             snap.major_gc_count = gc_stats[:full][:count] if gc_stats[:full]
             snap.minor_gc_count = gc_stats[:young][:count] if gc_stats[:young]
           end
+        end
+
+        def gather_gc_time(snap)
+          if GC.respond_to?(:time)
+            # On Rubinius GC.time returns a time in miliseconds, not seconds.
+            snap.gc_total_time = GC.time / 1000
+          end
+        end
 
+        def gather_thread_stats(snap)
           snap.thread_count = Thread.list.size
         end
 
-        SUPPORTED_KEYS = [
+        def has_metrics?
+          Rubinius.const_defined?(:Metrics)
+        end
+
+        def metric(key)
+          Rubinius::Metrics.data[key]
+        end
+
+        SUPPORTED_KEYS_GC_RBX_METRICS = [
           :gc_runs,
+          :heap_live,
           :major_gc_count,
           :minor_gc_count,
-          :thread_count
+          :method_cache_invalidations,
+          :thread_count,
+          :total_allocated_object
         ].freeze
 
         def supports?(key)
-          SUPPORTED_KEYS.include?(key)
+          if has_metrics?
+            case key
+            when :major_gc_count
+              true
+            when :minor_gc_count
+              true
+            when :heap_live
+              true
+            when :total_allocated_object
+              true
+            when :method_cache_invalidations
+              true
+            when :gc_runs
+              true
+            when :gc_total_time
+              GC.respond_to?(:time)
+            when :thread_count
+              true
+            else
+              false
+            end
+          else
+            case key
+            when :major_gc_count
+              true
+            when :minor_gc_count
+              true
+            when :thread_count
+              true
+            else
+              false
+            end
+          end
         end
       end
     end

data/lib/new_relic/control/frameworks/rails.rb

@@ -70,6 +70,7 @@ module NewRelic
           return if config.nil? || !config.respond_to?(:middleware)
           begin
             require 'new_relic/rack/agent_hooks'
+            return unless NewRelic::Rack::AgentHooks.needed?
             config.middleware.use NewRelic::Rack::AgentHooks
             ::NewRelic::Agent.logger.debug("Installed New Relic Agent Hooks middleware")
           rescue => e

data/lib/new_relic/rack/agent_hooks.rb

@@ -7,35 +7,27 @@ require 'new_relic/rack/agent_middleware'
 require 'new_relic/agent/instrumentation/middleware_proxy'
 
 module NewRelic::Rack
-  # This middleware is used by the agent internally, and is usually injected
-  # automatically into the middleware chain. If automatic injection is not
-  # working, you may manually use it in your middleware chain instead.
+  # This middleware is used internally by the agent in the rare case
+  # where the disable_middleware_instrumentation configuration setting
+  # is true.  In Rails and Sinatra applications this middleware will be
+  # automatically injected if necessary.
+  #
+  # If you have disabled middleware instrumentation and are not using Rails or
+  # Sinatra you can include this middleware manually in your config.ru file.
+  #
+  # All of the functionality of this module resides in the MiddlewareTracing
+  # module, which is shared between it and our third party middleware
+  # instrumentation.
   #
   # @api public
   #
   class AgentHooks < AgentMiddleware
-    # We use this key in the Rack env hash to note when we've already fired
-    # events for a given request, in case this middleware gets installed
-    # multiple times in the middleware chain because of a misconfiguration.
-    ENV_KEY = "newrelic.agent_hooks_fired".freeze
-
-    def traced_call(env)
-      if env[ENV_KEY]
-        # Already fired the hooks, just pass through
-        @app.call(env)
-      else
-        env[ENV_KEY] = true
-
-        events.notify(:before_call, env)
-        result = @app.call(env)
-        events.notify(:after_call, env, result)
-
-        result
-      end
+    def self.needed?
+      !NewRelic::Agent.config[:disable_middleware_instrumentation]
     end
 
-    def events
-      NewRelic::Agent.instance.events
+    def traced_call(env)
+      @app.call(env)
     end
   end
 end

data/lib/new_relic/version.rb

@@ -11,8 +11,8 @@ module NewRelic
     end
 
     MAJOR = 3
-    MINOR = 9
-    TINY  = 9
+    MINOR = 10
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 1.8.7'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Jason Clark", "Tim Krajcar", "Chris Pine", "Jonan Scheffler", "Ben Weintraub" ]
+  s.authors = [ "Jason Clark", "Tim Krajcar", "Jonan Scheffler", "Matthew Wear", "Ben Weintraub" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic', 'MIT', 'Ruby']
   s.description = <<-EOS
@@ -47,14 +47,21 @@ EOS
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rails', '~> 3.2.13'
   s.add_development_dependency 'pry', '~> 0.9.12'
-  s.add_development_dependency 'guard', '~> 1.8.3' # Guard 2.0 is Ruby 1.9 only
-  s.add_development_dependency 'guard-minitest'
-  s.add_development_dependency 'rb-fsevent', '~> 0.9.1'
   s.add_development_dependency 'hometown', '~> 0.2.5'
-  s.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
+
+  # Only let Guard run on newer Rubies
+  if RUBY_VERSION >= "1.9.3"
+    s.add_development_dependency 'guard'
+    s.add_development_dependency 'guard-minitest'
+    s.add_development_dependency 'rb-fsevent'
+  end
+
+  # version lock down for i18n that is compatible with Ruby 1.8.7
+  s.add_development_dependency 'i18n', '0.6.11'
 
   if RUBY_PLATFORM == 'java'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+    s.add_development_dependency 'jruby-openssl'
   else
     s.add_development_dependency 'sqlite3'
   end

data/test/agent_helper.rb

@@ -216,6 +216,8 @@ def assert_metrics_not_recorded(not_expected)
   assert_equal([], found_but_not_expected, "Found unexpected metrics: #{format_metric_spec_list(found_but_not_expected)}")
 end
 
+alias :refute_metrics_recorded :assert_metrics_not_recorded
+
 def assert_no_metrics_match(regex)
   matching_metrics = []
   NewRelic::Agent.instance.stats_engine.metrics.each do |metric|
@@ -229,6 +231,8 @@ def assert_no_metrics_match(regex)
   )
 end
 
+alias :refute_metrics_match :assert_no_metrics_match
+
 def format_metric_spec_list(specs)
   spec_strings = specs.map do |spec|
     "#{spec.name} (#{spec.scope.empty? ? '<unscoped>' : spec.scope})"
@@ -237,12 +241,12 @@ def format_metric_spec_list(specs)
 end
 
 def assert_truthy(expected, msg = nil)
-  msg = "Expected #{expected.inspect} to be truthy"
+  msg ||= "Expected #{expected.inspect} to be truthy"
   assert !!expected, msg
 end
 
 def assert_falsy(expected, msg = nil)
-  msg = "Expected #{expected.inspect} to be falsy"
+  msg ||= "Expected #{expected.inspect} to be falsy"
   assert !expected, msg
 end
 
@@ -274,20 +278,19 @@ end
 # With a transaction name plus category:
 #   in_transaction('foobar', :category => :controller) { ... }
 #
-def in_transaction(*args)
-  opts = (args.last && args.last.is_a?(Hash)) ? args.pop : {}
-  opts[:transaction_name] = args.first || 'dummy'
+def in_transaction(*args, &blk)
+  opts     = (args.last && args.last.is_a?(Hash)) ? args.pop : {}
   category = (opts && opts.delete(:category)) || :other
+
+  # At least one test passes `:transaction_name => nil`, so handle it gently
+  name = opts.key?(:transaction_name) ? opts.delete(:transaction_name) :
+                                        args.first || 'dummy'
+
   state = NewRelic::Agent::TransactionState.tl_get
 
-  NewRelic::Agent::Transaction.start(state, category, opts)
-  val = nil
-  begin
-    val = yield state.current_transaction
-  ensure
-    NewRelic::Agent::Transaction.stop(state)
+  NewRelic::Agent::Transaction.wrap(state, name, category, opts) do
+    yield state.current_transaction
   end
-  val
 end
 
 def stub_transaction_guid(guid)
@@ -416,8 +419,17 @@ end
 
 
 def freeze_time(now=Time.now)
-  Time.stubs(:now).returns(now)
-  now
+  if block_given?
+    begin
+      Time.stubs(:now).returns(now)
+      yield now
+    ensure
+      Time.unstub(:now)
+    end
+  else
+    Time.stubs(:now).returns(now)
+    now
+  end
 end
 
 def advance_time(seconds)

data/test/multiverse/lib/multiverse/suite.rb

@@ -163,7 +163,7 @@ module Multiverse
       bundler_out = exclusive_bundle
       puts bundler_out if verbose? || $? != 0
       raise "bundle command failed with (#{$?})" unless $? == 0
-      cache_gemfile_lock(env_index)
+      cache_gemfile_lock(env_index) if use_cache?
     end
 
     def generate_gemfile(gemfile_text, env_index, local = true)
@@ -199,10 +199,6 @@ module Multiverse
       return unless is_rbx?
 
       f.puts "gem 'rubysl', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl./
-      # Compilation issues with rubysl-openssl 2.2.1, lock at 2.1.0 for now.
-      # https://github.com/rubysl/rubysl-openssl/issues/11
-      f.puts "gem 'rubysl-openssl', '2.1.0', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .rubysl-openssl./
-
       f.puts "gem 'json', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .json./
       f.puts "gem 'racc', :platforms => [:rbx]" unless gemfile_text =~ /^\s*gem .racc./
     end

data/test/multiverse/suites/activemerchant/Envfile

@@ -6,6 +6,7 @@ gemfile <<-RB
     # Very special versioning to keep us running on 1.8.7 versions of Ruby
     gem 'activesupport', '~>2.3.14', :require => 'active_support'
     gem 'nokogiri', '~>1.4.7'
+    gem 'i18n', '~>0.6.11'
   else
     gem 'activesupport', '~>4.0.4'
     gem 'nokogiri', '~>1.6.1'
@@ -17,12 +18,14 @@ RB
 
 gemfile <<-RB
   gem 'activemerchant', '~>1.25.0'
+  gem 'active_utils', '2.2.3'
   gem 'rack'
 
   if RUBY_VERSION <= '1.9.2'
     # Very special versioning to keep us running on 1.8.7 versions of Ruby
     gem 'activesupport', '~>2.3.14', :require => 'active_support'
     gem 'nokogiri', '~>1.4.7'
+    gem 'i18n', '~>0.6.11'
   else
     gem 'activesupport', '~>4.0.4'
     gem 'nokogiri', '~>1.5.11'
@@ -30,4 +33,4 @@ gemfile <<-RB
 
   # Need to load newrelic_rpm after ActiveMerchant Gateways are required
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
-RB
+RB

data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb

@@ -9,11 +9,6 @@ require 'multiverse_helpers'
 require 'new_relic/rack/agent_hooks'
 
 class CrossApplicationTracingTest < Minitest::Test
-
-  # Important because the hooks are global that we only wire one AgentHooks up
-  @@app = TestingApp.new
-  @@wrapper_app = NewRelic::Rack::AgentHooks.new(@@app)
-
   include MultiverseHelpers
   setup_and_teardown_agent(:cross_process_id => "boo",
                            :encoding_key => "\0",
@@ -25,15 +20,10 @@ class CrossApplicationTracingTest < Minitest::Test
                                     "ignore"           => true}]})
   end
 
-  def after_setup
-    @@app.reset_headers
-    @@app.response = "<html><head><title>W00t!</title></head><body><p>Hello World</p></body></html>"
-  end
-
   include Rack::Test::Methods
 
   def app
-    @@wrapper_app
+    Rack::Builder.app { run TestingApp.new }
   end
 
   def test_cross_app_doesnt_modify_without_header
@@ -58,7 +48,7 @@ class CrossApplicationTracingTest < Minitest::Test
   end
 
   load_cross_agent_test("cat_map").each do |test_case|
-    # We only can do test cases here that don't involve outgoing calls 
+    # We only can do test cases here that don't involve outgoing calls
     if !test_case["outboundRequests"]
       if test_case['inboundPayload']
         request_headers = {

data/test/multiverse/suites/agent_only/logging_test.rb

@@ -140,7 +140,7 @@ class LoggingTest < Minitest::Test
   def test_logs_forking_workers
     running_agent_writes_to_log(
       { :dispatcher => :passenger },
-      "Connecting workers after forking.")
+      "Deferring startup of agent reporting thread")
   end
 
   # Helpers

data/test/multiverse/suites/agent_only/set_transaction_name_test.rb

@@ -16,11 +16,13 @@ class SetTransactionNameTest < Minitest::Test
 
   class TestTransactor
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
     def parent_txn(child_category=nil)
       NewRelic::Agent.set_transaction_name('TestTransactor/parent')
       yield if block_given?
       child_txn(child_category)
     end
+
     add_transaction_tracer :parent_txn
 
     def child_txn(category)
@@ -28,9 +30,11 @@ class SetTransactionNameTest < Minitest::Test
       opts[:category] = category if category
       NewRelic::Agent.set_transaction_name('TestTransactor/child', opts)
     end
+
     add_transaction_tracer :child_txn
 
     newrelic_ignore :only => :ignored_txn
+
     def ignored_txn
       NewRelic::Agent.set_transaction_name('Ignore/me')
     end

data/test/multiverse/suites/agent_only/synthetics_test.rb

@@ -8,20 +8,13 @@ require 'new_relic/rack/agent_hooks'
 require './testing_app'
 
 class SyntheticsTest < Minitest::Test
-  @app = TestingApp.new
-  @wrapper_app = NewRelic::Rack::AgentHooks.new(@app)
-
-  def self.wrapper_app
-    @wrapper_app
-  end
-
   include MultiverseHelpers
   include Rack::Test::Methods
 
   setup_and_teardown_agent
 
   def app
-    self.class.wrapper_app
+    Rack::Builder.app { run TestingApp.new }
   end
 
   def last_sent_analytics_event