newrelic_rpm 3.9.7.266 → 3.9.8.273

data/test/multiverse/suites/active_record/app/models/models.rb

@@ -0,0 +1,27 @@
+# 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.
+
+class User < ActiveRecord::Base
+  include NewRelic::Agent::MethodTracer
+  has_many :aliases
+
+  add_method_tracer :save!
+  add_method_tracer :persisted?
+end
+
+class Alias < ActiveRecord::Base
+  include NewRelic::Agent::MethodTracer
+
+  add_method_tracer :save!
+  add_method_tracer :persisted?
+  add_method_tracer :destroyed?
+end
+
+class Order < ActiveRecord::Base
+  has_and_belongs_to_many :shipments, :join_table => 'order_shipments'
+end
+
+class Shipment < ActiveRecord::Base
+  has_and_belongs_to_many :orders, :join_table => 'order_shipments'
+end

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

@@ -7,10 +7,10 @@ require 'rubygems'
 require 'active_record'
 require 'active_support/multibyte'
 
-require 'newrelic_rpm'
 require 'multiverse/color'
 require 'multiverse_helpers'
-require 'minitest/unit'
+
+require File.expand_path(File.join(__FILE__, "..", "app", "models", "models"))
 
 class InstrumentActiveRecordMethods < Minitest::Test
   extend Multiverse::Color
@@ -18,62 +18,21 @@ class InstrumentActiveRecordMethods < Minitest::Test
   include MultiverseHelpers
   setup_and_teardown_agent
 
-  class User < ActiveRecord::Base
-    include NewRelic::Agent::MethodTracer
-    has_many :aliases
-
-    add_method_tracer :save!
-    add_method_tracer :persisted?
-  end
-
-  class Alias < ActiveRecord::Base
-    include NewRelic::Agent::MethodTracer
-
-    add_method_tracer :save!
-    add_method_tracer :persisted?
-    add_method_tracer :destroyed?
-  end
-
-  def after_setup
-    database_name = "testdb.#{ENV["MULTIVERSE_ENV"]}.sqlite3"
-    @db_connection = ActiveRecord::Base.establish_connection(:adapter => 'sqlite3',
-                                                             :database => database_name)
-    ActiveRecord::Migration.class_eval do
-      @connection = @db_connection
-      create_table :users do |t|
-        t.string  :name
-      end
-
-      create_table :aliases do |t|
-        t.integer :user_id
-        t.string :aka
-      end
-    end
-  end
-
-  def after_teardown
-    ActiveRecord::Migration.class_eval do
-      @connection = @db_connection
-      drop_table :users
-      drop_table :aliases
-    end
-  end
-
   def test_basic_creation
     a_user = User.new :name => "Bob"
     assert a_user.new_record?
     a_user.save!
+
     assert User.connected?
     assert a_user.persisted? if a_user.respond_to?(:persisted?)
-    assert a_user.id == 1
   end
 
   def test_alias_collection_query_method
     a_user = User.new :name => "Bob"
     a_user.save!
-    a_user = User.find(1)
+
+    a_user = User.first
     assert User.connected?
-    assert a_user.id = 1
 
     an_alias = Alias.new :user_id => a_user.id, :aka => "the Blob"
     assert an_alias.new_record?

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

@@ -0,0 +1,23 @@
+# 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.
+
+begin
+  load 'Rakefile'
+  Rake::Task['db:create'].invoke
+  Rake::Task['db:migrate'].invoke
+rescue => e
+  puts e
+  puts e.backtrace.join("\n\t")
+  raise
+end
+
+class Minitest::Test
+  def after_teardown
+    super
+    User.delete_all
+    Alias.delete_all
+    Order.delete_all
+    Shipment.delete_all
+  end
+end

data/test/multiverse/suites/active_record/config/database.rb

