newrelic_rpm 4.1.0.333 → 4.2.0.334

data/test/multiverse/suites/deferred_instrumentation/Envfile

@@ -1,15 +0,0 @@
-gemfile <<-RB
-  gem 'sinatra', '~> 1.4.0', :require => false
-  gem 'rack-test', :require => 'rack/test'
-RB
-
-gemfile <<-RB
-  gem 'sinatra', '~> 1.3.0', :require => false
-  gem 'rack-test', :require => 'rack/test'
-RB
-
-gemfile <<-RB
-  gem 'sinatra', '~> 1.2.0', :require => false
-  gem 'rack-test', :require => 'rack/test'
-RB
-

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

@@ -1,19 +0,0 @@
----
-development:
-  error_collector:
-    enabled: true
-  apdex_t: 0.5
-  ssl: false
-  agent_enabled: true
-  monitor_mode: true
-  license_key: bootstrap_newrelic_admin_license_key_000
-  app_name: test
-  host: 127.0.0.1
-  api_host: 127.0.0.1
-  transaction_tracer:
-    record_sql: obfuscated
-    enabled: true
-    stack_trace_threshold: 0.5
-    transaction_threshold: 1.0
-  capture_params: false
-  disable_serialization: false

data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb

@@ -1,110 +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 'newrelic_rpm'
-require 'sinatra'
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sinatra', 'sinatra_test_cases'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
-
-class DeferredSinatraTestApp < Sinatra::Base
-  include NewRelic::TestHelpers::Exceptions
-
-  configure do
-    # display exceptions so we see what's going on
-    disable :show_exceptions
-
-    # create a condition (sintra's version of a before_filter) that returns the
-    # value that was passed into it.
-    set :my_condition do |boolean|
-      condition do
-        halt 404 unless boolean
-      end
-    end
-  end
-
-  get '/' do
-    "root path"
-  end
-
-  get '/user/login' do
-    "please log in"
-  end
-
-  # this action will always return 404 because of the condition.
-  get '/user/:id', :my_condition => false do |id|
-    "Welcome #{id}"
-  end
-
-  get '/raise' do
-    raise "Uh-oh"
-  end
-
-  # check that pass works properly
-  condition { pass { halt 418, "I'm a teapot." } }
-  get('/pass') { }
-
-  get '/pass' do
-    "I'm not a teapot."
-  end
-
-  error(NewRelic::TestHelpers::Exceptions::TestError) { halt 200, 'nothing happened' }
-  condition { raise NewRelic::TestHelpers::Exceptions::TestError }
-  get('/error') { }
-
-  condition do
-    raise "Boo" if $precondition_already_checked
-    $precondition_already_checked = true
-  end
-  get('/precondition') { 'precondition only happened once' }
-
-  get '/route/:name' do |name|
-    # usually this would be a db test or something
-    pass if name != 'match'
-    'first route'
-  end
-
-  get '/route/no_match' do
-    'second route'
-  end
-
-  before '/filtered' do
-    @filtered = true
-  end
-
-  get '/filtered' do
-    @filtered ? 'got filtered' : 'nope'
-  end
-
-  get(/\/regex.*/) do
-    "Yeah, regex's!"
-  end
-
-  post '/files' do
-    "file uploaded"
-  end
-end
-
-class DeferredSinatraTest < Minitest::Test
-  include SinatraTestCases
-
-  def app
-    Rack::Builder.new( DeferredSinatraTestApp ).to_app
-  end
-
-
-  def test_ignores_route_metrics
-    # Can't use 'newrelic_ignore' if newrelic was loaded before sinatra, as the
-    # instrumentation doesn't load until Rack is building the app to run it.
-  end
-
-
-  # (RUBY-1169)
-  def test_only_tries_deferred_detection_once
-    Rack::Builder.new( DeferredSinatraTestApp ).to_app
-    ::DependencyDetection.expects( :detect! ).never
-    Rack::Builder.new( DeferredSinatraTestApp ).to_app
-  end
-
-end

data/test/multiverse/suites/delayed_job/Envfile

