newrelic_rpm 4.1.0.333 → 4.2.0.334

data/test/multiverse/suites/curb/Envfile

@@ -1,27 +0,0 @@
-suite_condition("Curb is not useful on JRuby") do
-  RUBY_PLATFORM != 'java'
-end
-
-gemfile <<-RB
-  gem 'curb', '~> 0.8.8'
-  gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
-
-  # We try translating URIs through Addressable if it's there, so test with it.
-  gem 'addressable', :require => 'addressable/uri'
-RB
-
-gemfile <<-RB
-  gem 'curb', '~> 0.8.8'
-  gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
-RB
-
-# Older curb's than 0.8.6 don't build against Ruby 2.2.0
-if RUBY_VERSION < "2.2.0"
-gemfile <<-RB
-  gem 'curb', '0.8.1'
-  gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
-RB
-end

data/test/multiverse/suites/curb/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_tracer:
-    record_sql: obfuscated
-    enabled: true
-    stack_trace_threshold: 0.5
-    transaction_threshold: 1.0
-  capture_params: false

data/test/multiverse/suites/curb/curb_test.rb

@@ -1,212 +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 'curb'
-
-require 'newrelic_rpm'
-require 'http_client_test_cases'
-require 'new_relic/agent/http_clients/curb_wrappers'
-
-class CurbTest < Minitest::Test
-
-  #
-  # Tests
-  #
-
-  include HttpClientTestCases
-
-
-  def test_shouldnt_clobber_existing_header_callback
-    headers = []
-    Curl::Easy.http_get( default_url ) do |handle|
-      handle.on_header do |header|
-        headers << header
-        header.length
-      end
-    end
-
-    assert !headers.empty?
-  end
-
-  def test_shouldnt_clobber_existing_completion_callback
-    completed = false
-    Curl::Easy.http_get( default_url ) do |handle|
-      handle.on_complete do
-        completed = true
-      end
-    end
-
-    assert completed, "completion block was never run"
-  end
-
-  def test_get_works_with_the_shortcut_api
-    # Override the mechanism for getting a response and run the test_get test
-    # again
-    @get_response_proc = Proc.new do |url|
-      Curl.get( url || default_url )
-    end
-    test_get
-  ensure
-    @get_response_proc = nil
-  end
-
-  def test_background_works_with_the_shortcut_api
-    # Override the mechanism for getting a response and run test_background again
-    @get_response_proc = Proc.new do |url|
-      Curl.get( url || default_url )
-    end
-    test_background
-  ensure
-    @get_response_proc = nil
-  end
-
-  def test_get_via_shortcut_api_preserves_header_str
-    rsp = Curl.get( default_url )
-    header_str = rsp.header_str
-
-    # Make sure that we got something that looks like a header string
-    assert_match(/^HTTP\/1\.1 200 OK\s+$/, header_str)
-    assert_match(/^Content-Length: \d+\s+$/, header_str)
-
-    # Make sure there are no lines that appear multiple times, which would
-    # happen if we installed callbacks repeatedly on one request.
-    header_lines = header_str.split
-    assert_equal(header_lines.uniq.size, header_lines.size,
-      "Found some header lines appearing multiple times in header_str:\n#{header_str}")
-  end
-
-  def test_get_via_multi_preserves_header_str
-    header_str = nil
-
-    Curl::Multi.get( [default_url] ) do |easy|
-      header_str = easy.header_str
-    end
-
-    assert_match(/^HTTP\/1\.1 200 OK\s+$/, header_str)
-    assert_match(/^Content-Length: \d+\s+$/, header_str)
-  end
-
-  def test_get_doesnt_destroy_ability_to_call_status
-    status_code = Curl.get( default_url ).status.to_i
-    assert_equal(200, status_code)
-  end
-
-
-  # Curl.head is broken in 0.8.4 (https://github.com/taf2/curb/pull/148), but if
-  # it ever gets fixed, then this test should be uncommented.
-
-  # def test_head_works_with_the_shortcut_api
-  #   # Override the mechanism for getting a response and run the test_get test
-  #   # again
-  #   def self.head_response
-  #     Curl.head( default_url )
-  #   end
-  #
-  #   test_head
-  # end
-
-  def test_doesnt_propagate_errors_in_instrumentation
-    NewRelic::Agent::CrossAppTracing.stubs(:cross_app_enabled?).raises("Booom")
-
-    res = Curl::Easy.http_get( default_url )
-
-    assert_kind_of Curl::Easy, res
-  end
-
-
-  def test_works_with_parallel_fetches
-    results = []
-    other_url = "http://localhost:#{$fake_server.port}/"
-
-    in_transaction("test") do
-      Curl::Multi.get( [default_url,other_url] ) do |easy|
-        results << easy.body_str
-      end
-
-      results.each do |res|
-        assert_match %r/<head>/i, res
-      end
-
-      last_node = find_last_transaction_node()
-      assert_equal "External/Multiple/Curb::Multi/perform", last_node.metric_name
-    end
-  end
-
-  def test_block_passed_to_multi_perform_should_be_called
-    successes = 0
-    num_requests = 2
-    perform_block_called = false
-
-    in_transaction("test") do
-      multi = Curl::Multi.new
-
-      num_requests.times do |i|
-        req = Curl::Easy.new(default_url) do |easy|
-          easy.on_success { |curl| successes += 1 }
-        end
-        multi.add(req)
-      end
-
-      multi.perform { perform_block_called = true }
-
-      assert_equal(num_requests, successes)
-      assert(perform_block_called, "Block passed to Curl::Multi.perform should have been called")
-      last_node = find_last_transaction_node()
-      assert_equal "External/Multiple/Curb::Multi/perform", last_node.metric_name
-    end
-  end
-
-  #
-  # Helper functions
-  #
-
-  def client_name
-    "Curb"
-  end
-
-  def get_response(url=nil, headers=nil)
-    if @get_response_proc
-      @get_response_proc.call(url)
-    else
-      easy = Curl::Easy.new( url || default_url )
-      easy.headers = headers unless headers.nil?
-      easy.http_get
-      easy
-    end
-  end
-
-  def head_response
-    Curl::Easy.http_head( default_url )
-  end
-
-  def post_response
-    Curl::Easy.http_post( default_url, '' )
-  end
-
-  def put_response
-    Curl::Easy.http_put( default_url, '' )
-  end
-
-  def delete_response
-    Curl::Easy.http_delete( default_url )
-  end
-
-  def body(res)
-    res.body_str
-  end
-
-  def request_instance
-    NewRelic::Agent::HTTPClients::CurbRequest.new(Curl::Easy.new)
-  end
-
-  def response_instance( headers={} )
-    res = NewRelic::Agent::HTTPClients::CurbResponse.new(Curl::Easy.new)
-    headers.each do |hdr, val|
-      res.append_header_data( "#{hdr}: #{val}")
-    end
-
-    return res
-  end
-
-end

