newrelic_rpm 4.1.0.333 → 4.2.0.334

data/test/multiverse/suites/rails/transaction_ignoring_test.rb

@@ -1,41 +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.
-
-require './app'
-require 'transaction_ignoring_test_cases'
-
-class TransactionIgnorerController < ApplicationController
-  def run_transaction
-    state = NewRelic::Agent::TransactionState.tl_get
-    NewRelic::Agent.set_transaction_name(params[:txn_name])
-    NewRelic::Agent.notice_error(params[:error_msg]) if params[:error_msg]
-    NewRelic::Agent.instance.sql_sampler.notice_sql("select * from test",
-                                 "Database/test/select",
-                                 nil, 1.5, state) if params[:slow_sql]
-    render :text => 'some stuff'
-  end
-
-
-end
-
-class TransactionIgnoringTest < RailsMultiverseTest
-
-  include MultiverseHelpers
-  include TransactionIgnoringTestCases
-
-  def trigger_transaction(txn_name)
-    get '/transaction_ignorer/run_transaction', :txn_name  => txn_name
-  end
-
-  def trigger_transaction_with_error(txn_name, error_msg)
-    get '/transaction_ignorer/run_transaction', :txn_name  => txn_name,
-                                                :error_msg => error_msg
-  end
-
-  def trigger_transaction_with_slow_sql(txn_name)
-    get '/transaction_ignorer/run_transaction', :txn_name  => txn_name,
-                                                :slow_sql  => 'true'
-  end
-
-end

data/test/multiverse/suites/rails/view_instrumentation_test.rb