@@ -0,0 +1,79 @@
+# 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 'active_record'
+require 'erb'
+require 'newrelic_rpm'
+
+DependencyDetection.detect!
+
+db_dir = File.expand_path('../../db', __FILE__)
+config_dir = File.expand_path(File.dirname(__FILE__))
+
+if defined?(ActiveRecord::VERSION)
+  ENV['DATABASE_NAME'] = "multiverse_activerecord_#{ActiveRecord::VERSION::STRING}_#{RUBY_VERSION}".gsub(".", "_")
+else
+  ENV['DATABASE_NAME'] = "multiverse_activerecord_2_x_#{ENV["MULTIVERSE_ENV"]}_#{RUBY_VERSION}".gsub(".", "_")
+end
+
+config_raw = File.read(File.join(config_dir, 'database.yml'))
+config_erb = ERB.new(config_raw).result
+config_yml = YAML.load(config_erb)
+
+# Rails 2.x didn't keep the Rails out of ActiveRecord much...
+RAILS_ENV  = "test"
+RAILS_ROOT = File.join(db_dir, "..")
+
+ActiveRecord::Base.configurations = config_yml
+ActiveRecord::Base.establish_connection :test
+ActiveRecord::Base.logger = Logger.new(ENV["VERBOSE"] ? STDOUT : StringIO.new)
+
+begin
+  load 'active_record/railties/databases.rake'
+rescue LoadError, StandardError
+  load 'tasks/databases.rake'
+end
+
+if defined?(ActiveRecord::Tasks)
+  include ActiveRecord::Tasks
+
+  module Seeder
+    def self.load_seed
+      # Nope
+    end
+  end
+
+  DatabaseTasks.env = "test"
+  DatabaseTasks.db_dir = db_dir
+  DatabaseTasks.migrations_paths = File.join(db_dir, 'migrate')
+  DatabaseTasks.database_configuration = config_yml
+  DatabaseTasks.seed_loader = Seeder
+else
+  # Hattip to https://github.com/janko-m/sinatra-activerecord/blob/master/lib/sinatra/activerecord/rake/activerecord_3.rb
+  module Rails
+    extend self
+
+    def root
+      Pathname.new(Rake.application.original_dir)
+    end
+
+    def env
+      ActiveSupport::StringInquirer.new(ENV["RACK_ENV"] || "development")
+    end
+
+    def application
+      seed_loader = Object.new
+      seed_loader.instance_eval do
+        def load_seed
+          # Nope
+        end
+      end
+      seed_loader
+    end
+  end
+
+  Rake::Task.define_task("db:environment")
+  Rake::Task["db:load_config"].clear if Rake::Task.task_defined? "db:load_config"
+  Rake::Task.define_task("db:rails_env")
+end

data/test/multiverse/suites/active_record/config/database.yml

@@ -0,0 +1,19 @@
+mysql: &mysql
+<% if defined?(JRuby) %>
+  adapter: jdbcmysql
+<% else %>
+  adapter: mysql
+<% end %>
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  username: root
+  host: localhost
+  database: <%= db = "#{ENV['DATABASE_NAME']}"; db.empty? ? "rails_blog" : db %>
+
+development:
+  <<: *mysql
+
+test:
+  <<: *mysql
+
+production:
+  <<: *mysql

data/test/multiverse/suites/active_record/db/migrate/20141105131800_create_users_and_aliases.rb

@@ -0,0 +1,21 @@
+# 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.
+
+class CreateUsersAndAliases < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string  :name
+    end
+
+    create_table :aliases do |t|
+      t.integer :user_id
+      t.string :aka
+    end
+  end
+
+  def self.down
+    drop_table :users
+    drop_table :aliases
+  end
+end

data/test/multiverse/suites/active_record/db/migrate/20141106082200_create_orders_and_shipments.rb

@@ -0,0 +1,25 @@
+# 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.
+
+class CreateOrdersAndShipments < ActiveRecord::Migration
+  def self.up
+    create_table :orders do |t|
+      t.string :name
+    end
+
+    create_table :shipments, :force => true do |t|
+    end
+
+    create_table :order_shipments, :force => true, :id => false do |t|
+      t.integer :order_id
+      t.integer :shipment_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table :orders
+    drop_table :shipments
+    drop_table :order_shipments
+  end
+end

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