@@ -1,101 +0,0 @@
-boilerplate_gems = <<-SQLITE
-  gem 'rack'
-  if RUBY_PLATFORM == 'java'
-    gem 'activerecord-jdbcsqlite3-adapter'
-  else
-    gem 'sqlite3'
-  end
-SQLITE
-
-# delayed_job_mongoid is currently unsupported, but check that we behave
-gemfile <<-RB
-  gem 'delayed_job', '~> 4.0.4'
-  gem 'delayed_job_mongoid', '~> 2.1.0'
-  gem 'i18n', '~> 0.6.11'
-  gem 'activesupport', '~> 3.2.22' if RUBY_VERSION == '2.4.0'
-  #{boilerplate_gems}
-RB
-
-if RUBY_VERSION < '2.4.0'
-  gemfile <<-RB
-    gem 'delayed_job', '~> 4.1.0'
-    gem 'delayed_job_active_record', '~> 4.1.0'
-    gem 'activerecord', '~> 3.2.19'
-    gem 'i18n', '~> 0.6.11'
-    #{boilerplate_gems}
-  RB
-end
-
-# delayed_job_active_record (and older baked into delayed_job) support
-if RUBY_VERSION < '2.4.0'
-  dj4_with_active_record = <<-DJ
-    gem 'delayed_job', '~> 4.0.4'
-    gem 'delayed_job_active_record', '~> 4.0.2'
-    #{boilerplate_gems}
-  DJ
-else
-  dj4_with_active_record = <<-DJ
-    gem 'delayed_job', '~> 4.0.4'
-
-    # 4.0.3 breaks 1.8.7 compatibility
-    gem 'delayed_job_active_record', '= 4.0.2'
-    #{boilerplate_gems}
-  DJ
-end
-
-dj3_with_active_record = <<-DJ
-  gem 'delayed_job', '~> 3.0.5'
-  gem 'delayed_job_active_record', '~> 0.4.4'
-  #{boilerplate_gems}
-DJ
-
-dj2_with_active_record3 = <<-DJ
-  gem 'delayed_job', '~> 2.1.4'
-  #{boilerplate_gems}
-DJ
-
-if RUBY_VERSION < '2.4.0'
-  gemfile <<-RB
-    gem 'activerecord', '~> 4.2.0'
-    gem 'i18n', '~> 0.7.0'
-    #{dj4_with_active_record}
-    gem 'minitest', '~> 5.2.3'
-  RB
-
-  gemfile <<-RB
-    gem 'activerecord', '~> 4.1.6'
-    gem 'i18n', '~> 0.6.11'
-    #{dj4_with_active_record}
-    gem 'minitest', '~> 5.2.3'
-  RB
-
-  gemfile <<-RB
-    gem 'activerecord', '~>4.0.10'
-    gem 'i18n', '~> 0.6.11'
-    #{dj4_with_active_record}
-  RB
-end
-
-if RUBY_VERSION < '2.3.0'
-  [dj4_with_active_record, dj3_with_active_record, dj2_with_active_record3].each do |dj|
-    gemfile <<-RB
-      gem 'activerecord', '~> 3.2.19'
-      gem 'i18n', '~> 0.6.11'
-      #{dj}
-    RB
-
-    gemfile <<-RB
-      gem 'activerecord', '~> 3.1.12'
-      gem 'i18n', '~> 0.6.11'
-      #{dj}
-    RB
-
-    gemfile <<-RB
-      gem 'activerecord', '~> 3.0.20'
-      gem 'i18n', '~> 0.5.4'
-      #{dj}
-    RB
-  end
-end
-
-# vim: ft=ruby

data/test/multiverse/suites/delayed_job/before_suite.rb

@@ -1,43 +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 'delayed_job'
-begin
-  require 'active_record'
-rescue LoadError
-  # Let it fail, might be working with another library
-end
-
-# Deprecated on some versions, required on others. Hurray!
-Delayed::Worker.guess_backend
-
-if Delayed::Worker.backend.to_s == "Delayed::Backend::ActiveRecord::Job"
-  $db_connection = ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",
-                                                           :database => ":memory:")
-
-  begin
-    require 'generators/delayed_job/templates/migration'
-  rescue MissingSourceFile
-    # Back on DJ v2 the generators aren't in the lib folder so we have to do some
-    # sneaky stuff to get them loaded. Still better than dup'ing them, though.
-    dj_dir = ($:).grep(/delayed_job-/).first
-    require "#{dj_dir}/../generators/delayed_job/templates/migration"
-  end
-
-  class CreateDelayedJobs
-    @connection = $db_connection
-  end
-
-  class CreatePelicans < ActiveRecord::Migration
-    @connection = $db_connection
-    def self.up
-      create_table :pelicans do |t|
-        t.string :name
-      end
-    end
-  end
-
-  CreateDelayedJobs.up
-  CreatePelicans.up
-end

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