data/test/multiverse/suites/datamapper/Envfile

@@ -1,36 +0,0 @@
-suite_condition("only test on < 2.4"){ RUBY_VERSION < '2.4.0' }
-
-adapter_gems = <<-RB
-  gem 'dm-sqlite-adapter'
-
-  # Pin this version as the adapter breaks with later ones
-  gem 'jdbc-sqlite3', '~> 3.7.2.1', :platforms => [:jruby]
-
-  # Needed for the fake collector
-  gem 'rack'
-RB
-
-gemfile <<-RB
-  gem 'datamapper', '~> 1.2.0', :require => 'data_mapper'
-  gem 'dm-ar-finders', '~> 1.2.0'
-  gem 'addressable', :require => 'addressable/uri'
-  #{adapter_gems}
-RB
-
-if RUBY_VERSION < '2.0.0'
-gemfile <<-RB
-  gem 'datamapper', '~> 1.1.0'
-  gem 'dm-ar-finders', '~> 1.1.0'
-  gem 'addressable', :require => 'addressable/uri'
-  #{adapter_gems}
-RB
-
-gemfile <<-RB
-  gem 'datamapper', '~> 1.0.2'
-  gem 'dm-ar-finders', '~> 1.0.2'
-  gem 'addressable', :require => 'addressable/uri'
-  #{adapter_gems}
-RB
-end
-
-# vim: ft=ruby

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

@@ -1,19 +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
-  port: <%= $collector && $collector.port %>
-  transaction_tracer:
-    record_sql: obfuscated
-    enabled: true
-    stack_trace_threshold: 0.5
-    transaction_threshold: 1.0
-  capture_params: false
-  log_level: debug

data/test/multiverse/suites/datamapper/datamapper_test.rb

