newrelic_rpm 3.12.1.298 → 3.13.0.299

data/lib/new_relic/agent/transaction_state.rb

@@ -37,6 +37,7 @@ module NewRelic
         @untraced = []
         @traced_method_stack = TracedMethodStack.new
         @current_transaction = nil
+        @record_tt = nil
       end
 
       # This starts the timer for the transaction.

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

@@ -41,16 +41,26 @@ module NewRelic
           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')
+          if has_metric_totals?
+            # Rubinius < 2.5.8 metric names
+            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
+          else
+            # Rubinius >= 2.5.8 metric names and no total metrics
+            snap.heap_live = metric(:'memory.large.objects') +
+              metric(:'memory.young.objects') +
+              metric(:'memory.immix.objects')
 
-          snap.method_cache_invalidations = metric(:'vm.inline_cache.resets') + 0
+            snap.method_cache_invalidations = metric(:'machine.inline_cache.resets') + 0
+          end
         end
 
         def gather_stats_from_gc_stat(snap)
@@ -81,15 +91,13 @@ module NewRelic
           Rubinius::Metrics.data[key]
         end
 
-        SUPPORTED_KEYS_GC_RBX_METRICS = [
-          :gc_runs,
-          :heap_live,
-          :major_gc_count,
-          :minor_gc_count,
-          :method_cache_invalidations,
-          :thread_count,
-          :total_allocated_object
-        ].freeze
+        def has_metric?(key)
+          Rubinius::Metrics.data.keys.include? key
+        end
+
+        def has_metric_totals?
+          has_metric? :'memory.large.objects.total'
+        end
 
         def supports?(key)
           if has_metrics?
@@ -101,7 +109,7 @@ module NewRelic
             when :heap_live
               true
             when :total_allocated_object
-              true
+              has_metric_totals?
             when :method_cache_invalidations
               true
             when :gc_runs

data/lib/new_relic/language_support.rb

@@ -141,4 +141,11 @@ module NewRelic::LanguageSupport
   rescue NotImplementedError
     false
   end
+
+  def bundled_gem?(gem_name)
+    defined?(Bundler) && Bundler.rubygems.all_specs.map(&:name).include?(gem_name)
+  rescue => e
+    ::NewRelic::Agent.logger.info("Could not determine if third party #{gem_name} gem is installed", e)
+    false
+  end
 end

data/lib/new_relic/version.rb

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

data/lib/tasks/newrelic.rb