@@ -1,17 +0,0 @@
----
-development:
-  error_collector:
-    enabled: true
-  apdex_t: 0.5
-  ssl: false
-  monitor_mode: true
-  license_key: bootstrap_newrelic_admin_license_key_000
-  app_name: test
-  host: 127.0.0.1
-  api_host: 127.0.0.1
-  transaction_trace:
-    record_sql: obfuscated
-    enabled: true
-    stack_trace_threshold: 0.5
-    transaction_threshold: 1.0
-  capture_params: false

data/test/multiverse/suites/delayed_job/delayed_job_instrumentation_test.rb

@@ -1,106 +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.
-
-if defined?(Delayed::Backend::ActiveRecord) && Delayed::Worker.respond_to?(:delay_jobs)
-  class DelayedJobInstrumentationTest < Minitest::Test
-    include MultiverseHelpers
-
-    class QuackJob
-      def initialize(index)
-        @index = index
-      end
-
-      def display_name
-        "Quack Job: #{@index}"
-      end
-
-      def perform
-        "Performing Quack Job #{@index} .."
-      end
-    end
-
-    class Pelican < ActiveRecord::Base
-      self.table_name = :pelicans
-
-      def quack
-        "quack..."
-      end
-
-      def quack_later
-        "...quack"
-      end
-
-      handle_asynchronously :quack_later
-    end
-
-    setup_and_teardown_agent
-
-    def after_setup
-      Delayed::Worker.delay_jobs = false
-      # We set Delayed::Worker.delay_jobs = false to run jobs inline for testing purposes, but
-      # we unfortunately hook the initialize method on Delayed::Worker
-      # to install our instrumentation.  Delayed::Workers are not initialized when running
-      # tests inline so we have to manually instantiate one to install our instrumentation.
-      # We also need to take care to only install the instrumentation once.
-      unless Delayed::Job.instance_methods.any? { |m|  m == :invoke_job_without_new_relic || m == "invoke_job_without_new_relic" }
-        Delayed::Worker.new
-      end
-    end
-
-    def after_teardown
-      Delayed::Worker.delay_jobs = true
-    end
-
-    # Delayed Job doesn't expose a version number, so we have to resort to checking Gem.loaded_specs.
-    # Additionally, earlier versions of Delayed Job do not call invoke_job when running jobs inline.
-    # We can only test methods using delay and handle_asynchronously on versions that run jobs via
-    # the invoke_job method.
-    def self.dj_invokes_job_inline?
-      Gem.loaded_specs["delayed_job"].version >= Gem::Version.new("3.0.0")
-    end
-
-    if dj_invokes_job_inline?
-      def test_delay_method
-        p = Pelican.create(:name => "Charlie")
-        p.delay.quack
-
-        assert_metrics_recorded [
-          'OtherTransaction/all',
-          'OtherTransaction/DelayedJob/all',
-          'OtherTransaction/DelayedJob/DelayedJobInstrumentationTest::Pelican#quack'
-        ]
-      end
-
-      def test_handle_asynchronously
-        p = Pelican.create(:name => "Charlieee")
-        p.quack_later
-
-        assert_metrics_recorded [
-          'OtherTransaction/all',
-          'OtherTransaction/DelayedJob/all',
-          'OtherTransaction/DelayedJob/DelayedJobInstrumentationTest::Pelican#quack_later_without_delay'
-        ]
-      end
-    end
-
-    def test_enqueue_standalone_job
-      job = QuackJob.new rand(100)
-      invoke_job(job)
-
-      assert_metrics_recorded [
-        'OtherTransaction/all',
-        'OtherTransaction/DelayedJob/all',
-        'OtherTransaction/DelayedJob/DelayedJobInstrumentationTest::QuackJob'
-      ]
-    end
-
-    # Note we use this method instead of Delayed::Job.enqueue because Delayed Job 2.1.4 does
-    # not call invoke_job when running jobs inline it instead calls perform directly.  This
-    # allows us to test the stand alone job case on all supported versions of Delayed Job.
-    def invoke_job(job)
-      job = Delayed::Job.new(:payload_object => job)
-      job.invoke_job
-    end
-  end
-end

data/test/multiverse/suites/delayed_job/delayed_job_sampler_test.rb