@@ -1,429 +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.
-
-DataMapper::Logger.new("/dev/null", :debug)
-DataMapper.setup(:default, 'sqlite::memory:')
-class Post
-  include DataMapper::Resource
-  property :id,         Serial    # An auto-increment integer key
-  property :title,      String    # A varchar type string, for short strings
-  property :body,       Text      # A text block, for longer string data.
-end
-DataMapper.auto_migrate!
-DataMapper.finalize
-
-class DummyConnection
-  module DummyLogging
-    def log(*args); end
-  end
-
-  include DummyLogging
-  include NewRelic::Agent::Instrumentation::DataMapperInstrumentation
-end
-
-class DataMapperTest < Minitest::Test
-  include MultiverseHelpers
-
-  setup_and_teardown_agent
-
-  def test_create
-    # DM 1.0 generates a create method on inclusion of a module that internally
-    # calls the instance #save method, so that's all we see on that version.
-    expected_metric = DataMapper::VERSION < "1.1" ? :save : :create
-    assert_basic_metrics(expected_metric) do
-      in_transaction do
-        Post.create(:title => "Dummy post", :body => "whatever, man")
-      end
-    end
-  end
-
-  def test_create!
-    assert_basic_metrics(:create) do
-      in_transaction do
-        Post.create!(:title => "Dummy post", :body => "whatever, man")
-      end
-    end
-  end
-
-  def test_get
-    assert_against_record(:get) do |post|
-      in_transaction do
-        Post.get(post.id)
-      end
-    end
-  end
-
-  def test_get!
-    assert_against_record(:get) do |post|
-      in_transaction do
-        Post.get!(post.id)
-      end
-    end
-  end
-
-  def test_first
-    assert_against_record(:first) do
-      in_transaction do
-        Post.first
-      end
-    end
-  end
-
-  def test_all
-    assert_against_record(:all) do
-      in_transaction do
-        Post.all
-      end
-    end
-  end
-
-  def test_last
-    assert_against_record(:last) do
-      in_transaction do
-        Post.last
-      end
-    end
-  end
-
-  def test_bulk_update
-    assert_against_record(:update) do
-      in_transaction do
-        Post.update(:title => 'other title')
-      end
-    end
-  end
-
-  def test_bulk_update!
-    assert_against_record(:update) do
-      in_transaction do
-        Post.update!(:title => 'other title')
-      end
-    end
-  end
-
-  def test_instance_update
-    assert_against_record(:update) do |post|
-      in_transaction do
-        post.update(:title => 'other title')
-      end
-    end
-  end
-
-  def test_bulk_update!
-    assert_against_record(:update) do |post|
-      in_transaction do
-        post.update!(:title => 'other title')
-      end
-    end
-  end
-
-  def test_bulk_destroy
-    assert_against_record(:destroy) do
-      in_transaction do
-        Post.destroy
-      end
-    end
-  end
-
-  def test_bulk_destroy!
-    assert_against_record(:destroy) do
-      in_transaction do
-        Post.destroy!
-      end
-    end
-  end
-
-  def test_instance_destroy
-    assert_against_record(:destroy) do |post|
-      in_transaction do
-        post.destroy
-      end
-    end
-  end
-
-  def test_instance_destroy!
-    assert_against_record(:destroy) do |post|
-      in_transaction do
-        post.destroy!
-      end
-    end
-  end
-
-  def test_save
-    assert_against_record(:save) do |post|
-      in_transaction do
-        post.save
-      end
-    end
-  end
-
-  def test_save!
-    assert_against_record(:save) do |post|
-      in_transaction do
-        post.save!
-      end
-    end
-  end
-
-  def test_aggregate
-    assert_against_record(:aggregate) do
-      in_transaction do
-        Post.aggregate(:title, :all.count)
-      end
-    end
-  end
-
-  def test_find
-    assert_against_record(:find) do
-      in_transaction do
-        Post.find(1)
-      end
-    end
-  end
-
-  def test_find_by_sql
-    assert_against_record(:find_by_sql) do
-      in_transaction do
-        Post.find_by_sql('select * from posts')
-      end
-    end
-  end
-
-  def test_in_web_transaction
-    in_web_transaction("dm4evr") do
-      Post.all
-    end
-
-    assert_metrics_recorded([
-      'Datastore/all',
-      'Datastore/allWeb',
-      'Datastore/DataMapper/all',
-      'Datastore/DataMapper/allWeb',
-      'Datastore/operation/DataMapper/all',
-      'Datastore/statement/DataMapper/Post/all',
-      ['Datastore/statement/DataMapper/Post/all', 'dm4evr']
-    ])
-  end
-
-  def test_collection_get
-    assert_against_record(:get) do
-      in_transaction do
-        Post.all.get(1)
-      end
-    end
-  end
-
-  def test_collection_first
-    assert_against_record(:first) do
-      in_transaction do
-        Post.all.first
-      end
-    end
-  end
-
-  def test_collection_last
-    assert_against_record(:last) do
-      in_transaction do
-        Post.all.last
-      end
-    end
-  end
-
-  def test_collection_all
-    assert_against_record(:all) do
-      in_transaction do
-        Post.all.all # sic
-      end
-    end
-
-    assert_metrics_recorded(
-      'Datastore/statement/DataMapper/Post/all' => { :call_count => 2 }
-    )
-  end
-
-  def test_collection_lazy_load
-    assert_against_record(:lazy_load) do
-      in_transaction do
-        Post.all.send(:lazy_load)
-      end
-    end
-  end
-
-  def test_collection_create
-    assert_against_record(:create) do
-      in_transaction do
-        Post.all.create(:title => "The Title", :body => "Body")
-      end
-    end
-  end
-
-  def test_collection_create!
-    assert_against_record(:create) do
-      in_transaction do
-        Post.all.create!(:title => "The Title", :body => "Body")
-      end
-    end
-  end
-
-  def test_collection_update
-    assert_against_record(:update) do
-      in_transaction do
-        Post.all.update(:title => "Another")
-      end
-    end
-  end
-
-  def test_collection_update!
-    assert_against_record(:update) do
-      in_transaction do
-        Post.all.update!(:title => "Another")
-      end
-    end
-  end
-
-  def test_collection_destroy
-    assert_against_record(:destroy) do
-      in_transaction do
-        Post.all.destroy
-      end
-    end
-  end
-
-  def test_collection_destroy!
-    assert_against_record(:destroy) do
-      in_transaction do
-        Post.all.destroy!
-      end
-    end
-  end
-
-  def test_collection_aggregate
-    assert_against_record(:aggregate) do
-      in_transaction do
-        Post.all.aggregate(:title, :all.count)
-      end
-    end
-  end
-
-  def test_notices_sql
-    in_web_transaction do
-      Post.get(42)
-    end
-
-    sql_node = find_last_transaction_node(last_transaction_trace)
-    refute_nil sql_node.obfuscated_sql
-  end
-
-  def test_direct_select_on_adapter
-    in_web_transaction('dm4evr') do
-      DataMapper.repository.adapter.select('select * from posts limit 1')
-    end
-
-    assert_metrics_recorded([
-      'Datastore/all',
-      'Datastore/allWeb',
-      'Datastore/DataMapper/all',
-      'Datastore/DataMapper/allWeb',
-      'Datastore/operation/DataMapper/select',
-      ['Datastore/operation/DataMapper/select', 'dm4evr'],
-    ])
-  end
-
-  def test_direct_execute_on_adapter
-    in_transaction('background') do
-      DataMapper.repository.adapter.execute('update posts set title=title')
-    end
-
-    assert_metrics_recorded([
-      'Datastore/all',
-      'Datastore/allOther',
-      'Datastore/DataMapper/all',
-      'Datastore/DataMapper/allOther',
-      'Datastore/operation/DataMapper/execute',
-      ['Datastore/operation/DataMapper/execute', 'background'],
-    ])
-  end
-
-  def test_datamapper_transaction_commit
-    in_transaction do
-      Post.transaction do |t|
-        Post.destroy!
-      end
-    end
-
-    assert_metrics_recorded([
-      'Datastore/all',
-      'Datastore/allOther',
-      'Datastore/DataMapper/all',
-      'Datastore/DataMapper/allOther',
-      'Datastore/operation/DataMapper/commit'
-    ])
-  end
-
-  # https://support.newrelic.com/tickets/2101
-  # https://github.com/newrelic/rpm/pull/42
-  # https://github.com/newrelic/rpm/pull/45
-  def test_should_not_bomb_out_if_a_query_is_in_an_invalid_encoding
-    db = DummyConnection.new
-    q = "select ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000"
-    q.force_encoding 'UTF-8'
-
-    msg = mock
-    msg.stubs(:duration).returns(1)
-    msg.stubs(:query).returns(q)
-
-    assert_equal false, msg.query.valid_encoding?
-    db.send(:log, msg)
-  end
-
-  def test_obfuscate_query_in_sqlerror
-    invalid_query = "select * from users where password='Slurms McKenzie' limit 1"
-    with_config(:'slow_sql.record_sql' => 'obfuscated') do
-      begin
-        in_transaction do
-          DataMapper.repository.adapter.select(invalid_query)
-        end
-      rescue => e
-        NewRelic::Agent.notice_error(e)
-      end
-    end
-
-    refute last_traced_error.message.include?(invalid_query)
-  end
-
-  def test_splice_user_password_from_sqlerror
-    begin
-      in_transaction do
-        DataMapper.repository.adapter.select("select * from users")
-      end
-    rescue => e
-      NewRelic::Agent.notice_error(e)
-    end
-
-    refute last_traced_error.message.include?('&password='),
-      "error message expected not to contain '&password=' but did: #{last_traced_error && last_traced_error.message}"
-  end
-
-  def assert_against_record(operation)
-    post = Post.create!(:title => "Dummy post", :body => "whatever, man")
-
-    # Want to ignore our default record's creation for these tests
-    NewRelic::Agent.drop_buffered_data
-
-    assert_basic_metrics(operation) do
-      yield(post)
-    end
-  end
-
-  def assert_basic_metrics(operation)
-    yield
-    assert_metrics_recorded([
-      "Datastore/all",
-      "Datastore/allOther",
-      "Datastore/operation/DataMapper/#{operation}",
-      "Datastore/statement/DataMapper/Post/#{operation}"
-    ])
-  end
-
-end