@@ -0,0 +1,9 @@
+# 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.
+#
+# If you are looking to instrument rake tasks in a Rails environment, but the
+# task doesn't depend on :environment, this task may be included to ensure that
+# the agent will load.
+
+NewRelic::Agent.manual_start(:sync_startup => false)

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", "Jonan Scheffler", "Matthew Wear", "Ben Weintraub" ]
+  s.authors = [ "Tim Krajcar", "Matthew Wear", "Katherine Wu" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic', 'MIT', 'Ruby']
   s.description = <<-EOS

data/test/multiverse/README.md

@@ -4,7 +4,7 @@
 
 Multiverse was created to solve a specific problem experienced by the Agent
 team.  Not only does the New Relic Agent run in a wide variety of environments,
-but its expected behavior *changes* based on the environment.  Instrumenation is
+but its expected behavior *changes* based on the environment.  Instrumentation is
 toggled on and off based on the presence of certain libraries, and some of these
 libraries are incompatible with each other.  Effective testing requires us to
 specify different environments for different tests; Multiverse aims to make this

data/test/multiverse/lib/multiverse/runner.rb

@@ -85,8 +85,8 @@ module Multiverse
       "agent"         => ["agent_only", "bare", "config_file_loading",
                           "deferred_instrumentation", "high_security"],
       "api"           => ["grape"],
-      "background"    => ["delayed_job", "resque", "sidekiq"],
-      "database"      => ["datamapper", "mongo", "sequel"],
+      "background"    => ["delayed_job", "rake", "resque", "sidekiq"],
+      "database"      => ["datamapper", "mongo", "redis", "sequel"],
       "httpclients"   => ["curb", "excon", "httpclient", "typhoeus", "net_http"],
       "rails"         => ["active_record", "rails"],
       "serialization" => ["json", "marshalling", "yajl"],

data/test/multiverse/suites/active_record/active_record_test.rb

@@ -405,12 +405,12 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     node = find_node_with_name(sample, metric)
     assert_equal(metric, node.metric_name)
 
-    sql = node.params[:sql]
-    assert_match(/^SELECT /, sql)
+    statement = node.params[:sql]
+    assert_match(/^SELECT /, statement.sql)
 
-    assert_equal(adapter.to_s, sql.adapter)
-    refute_nil(sql.config)
-    refute_nil(sql.explainer)
+    assert_equal(adapter.to_s, statement.adapter)
+    refute_nil(statement.config)
+    refute_nil(statement.explainer)
   end
 
   def test_gathers_explain_plans
@@ -423,7 +423,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
       metric = "Datastore/statement/#{current_product}/Order/find"
       sql_node = find_node_with_name(sample, metric)
 
-      assert_match(/^SELECT /, sql_node.params[:sql])
+      assert_match(/^SELECT /, sql_node.params[:sql].sql)
 
       sample.prepare_to_send!
       explanations = sql_node.params[:explain_plan]

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

@@ -77,6 +77,17 @@ class AgentAttributesTest < Minitest::Test
     refute_browser_monitoring_has_custom_attributes('foo')
   end
 
+  def test_falses_included
+    run_transaction do
+      NewRelic::Agent.add_custom_attributes(:foo => false)
+    end
+
+    assert_transaction_tracer_has_custom_attributes('foo', false)
+    assert_transaction_event_has_custom_attributes('foo', false)
+    assert_error_collector_has_custom_attributes('foo', false)
+    assert_browser_monitoring_has_custom_attributes('foo', false)
+  end
+
   def test_custom_attributes_excluded
     config = {
       :'transaction_tracer.attributes.enabled' => false,

data/test/multiverse/suites/agent_only/script/warnings.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# 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 'bundler/setup'
+require 'newrelic_rpm'
+
+NewRelic::Agent::Transaction.wrap(NewRelic::Agent::TransactionState.tl_get, 'ponies', :controller) do
+end
+
+NewRelic::Agent.notice_error 'oops'
+
+NewRelic::Agent.instance.send(:transmit_data)
+
+puts NewRelic::VERSION::STRING

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

@@ -8,6 +8,10 @@ require 'open3'
 class StartUpTest < Minitest::Test
   GIT_NOISE = "fatal: Not a git repository (or any of the parent directories): .git\n"
 
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
   def test_should_not_print_to_stdout_when_logging_available
     ruby = 'require "newrelic_rpm"; NewRelic::Agent.manual_start; NewRelic::Agent.shutdown'
     cmd = "bundle exec ruby -e '#{ruby}'"
@@ -56,11 +60,15 @@ class StartUpTest < Minitest::Test
   # going forward from Ruby 2.1.
   if RUBY_VERSION >= "2.1"
     def test_no_warnings
-      output = `bundle exec ruby -w -r bundler/setup -r newrelic_rpm -e 'puts NewRelic::VERSION::STRING' 2>&1`
-      output.gsub!(GIT_NOISE, "")
-      output.chomp!
+      with_environment('NEW_RELIC_TRANSACTION_TRACER_TRANSACTION_THRESHOLD' => '-10',
+                       'NEW_RELIC_PORT' => $collector.port.to_s) do
+
+        output = `bundle exec ruby -w script/warnings.rb 2>&1`
+        output.gsub!(GIT_NOISE, "")
+        output.chomp!
 
-      assert_equal NewRelic::VERSION::STRING, output
+        assert_equal NewRelic::VERSION::STRING, output
+      end
     end
   end
 

data/test/multiverse/suites/rake/Envfile

@@ -0,0 +1,37 @@
+gemfile <<-RB
+  gem 'rack'
+  gem 'rake', '~> 10.4'
+RB
+
+# No single Rails version works everywhere, so split it up
+if RUBY_VERSION >= "1.9.3"
+gemfile <<-RB
+  gem 'rack'
+  gem 'rake', '~> 10.4'
+  gem 'rails', '~> 4.2.1'
+  gem 'minitest', '5.2.3'
+RB
+else
+gemfile <<-RB
+  gem 'rack'
+  gem 'rake', '~> 10.4'
+  gem 'rails', '~> 3.2.21'
+  gem 'i18n', '~>0.6.11'
+RB
+end
+
+gemfile <<-RB
+  gem 'rack'
+  gem 'rake', '10.0.0' # Oldest supported version
+RB
+
+gemfile <<-RB
+  gem 'rack'
+  gem 'rake', '0.9.6' # Newest unsupported version
+RB
+
+gemfile <<-RB
+  gem 'rack'
+  gem 'rake', '~> 10.4'
+  gem 'newrelic-rake' # Can't coexist with third-party instrumentation
+RB

data/test/multiverse/suites/rake/Rakefile

@@ -0,0 +1,54 @@
+Bundler.require
+require "tasks/newrelic"
+
+task :default => [:before, :during, :after] do
+  puts "default"
+end
+
+task :before do
+  puts "before"
+end
+
+task :during do
+  puts "during"
+end
+
+task :after do
+  puts "after"
+end
+
+task :untraced do
+  puts "untraced"
+end
+
+task :argument, [:who, :where] => [] do
+  puts "argument"
+end
+
+task :boom do
+  raise "a legitimate issue with the proposal."
+end
+
+task :tree => [:branch1, :branch2]
+task :branch1 => [:branch1a, :branch1b]
+task :branch2 => [:branch2a, :branch2b]
+task :branch1a
+task :branch1b
+task :branch2a
+task :branch2b
+
+namespace :named do
+  task :all => [:'named:before', :'named:during', :'named:after']
+
+  task :before do
+    puts "named:before"
+  end
+
+  task :during do
+    puts "named:during"
+  end
+
+  task :after do
+    puts "named:after"
+  end
+end

data/test/multiverse/suites/rake/config/newrelic.yml

@@ -0,0 +1,18 @@
+---
+development:
+  attributes:
+    include:
+      - "*"
+  rake:
+    tasks:
+      - "default"
+  ssl: false
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  port: <%= $collector ||= nil; $collector && $collector.port %>
+  transaction_tracer:
+    transaction_threshold: -10
+    enabled: true

data/test/multiverse/suites/rake/multitask_test.rb

@@ -0,0 +1,40 @@
+# 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__, '..', 'rake_test_helper'))
+
+if ::NewRelic::Agent::Instrumentation::RakeInstrumentation.should_install?
+class MultiTaskTest < Minitest::Test
+  include MultiverseHelpers
+  include RakeTestHelper
+
+  setup_and_teardown_agent
+
+  def test_generate_scoped_metrics_for_children_if_always_multitask_set
+    with_tasks_traced("named:all") do
+      run_rake("named:all --multitask")
+
+      assert_metric_names_posted "OtherTransaction/Rake/invoke/named:all",
+                                 "OtherTransaction/Rake/all",
+                                 "OtherTransaction/all",
+                                 "Rake/execute/multitask"
+
+      refute_metric_names_posted "Rake/execute/named:before",
+                                 "Rake/execute/named:during",
+                                 "Rake/execute/named:after"
+    end
+  end
+
+  def test_generate_transaction_trace_with_placeholder_node
+    with_tasks_traced("named:all") do
+      run_rake("named:all --multitask")
+
+      expected = [{},
+                   [{},
+                     [{"statement"=>"Couldn't trace concurrent prereq tasks: named:before, named:during, named:after"}]]]
+      assert_equal expected, single_transaction_trace_posted.tree.node_params
+    end
+  end
+end
+end

data/test/multiverse/suites/rake/rake_test.rb

@@ -0,0 +1,209 @@
+# 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__, '..', 'rake_test_helper'))
+
+if ::NewRelic::Agent::Instrumentation::RakeInstrumentation.should_install? &&
+class RakeTest < Minitest::Test
+  include MultiverseHelpers
+  include RakeTestHelper
+
+  setup_and_teardown_agent
+
+  def test_disabling_rake_instrumentation
+    with_environment("NEW_RELIC_DISABLE_RAKE" => "true") do
+      run_rake
+    end
+
+    refute_any_rake_metrics
+  end
+
+  def test_doesnt_trace_by_default
+    run_rake("untraced")
+    refute_any_rake_metrics
+  end
+
+  def test_doesnt_trace_with_an_empty_list
+    with_tasks_traced("") do
+      run_rake
+      refute_any_rake_metrics
+    end
+  end
+
+  def test_timeout_on_connect
+    $collector.stub_wait('connect', 5)
+
+    with_environment("NEW_RELIC_RAKE_CONNECT_TIMEOUT" => "0",
+                     "NEW_RELIC_LOG" => "stdout") do
+      run_rake
+    end
+
+    refute_any_rake_metrics
+    assert_includes @output, "ERROR : NewRelic::Agent::Agent::InstanceMethods::Connect::WaitOnConnectTimeout: Agent was unable to connect"
+  end
+
+  def test_records_transaction_metrics
+    run_rake
+
+    assert_metric_names_posted "OtherTransaction/Rake/invoke/default",
+                               "OtherTransaction/Rake/all",
+                               "OtherTransaction/all",
+                               "Rake/execute/before",
+                               "Rake/execute/during",
+                               "Rake/execute/after"
+  end
+
+  def test_records_transaction_trace
+    run_rake
+
+    trace = single_transaction_trace_posted
+    assert_equal "OtherTransaction/Rake/invoke/default", trace.metric_name
+
+    expected = ["ROOT",
+                 ["OtherTransaction/Rake/invoke/default",
+                   ["Rake/execute/before"],
+                   ["Rake/execute/during"],
+                   ["Rake/execute/after"]]]
+
+    assert_equal expected, trace.tree.nodes
+  end
+
+  def test_records_transaction_events
+    run_rake
+
+    event = single_event_posted[0]
+    assert_equal "OtherTransaction/Rake/invoke/default", event["name"]
+  end
+
+  def test_records_namespaced_tasks
+    with_tasks_traced("named:all") do
+      run_rake("named:all")
+
+      assert_metric_names_posted "OtherTransaction/Rake/invoke/named:all",
+                                 "OtherTransaction/Rake/all",
+                                 "OtherTransaction/all",
+                                 "Rake/execute/named:before",
+                                 "Rake/execute/named:during",
+                                 "Rake/execute/named:after"
+    end
+  end
+
+  def test_matches_tasks_by_regex
+    with_tasks_traced(".*before") do
+      run_rake("before named:before during")
+
+      assert_metric_names_posted "OtherTransaction/Rake/invoke/before",
+                                 "OtherTransaction/Rake/invoke/named:before"
+
+      refute_metric_names_posted "OtherTransaction/Rake/invoke/during"
+    end
+  end
+
+  def test_records_tree_of_prereqs
+    with_tasks_traced("tree") do
+      run_rake("tree")
+
+      assert_metric_names_posted "OtherTransaction/Rake/invoke/tree",
+                                 "OtherTransaction/Rake/all",
+                                 "OtherTransaction/all",
+                                 "Rake/execute/branch1",
+                                 "Rake/execute/branch1a",
+                                 "Rake/execute/branch1b",
+                                 "Rake/execute/branch2",
+                                 "Rake/execute/branch2a",
+                                 "Rake/execute/branch2b"
+    end
+  end
+
+  def test_traced_task_as_prereq_doesnt_get_transaction
+    with_tasks_traced("default", "before") do
+      run_rake
+
+      assert_metric_names_posted "OtherTransaction/Rake/invoke/default",
+                                 "OtherTransaction/Rake/all",
+                                 "OtherTransaction/all",
+                                 "Rake/execute/before",
+                                 "Rake/execute/during",
+                                 "Rake/execute/after"
+
+      refute_metric_names_posted "OtherTransaction/Rake/invoke/before"
+    end
+  end
+
+  def test_error_during_task
+    with_tasks_traced("boom") do
+      run_rake("boom", true)
+
+      expected = "OtherTransaction/Rake/invoke/boom"
+      assert_equal expected, single_error_posted.path
+    end
+  end
+
+  def test_captures_task_arguments
+    with_tasks_traced("argument") do
+      run_rake("argument[someone,somewhere,vigorously]")
+
+      attributes = single_transaction_trace_posted.agent_attributes
+      assert_equal "someone",    attributes["job.rake.args.who"]
+      assert_equal "somewhere",  attributes["job.rake.args.where"]
+      assert_equal "vigorously", attributes["job.rake.args.2"]
+    end
+  end
+
+  def test_captures_task_arguments_with_too_few
+    with_tasks_traced("argument") do
+      run_rake("argument[someone]")
+
+      attributes = single_transaction_trace_posted.agent_attributes
+      assert_equal "someone", attributes["job.rake.args.who"]
+
+      refute_includes attributes, "job.rake.args.where"
+      refute_includes attributes, "job.rake.args.2"
+    end
+  end
+
+  def test_doesnt_capture_task_arguments_if_disabled_by_agent_attributes
+    with_tasks_traced("argument") do
+      without_attributes do
+        run_rake("argument[someone,somewhere,vigorously]")
+
+        attributes = single_transaction_trace_posted.agent_attributes
+        refute_includes attributes, "job.rake.args.who"
+        refute_includes attributes, "job.rake.args.where"
+        refute_includes attributes, "job.rake.args.2"
+      end
+    end
+  end
+
+  def test_doesnt_capture_completely_empty_args
+    with_tasks_traced("default") do
+      run_rake("default")
+
+      attributes = single_transaction_trace_posted.agent_attributes
+      refute attributes.keys.any? { |key| key.start_with?("job.rake.args") }
+    end
+  end
+
+  def test_captures_command_line
+    with_tasks_traced("default", "argument") do
+      run_rake("argument[someone] default")
+
+      attributes = single_transaction_trace_posted.agent_attributes
+      assert_includes attributes["job.rake.command"], "argument[someone]"
+      assert_includes attributes["job.rake.command"], "default"
+    end
+  end
+
+  def test_doesnt_capture_command_line_if_disabled_by_agent_attributes
+    with_tasks_traced("default", "argument") do
+      without_attributes do
+        run_rake("argument[someone] default")
+
+        attributes = single_transaction_trace_posted.agent_attributes
+        refute_includes attributes, "job.rake.command"
+      end
+    end
+  end
+end
+end