@@ -70,7 +70,10 @@ class CrossApplicationTracingTest < Minitest::Test
       end
 
       define_method("test_#{test_case['name']}") do
-        txn_category, txn_name = test_case['transactionName'].split('/')
+        txn_name_parts = test_case['transactionName'].split('/')
+        txn_category   = txn_name_parts[0..1].join('/')
+        txn_name       = txn_name_parts[2..-1].join('/')
+
         request_params = {
           'transaction_name' => txn_name,
           'transaction_category' => txn_category,

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

@@ -0,0 +1,53 @@
+# 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 'multiverse_helpers'
+
+class CustomAnalyticsEventsTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  def test_custom_analytics_events_are_submitted
+    t0 = freeze_time
+    NewRelic::Agent.record_custom_event(:DummyType, :foo => :bar, :baz => :qux)
+
+    NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+    events = last_custom_event_submission
+
+    expected_event = [{'type' => 'DummyType', 'timestamp' => t0.to_i },
+                      {'foo' => 'bar', 'baz' => 'qux'}]
+    assert_equal(expected_event, events.first)
+  end
+
+  def test_record_custom_event_returns_falsy_if_event_was_dropped
+    max_samples = NewRelic::Agent.config[:'custom_insights_events.max_samples_stored']
+    max_samples.times do
+      NewRelic::Agent.record_custom_event(:DummyType, :foo => :bar)
+    end
+
+    result = NewRelic::Agent.record_custom_event(:DummyType, :foo => :bar)
+    refute(result)
+  end
+
+  def test_record_doesnt_record_if_invalid_event_type
+    bad_event_type  = 'bad$news'
+    good_event_type = 'good news'
+
+    NewRelic::Agent.record_custom_event(bad_event_type,  :foo => :bar)
+    NewRelic::Agent.record_custom_event(good_event_type, :foo => :bar)
+
+    NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+    events = last_custom_event_submission
+
+    assert_equal(1, events.size)
+    assert_equal(good_event_type, events.first[0]['type'])
+  end
+
+  def last_custom_event_submission
+    submissions = $collector.calls_for('custom_event_data')
+    assert_equal(1, submissions.size)
+    submissions.first.events
+  end
+end

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

@@ -13,17 +13,13 @@ class KeepaliveTest < Minitest::Test
 
     NewRelic::Agent.agent.send(:transmit_data)
 
-    # This is the closest I can easily get to closing the underlying TCP
-    # connection from the server side in between harvests.
-    conn0 = NewRelic::Agent.agent.service.http_connection
-    conn0.instance_variable_get(:@socket).close
+    # This is simulating the remote peer closing the TCP connection between
+    # harvest cycles.
+    $collector.last_socket.close
 
     NewRelic::Agent.agent.send(:transmit_data)
 
-    conn1 = NewRelic::Agent.agent.service.http_connection
-
     metric_data_calls = $collector.calls_for('metric_data')
     assert_equal(2, metric_data_calls.size)
-    assert_same(conn0, conn1)
   end
 end

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

@@ -0,0 +1,170 @@
+# 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 'multiverse_helpers'
+require 'fake_instance_metadata_service'
+
+class UtilizationDataCollectionTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent do
+    @config = NewRelic::Agent::Configuration::DottedHash.new({:collect_utilization => true }, true)
+    NewRelic::Agent.config.add_config_for_testing(@config, true)
+  end
+
+  def after_teardown
+    NewRelic::Agent.config.remove_config(@config)
+  end
+
+  def test_hostname
+    NewRelic::Agent::Hostname.stubs(:get).returns("hostile")
+    trigger_usage_data_collection_and_submission
+
+    data = last_submitted_utilization_data
+    assert_equal("hostile", data.hostname)
+  end
+
+  def test_gathers_instance_metadata
+    instance_type = 'test.type'
+
+    with_fake_metadata_service do |service|
+      service.set_response_for_path('/2008-02-01/meta-data/instance-type', instance_type)
+      trigger_usage_data_collection_and_submission
+    end
+
+    data = last_submitted_utilization_data
+    assert_equal(instance_type, data.instance_type)
+  end
+
+  def test_omits_instance_metadata_if_contains_invalid_characters
+    instance_type = '<script>lol</script>'
+
+    with_fake_metadata_service do |service|
+      service.set_response_for_path('/2008-02-01/meta-data/instance-type', instance_type)
+      trigger_usage_data_collection_and_submission
+    end
+
+    data = last_submitted_utilization_data
+    assert_nil(data.instance_type)
+  end
+
+  def test_omits_instance_metadata_if_too_long
+    instance_type = 'a' * 1024
+
+    with_fake_metadata_service do |service|
+      service.set_response_for_path('/2008-02-01/meta-data/instance-type', instance_type)
+      trigger_usage_data_collection_and_submission
+    end
+
+    data = last_submitted_utilization_data
+    assert_nil(data.instance_type)
+  end
+
+  def test_gathers_cpu_metadata
+    fake_processor_info = { :num_logical_processors => 8 }
+    NewRelic::Agent::SystemInfo.stubs(:get_processor_info).returns(fake_processor_info)
+
+    trigger_usage_data_collection_and_submission
+
+    data = last_submitted_utilization_data
+    assert_equal(fake_processor_info[:num_logical_processors], data.cpu_count)
+  end
+
+  def test_nil_cpu_values_reported
+    fake_processor_info = { :num_logical_processors => nil }
+    NewRelic::Agent::SystemInfo.stubs(:get_processor_info).returns(fake_processor_info)
+
+    trigger_usage_data_collection_and_submission
+
+    data = last_submitted_utilization_data
+    assert_nil(data.cpu_count)
+  end
+
+  def test_gathers_docker_container_id
+    NewRelic::Agent::SystemInfo.stubs(:docker_container_id).returns("whale")
+
+    trigger_usage_data_collection_and_submission
+
+    data = last_submitted_utilization_data
+    assert_equal "whale", data.container_id
+  end
+
+  def test_nil_docker_container_id
+    NewRelic::Agent::SystemInfo.stubs(:docker_container_id).returns(nil)
+
+    trigger_usage_data_collection_and_submission
+
+    data = last_submitted_utilization_data
+    assert_nil data.container_id
+  end
+
+  def test_retries_upon_failure_to_submit_usage_data
+    $collector.stub_exception('utilization_data', nil, 503).once
+
+    trigger_usage_data_collection_and_submission
+    first_attempt = last_submitted_utilization_data
+
+    $collector.reset
+
+    trigger_usage_data_collection_and_submission
+    next_attempt = last_submitted_utilization_data
+
+    assert_equal(first_attempt, next_attempt)
+  end
+
+  def last_submitted_utilization_data
+    submissions = $collector.calls_for(:utilization_data)
+    assert_equal(1, submissions.size)
+
+    data = submissions.last
+    assert_equal(4, data.body.size)
+
+    data
+  end
+
+  def trigger_usage_data_collection_and_submission
+    agent.send(:transmit_utilization_data)
+  end
+
+  def with_fake_metadata_service
+    metadata_service = NewRelic::FakeInstanceMetadataService.new
+    metadata_service.run
+
+    redirect_link_local_address(metadata_service.port)
+
+    yield metadata_service
+  ensure
+    metadata_service.stop if metadata_service
+    unredirect_link_local_address
+  end
+
+  def redirect_link_local_address(port)
+    Net::HTTP.class_exec(port) do |p|
+      @dummy_port = p
+
+      class << self
+        def get_with_patch(uri)
+          if uri.host == '169.254.169.254'
+            uri.host = 'localhost'
+            uri.port = @dummy_port
+          end
+          get_without_patch(uri)
+        end
+
+        alias_method :get_without_patch, :get
+        alias_method :get, :get_with_patch
+      end
+    end
+  end
+
+  def unredirect_link_local_address
+    Net::HTTP.class_eval do
+      class << self
+        alias_method :get, :get_without_patch
+        undef_method :get_with_patch
+      end
+    end
+  end
+end