@@ -1,254 +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.
-
-require './app'
-require 'haml'
-
-ActionController::Base.view_paths = ['app/views']
-
-class ViewsController < ApplicationController
-  def template_render_with_3_partial_renders
-    render 'index'
-  end
-
-  def render_with_delays
-    freeze_time
-    @delay = 1
-    render 'index'
-  end
-
-  def deep_partial_render
-    render 'deep_partial'
-  end
-
-  def text_render
-    render :text => "Yay"
-  end
-
-  def json_render
-    render :json => {"a" => "b"}
-  end
-
-  def xml_render
-    render :xml => {"a" => "b"}
-  end
-
-  def js_render
-    render :js => 'alert("this is js");'
-  end
-
-  def file_render
-    # The choice of filename is significant here: we want a dot in the filename
-    # in order to expose an issue on Rails 2.
-    file = File.expand_path(File.join(File.dirname(__FILE__), "dummy.txt"))
-    render :file => file, :content_type => 'text/plain', :layout => false
-  end
-
-  def nothing_render
-    render :nothing => true
-  end
-
-  def inline_render
-    render :inline => "<% Time.now %><p><%= Time.now %></p>"
-  end
-
-  def haml_render
-    render 'haml_view'
-  end
-
-  def no_template
-    render []
-  end
-
-  def collection_render
-    render((1..3).map{|x| Foo.new })
-  end
-
-  # proc rendering isn't available in rails 3 but you can do nonsense like this
-  # and assign an enumerable object to the response body.
-  def proc_render
-    streamer = Class.new do
-      def each
-        10_000.times do |i|
-          yield "This is line #{i}\n"
-        end
-      end
-    end
-    self.response_body = streamer.new
-  end
-
-  def raise_render
-    raise "this is an uncaught RuntimeError"
-  end
-end
-
-class ViewInstrumentationTest < RailsMultiverseTest
-  include MultiverseHelpers
-
-  setup_and_teardown_agent do
-    # ActiveSupport testing keeps blowing away my subscribers on
-    # teardown for some reason.  Have to keep putting it back.
-    if Rails::VERSION::MAJOR.to_i == 4
-      NewRelic::Agent::Instrumentation::ActionViewSubscriber \
-        .subscribe(/render_.+\.action_view$/)
-      NewRelic::Agent::Instrumentation::ActionControllerSubscriber \
-        .subscribe(/^process_action.action_controller$/)
-    end
-  end
-
-  (ViewsController.action_methods - ['raise_render']).each do |method|
-
-    # proc rendering doesn't work on Rails 2
-    next if method == 'proc_render' && Rails::VERSION::MAJOR <= 2
-
-    define_method("test_sanity_#{method}") do
-      get "/views/#{method}"
-      assert_equal 200, status
-    end
-
-    def test_should_allow_uncaught_exception_to_propagate
-      get "/views/raise_render"
-      assert_equal 500, status
-    end
-
-    def test_should_count_all_the_template_and_partial_nodes
-      get '/views/template_render_with_3_partial_renders'
-      sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-      nodes = find_all_nodes_with_name_matching(sample, ['^Nested/Controller/views', '^View'])
-      nodes_list = "Found these nodes:\n  #{nodes.map(&:metric_name).join("\n  ")}"
-
-      if Rails::VERSION::MAJOR <= 2
-        assert_equal 8, nodes.length, "Should be a node for the controller action, the template, and 3 partials with two nodes each (8). #{nodes_list}"
-      else
-        assert_equal 5, nodes.length, "Should be a node for the controller action, the template, and 3 partials (5). #{nodes_list}"
-      end
-    end
-
-    def test_should_have_3_nodes_with_the_correct_metric_name
-      get '/views/template_render_with_3_partial_renders'
-
-      sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-      partial_nodes = find_all_nodes_with_name_matching(sample, 'View/views/_a_partial.html.erb/Partial')
-
-      assert_equal 3, partial_nodes.size, "sanity check"
-      assert_equal ['View/views/_a_partial.html.erb/Partial'], partial_nodes.map(&:metric_name).uniq
-    end
-
-    # We don't capture text or inline template rendering on Rails 2
-    if Rails::VERSION::MAJOR >= 3
-      def test_should_create_a_metric_for_the_rendered_inline_template
-        get '/views/inline_render'
-
-        sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-        text_node = find_node_with_name(sample, 'View/inline template/Rendering')
-
-        assert text_node, "Failed to find a node named View/inline template/Rendering"
-        assert_metrics_recorded('View/inline template/Rendering')
-      end
-
-      # It doesn't seem worth it to get consistent behavior here.
-      if Rails::VERSION::MAJOR.to_i == 3 && Rails::VERSION::MINOR.to_i == 0
-        def test_should_not_instrument_rendering_of_text
-          get '/views/text_render'
-          sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-          refute find_node_with_name(sample, 'View/text template/Rendering')
-        end
-      else
-        def test_should_create_a_metric_for_the_rendered_text
-          get '/views/text_render'
-
-          sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-          text_node = find_node_with_name(sample, 'View/text template/Rendering')
-
-          assert text_node, "Failed to find a node named View/text template/Rendering"
-          assert_metrics_recorded('View/text template/Rendering')
-        end
-      end
-    end
-
-    def test_should_create_a_metric_for_the_rendered_haml_template
-      get '/views/haml_render'
-
-      sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-      text_node = find_node_with_name(sample, 'View/views/haml_view.html.haml/Rendering')
-
-      assert text_node, "Failed to find a node named View/views/haml_view.html.haml/Rendering"
-      assert_metrics_recorded('View/views/haml_view.html.haml/Rendering')
-    end
-
-    def test_should_create_a_proper_metric_when_the_template_is_unknown
-      get '/views/no_template'
-      sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-
-      # Different versions have significant difference in handling, but we're
-      # happy enough with what each of them does in the unknown case
-      if Rails::VERSION::MAJOR.to_i < 3 || (Rails::VERSION::MAJOR.to_i == 3 && Rails::VERSION::MINOR.to_i == 0)
-        refute find_node_with_name_matching(sample, /^View/)
-      elsif Rails::VERSION::MAJOR.to_i == 3
-        assert find_node_with_name(sample, 'View/collection/Partial')
-      else
-        assert find_node_with_name(sample, 'View/(unknown)/Partial')
-      end
-    end
-
-    def test_should_create_a_proper_metric_when_we_render_a_collection
-      get '/views/collection_render'
-      sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-      assert find_node_with_name(sample, "View/foos/_foo.html.haml/Partial")
-    end
-
-    [:js_render, :xml_render, :proc_render, :json_render ].each do |action|
-      next if action == :proc_render && Rails::VERSION::MAJOR <= 2
-      define_method("test_should_not_instrument_rendering_of_#{action}") do
-        get "/views/#{action}"
-        sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-        view_node = find_node_with_name_matching(sample, /^View\//)
-        refute view_node, "Should not instrument rendering of #{action}, found #{view_node}."
-      end
-    end
-
-    # The Rails 2.3 view instrumentation doesn't actually pass this test, but it
-    # hasn't been a problem thus far, so we're letting it slide.
-    if Rails::VERSION::MAJOR >= 3
-      def test_should_create_a_metric_for_rendered_file_that_does_not_include_the_filename_so_it_doesnt_metric_explode
-        get '/views/file_render'
-        sample = NewRelic::Agent.agent.transaction_sampler.last_sample
-        assert find_node_with_name(sample, 'View/file/Rendering')
-        refute find_node_with_name_matching(sample, 'dummy')
-      end
-    end
-
-    def test_exclusive_time_for_template_render_metrics_should_not_include_partial_rendering_time
-      get '/views/render_with_delays'
-
-      expected_stats_partial = {
-        :call_count           => 3,
-        :total_call_time      => 3.0,
-        :total_exclusive_time => 3.0
-      }
-
-      expected_stats_template = {
-        :call_count           => 1,
-        :total_call_time      => 4.0,
-        :total_exclusive_time => 1.0  # top-level template takes 1s itself
-      }
-
-      scope = 'Controller/views/render_with_delays'
-      template_metric = 'View/views/index.html.erb/Rendering'
-
-      if Rails::VERSION::MAJOR <= 2
-        partial_metric  = 'View/views/_a_partial.html.erb/Rendering'
-      else
-        partial_metric  = 'View/views/_a_partial.html.erb/Partial'
-      end
-
-      assert_metrics_recorded(
-         partial_metric           => expected_stats_partial,
-         template_metric          => expected_stats_template,
-         [partial_metric, scope]  => expected_stats_partial,
-         [template_metric, scope] => expected_stats_template
-      )
-    end
-  end
-end

data/test/multiverse/suites/rake/Envfile

@@ -1,43 +0,0 @@
-gemfile <<-RB
-  gem 'rack'
-  gem 'rake', '~> 12.0'
-RB
-
-gemfile <<-RB
-  gem 'rack'
-  gem 'rake', '~> 11.1'
-RB
-
-gemfile <<-RB
-  gem 'rack'
-  gem 'rake', '~> 10.4'
-RB
-
-# No single Rails version works everywhere, so split it up
-if RUBY_VERSION < '2.4.0'
-  gemfile <<-RB
-    gem 'rack'
-    gem 'rake', '~> 10.4'
-    gem 'rails', '~> 4.2.1'
-    gem 'minitest', '5.2.3'
-    gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
-  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', :require => false # Can't coexist with third-party instrumentation
-RB
-
-# vim: ft=ruby

data/test/multiverse/suites/rake/Rakefile

@@ -1,54 +0,0 @@
-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

@@ -1,17 +0,0 @@
----
-development:
-  attributes:
-    include:
-      - "*"
-  rake:
-    tasks:
-      - "default"
-  ssl: false
-  monitor_mode: true
-  license_key: bootstrap_newrelic_admin_license_key_000
-  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

@@ -1,40 +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.
-
-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