@@ -1,128 +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 'new_relic/delayed_job_injection'
-
-if NewRelic::Agent::Samplers::DelayedJobSampler.supported_backend?
-  class DelayedJobSamplerTest < Minitest::Test
-    include MultiverseHelpers
-
-    TestWorker = Struct.new(:name, :read_ahead)
-
-    setup_and_teardown_agent do
-      NewRelic::DelayedJobInjection.worker_name = "delayed"
-      @worker = TestWorker.new("delayed", 1)
-      @sampler = NewRelic::Agent::Samplers::DelayedJobSampler.new
-    end
-
-    def after_teardown
-      # This appears in the base delayed_job gem even after the adapter split
-      # so it appears to be safe to call across adapters
-      Delayed::Job.delete_all
-    end
-
-    class IWantToWait
-      def take_action
-      end
-    end
-
-    def test_cant_create_without_injection
-      NewRelic::DelayedJobInjection.worker_name = nil
-      assert_raises(NewRelic::Agent::Sampler::Unsupported) do
-        NewRelic::Agent::Samplers::DelayedJobSampler.new
-      end
-    end
-
-    def test_sampler_no_failures_or_locks
-      @sampler.poll
-
-      assert_metrics_recorded(
-        "Workers/DelayedJob/failed_jobs"      => { :total_call_time => 0 },
-        "Workers/DelayedJob/locked_jobs"      => { :total_call_time => 0 })
-    end
-
-    def test_sampler_sees_failures
-      job = IWantToWait.new.delay.take_action
-
-      return unless job.respond_to?(:fail!)
-      job.fail!
-
-      @sampler.poll
-
-      assert_metrics_recorded(
-        "Workers/DelayedJob/failed_jobs" => { :total_call_time => 1 })
-    end
-
-    def test_sampler_sees_locks
-      IWantToWait.new.delay.take_action
-      ::Delayed::Job.reserve(@worker)
-
-      @sampler.poll
-
-      assert_metrics_recorded(
-        "Workers/DelayedJob/locked_jobs" => { :total_call_time => 1 })
-    end
-
-    def test_sampler_queue_depth_with_job
-      IWantToWait.new.delay.take_action
-
-      @sampler.poll
-
-      assert_metrics_recorded(
-        "Workers/DelayedJob/queue_length/priority/0" => { :total_call_time => 1 },
-        "Workers/DelayedJob/queue_length/all"        => { :total_call_time => 1 })
-    end
-
-    def test_sampler_queue_depth_with_alternate_priority
-      IWantToWait.new.delay(:priority => 7).take_action
-
-      @sampler.poll
-
-      assert_metrics_recorded(
-        "Workers/DelayedJob/queue_length/priority/7" => { :total_call_time => 1 },
-        "Workers/DelayedJob/queue_length/all"        => { :total_call_time => 1 })
-    end
-
-    def test_sampler_queue_depth_with_default_queue
-      return unless Delayed::Job.instance_methods.include?(:queue)
-
-      IWantToWait.new.delay.take_action
-
-      @sampler.poll
-
-      assert_metrics_recorded(
-        "Workers/DelayedJob/queue_length/name/default" => { :total_call_time => 1 },
-        "Workers/DelayedJob/queue_length/all"          => { :total_call_time => 1 })
-    end
-
-    def test_sampler_queue_depth_with_alternate_queues
-      return unless Delayed::Job.instance_methods.include?(:queue)
-
-      IWantToWait.new.delay(:queue => "cue").take_action
-      IWantToWait.new.delay(:queue => "cute").take_action
-
-      @sampler.poll
-
-      assert_metrics_recorded(
-        "Workers/DelayedJob/queue_length/name/cue"   => { :total_call_time => 1 },
-        "Workers/DelayedJob/queue_length/name/cute"  => { :total_call_time => 1 },
-        "Workers/DelayedJob/queue_length/all"        => { :total_call_time => 2 })
-    end
-
-    def test_sampler_queue_depth_with_queues_and_priorities
-      return unless Delayed::Job.instance_methods.include?(:queue)
-
-      IWantToWait.new.delay(:priority => 1, :queue => "cue").take_action
-      IWantToWait.new.delay(:priority => 1, :queue => "cute").take_action
-
-      @sampler.poll
-
-      assert_metrics_recorded(
-        "Workers/DelayedJob/queue_length/name/cue"   => { :total_call_time => 1 },
-        "Workers/DelayedJob/queue_length/name/cute"  => { :total_call_time => 1 },
-        "Workers/DelayedJob/queue_length/priority/1" => { :total_call_time => 2 },
-        "Workers/DelayedJob/queue_length/all"        => { :total_call_time => 2 })
-    end
-  end
-end