newrelic_rpm 3.12.0.288 → 3.12.1.298

data/test/new_relic/cli/commands/deployments_test.rb

@@ -15,7 +15,8 @@ class NewRelic::Cli::DeploymentsTest < Minitest::Test
       def info(message); @messages = @messages ? @messages + message : message; end
       def just_exit(status=0); @exit_status ||= status; end
     end
-    @config = { :license_key => 'a' * 40 }
+    @config = { :license_key => 'a' * 40,
+                :config_path => 'test/config/newrelic.yml' }
     NewRelic::Agent.config.add_config_for_testing(@config)
   end
 
@@ -76,12 +77,21 @@ class NewRelic::Cli::DeploymentsTest < Minitest::Test
   def test_error_if_no_license_key
     with_config(:license_key => '') do
       assert_raises NewRelic::Cli::Command::CommandFailure do
-      deployment = NewRelic::Cli::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
+        deployment = NewRelic::Cli::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
         deployment.run
       end
     end
   end
 
+  def test_error_if_failed_yaml
+    NewRelic::Agent::Configuration::YamlSource.any_instance.stubs(:failed?).returns(true)
+
+    assert_raises NewRelic::Cli::Command::CommandFailure do
+      deployment = NewRelic::Cli::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
+      deployment.run
+    end
+  end
+
   def test_with_specified_license_key
     mock_the_connection
     @deployment = NewRelic::Cli::Deployments.new(:appname => 'APP',

data/test/new_relic/control/instrumentation_test.rb

@@ -38,19 +38,4 @@ class NewRelic::Control::InstrumentationTest < Minitest::Test
     result = @test_class.instance_variable_get(:@instrumentation_files)
     assert_equal [expected_pattern], result
   end
-
-  def test_install_shim_logs_if_instrumentation_has_already_been_installed
-    @test_class.instance_eval { @instrumented = true }
-    expects_logging(:error, includes('Cannot install'))
-    @test_class.install_shim
-  end
-
-  def test_install_shim_does_not_set_agent_if_already_instrumented
-    fake_shim = "Instrumentation Test Shim Agent"
-    @test_class.instance_eval { @instrumented = true }
-    NewRelic::Agent::ShimAgent.class_eval { @instance = fake_shim }
-
-    @test_class.install_shim
-    refute_equal NewRelic::Agent.agent, fake_shim
-  end
 end

data/test/new_relic/control_test.rb

@@ -35,36 +35,6 @@ class NewRelic::ControlTest < Minitest::Test
     end
   end
 
-  def test_resolve_ip_for_localhost
-    with_config(:ssl => false) do
-      assert_equal nil, control.send(:convert_to_ip_address, 'localhost')
-    end
-  end
-
-  def test_resolve_ip_for_non_existent_domain
-    with_config(:ssl => false) do
-      Resolv.stubs(:getaddress).raises(Resolv::ResolvError)
-      IPSocket.stubs(:getaddress).raises(SocketError)
-      assert_equal nil, control.send(:convert_to_ip_address, 'q1239988737.us')
-    end
-  end
-
-  def test_resolves_valid_ip
-    with_config(:ssl => false) do
-      Resolv.stubs(:getaddress).with('collector.newrelic.com').returns('204.93.223.153')
-      assert_equal '204.93.223.153', control.send(:convert_to_ip_address, 'collector.newrelic.com')
-    end
-  end
-
-  def test_do_not_resolve_if_we_need_to_verify_a_cert
-    with_config(:ssl => false) do
-      assert_equal nil, control.send(:convert_to_ip_address, 'localhost')
-    end
-    with_config(:ssl => true) do
-      assert_equal 'localhost', control.send(:convert_to_ip_address, 'localhost')
-    end
-  end
-
   def test_api_server_uses_configured_values
     control.instance_variable_set(:@api_server, nil)
     with_config(:api_host => 'somewhere', :api_port => 8080) do
@@ -73,14 +43,6 @@ class NewRelic::ControlTest < Minitest::Test
     end
   end
 
-  def test_proxy_server_uses_configured_values
-    control.instance_variable_set(:@proxy_server, nil)
-    with_config(:proxy_host => 'proxytown', :proxy_port => 81) do
-      assert_equal 'proxytown', control.proxy_server.name
-      assert_equal 81, control.proxy_server.port
-    end
-  end
-
   def test_server_from_host_uses_configured_values
     with_config(:host => 'donkeytown', :port => 8080) do
       assert_equal 'donkeytown', control.server_from_host.name
@@ -88,31 +50,6 @@ class NewRelic::ControlTest < Minitest::Test
     end
   end
 
-  class FakeResolv
-    def self.getaddress(host)
-      raise 'deliberately broken'
-    end
-  end
-
-  def test_resolve_ip_with_broken_dns
-    # Here be dragons: disable the ruby DNS lookup methods we use so
-    # that it will actually fail to resolve.
-    old_resolv = Resolv
-    old_ipsocket = IPSocket
-    Object.instance_eval { remove_const :Resolv}
-    Object.instance_eval {remove_const:'IPSocket' }
-
-    with_config(:ssl => false) do
-      assert_equal(nil, control.send(:convert_to_ip_address, 'collector.newrelic.com'), "DNS is down, should be no IP for server")
-    end
-
-    Object.instance_eval {const_set('Resolv', old_resolv); const_set('IPSocket', old_ipsocket)}
-    # these are here to make sure that the constant tomfoolery above
-    # has not broket the system unduly
-    assert_equal old_resolv, Resolv
-    assert_equal old_ipsocket, IPSocket
-  end
-
   def test_transaction_threshold__override
     with_config(:transaction_tracer => { :transaction_threshold => 1}) do
       assert_equal 1, NewRelic::Agent.config[:'transaction_tracer.transaction_threshold']

data/test/new_relic/fake_collector.rb

@@ -71,7 +71,6 @@ module NewRelic
         'shutdown'                => Response.new(200, {'return_value' => nil}),
         'analytic_event_data'     => Response.new(200, {'return_value' => nil}),
         'custom_event_data'       => Response.new(200, {'return_value' => nil}),
-        'utilization_data'        => Response.new(200, {'return_value' => nil}),
       }
       reset
     end
@@ -207,8 +206,6 @@ module NewRelic
           AnalyticEventDataPost.new(opts)
         when 'error_data'
           ErrorDataPost.new(opts)
-        when 'utilization_data'
-          UtilizationDataPost.new(opts)
         else
           new(opts)
         end
@@ -248,6 +245,10 @@ module NewRelic
         super
         @body = @body[0]
       end
+
+      def utilization
+        @body["utilization"]
+      end
     end
 
     class ProfileDataPost < AgentPost
@@ -355,20 +356,6 @@ module NewRelic
       end
     end
 
-    class UtilizationDataPost < AgentPost
-
-      attr_reader :hostname, :container_id, :cpu_count, :instance_type
-
-      def initialize(opts={})
-        super
-        @hostname, @container_id, @cpu_count, @instance_type = body
-      end
-
-      def ==(other)
-        @body == other.body
-      end
-    end
-
     class SubmittedError
 
       attr_reader :timestamp, :path, :message, :exception_class_name, :params

data/test/new_relic/language_support_test.rb

@@ -71,4 +71,34 @@ class NewRelic::LanguageSupportTest < Minitest::Test
     ::GC::Profiler.stubs(:enabled?).returns(true)
     assert_equal false, NewRelic::LanguageSupport.gc_profiler_enabled?
   end
+
+  module ::Outer
+    class Included
+    end
+  end
+
+  class ::Excluded
+  end
+
+  module ::ContainsAnObject
+    class ContainedObject
+    end
+  end
+
+  def test_should_look_within_module
+    assert_equal ::Outer::Included, NewRelic::LanguageSupport.constantize("Outer::Included")
+  end
+
+  def test_shouldnt_look_outside_module_for_class
+    assert_equal nil, NewRelic::LanguageSupport.constantize("Outer::Excluded")
+  end
+
+  def test_shouldnt_look_outside_module_for_module
+    assert_equal nil, NewRelic::LanguageSupport.constantize("Outer::Outer")
+  end
+
+  def test_should_allow_object_in_module_names
+    assert_equal ::ContainsAnObject::ContainedObject,
+                  NewRelic::LanguageSupport.constantize("ContainsAnObject::ContainedObject")
+  end
 end

data/test/new_relic/license_test.rb

@@ -44,6 +44,8 @@ class LicenseTest < Minitest::Test
     ['/test/new_relic/agent/agent_test_controller_test.rb', 'Apache'] => 1, # apache header tests
     ['/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr.rb', 'Apache'] => 2, # parse apache solr metrics
     ['/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/solr_request_handler.rb', 'Apache'] => 1, # parse apache solr metrics
+    ['/lib/new_relic/agent/system_info.rb', 'BSD'] => 4,
+    ['/test/new_relic/agent/system_info_test.rb', 'BSD'] => 2
   }
 
   def shebang

data/test/new_relic/multiverse_helpers.rb

@@ -156,6 +156,11 @@ module MultiverseHelpers
     $collector.calls_for("analytic_event_data").first.events.first
   end
 
+  def single_connect_posted
+    assert_equal 1, $collector.calls_for(:connect).size
+    $collector.calls_for(:connect).first
+  end
+
   def capture_js_data
     state = NewRelic::Agent::TransactionState.tl_get
     events = stub(:subscribe => nil)
@@ -241,6 +246,13 @@ module MultiverseHelpers
     assert_nil @js_agent_attributes
   end
 
+  def refute_event_has_attribute(key)
+    evt = single_event_posted
+    refute_includes evt[0], key, "Found unexpected attribute #{key} in txn event intrinsics"
+    refute_includes evt[1], key, "Found unexpected attribute #{key} in txn event custom attributes"
+    refute_includes evt[2], key, "Found unexpected attribute #{key} in txn event agent attributes"
+  end
+
   def attributes_for_single_error_posted(key)
     run_harvest
     single_error_posted.params[key]

data/test/performance/suites/stats_hash.rb

@@ -5,22 +5,23 @@
 class StatsHashPerfTest < Performance::TestCase
   def setup
     @hash = NewRelic::Agent::StatsHash.new
+    @specs = (1..100).map { |i| NewRelic::MetricSpec.new("foo#{i}") }
   end
 
   def test_record
     measure do
       hash = NewRelic::Agent::StatsHash.new
-      100.times do |i|
-        hash.record("foo#{i}", 1)
+      @specs.each do |spec|
+        hash.record(spec, 1)
       end
     end
   end
 
   def test_merge
     measure do
-      incoming = {}
-      100.times do |i|
-        incoming["foo#{i}"] = NewRelic::Agent::Stats.new
+      incoming = NewRelic::Agent::StatsHash.new
+      @specs.each do |i|
+        incoming.record(NewRelic::MetricSpec.new("foo#{i}"), 1)
       end
 
       hash = NewRelic::Agent::StatsHash.new

data/test/test_helper.rb

@@ -122,7 +122,6 @@ def default_service(stubbed_method_overrides = {})
     :get_agent_commands => [],
     :agent_command_results => nil,
     :analytic_event_data => nil,
-    :utilization_data => nil,
     :valid_to_marshal? => true
   }
 
@@ -235,7 +234,7 @@ module TransactionSampleTestHelper
       sampler = NewRelic::Agent.instance.transaction_sampler
       sampler.notice_push_frame(state, "a")
       explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
-      sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "mysql"}, 0, state, &explainer) }
+      sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "mysql"}, 0, state, explainer) }
       sleep 0.02
       yield if block_given?
       sampler.notice_pop_frame(state, "a")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.12.0.288
+  version: 3.12.1.298
 platform: ruby
 authors:
 - Jason Clark
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -232,6 +232,7 @@ files:
 - lib/new_relic/agent/attribute_processing.rb
 - lib/new_relic/agent/audit_logger.rb
 - lib/new_relic/agent/autostart.rb
+- lib/new_relic/agent/aws_info.rb
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
 - lib/new_relic/agent/commands/agent_command.rb
@@ -334,6 +335,7 @@ files:
 - lib/new_relic/agent/instrumentation/typhoeus.rb
 - lib/new_relic/agent/internal_agent_error.rb
 - lib/new_relic/agent/javascript_instrumentor.rb
+- lib/new_relic/agent/log_once.rb
 - lib/new_relic/agent/memory_logger.rb
 - lib/new_relic/agent/method_tracer.rb
 - lib/new_relic/agent/method_tracer_helpers.rb
@@ -358,7 +360,6 @@ files:
 - lib/new_relic/agent/samplers/memory_sampler.rb
 - lib/new_relic/agent/samplers/object_sampler.rb
 - lib/new_relic/agent/samplers/vm_sampler.rb
-- lib/new_relic/agent/shim_agent.rb
 - lib/new_relic/agent/sized_buffer.rb
 - lib/new_relic/agent/sql_sampler.rb
 - lib/new_relic/agent/stats.rb
@@ -451,6 +452,8 @@ files:
 - lib/tasks/config.rake
 - lib/tasks/config.text.erb
 - lib/tasks/install.rake
+- lib/tasks/multiverse.rake
+- lib/tasks/multiverse.rb
 - lib/tasks/tests.rake
 - lib/tasks/versions.html.erb
 - lib/tasks/versions.rake
@@ -546,6 +549,7 @@ files:
 - test/environments/rails42/db/schema.rb
 - test/fixtures/cross_agent_tests/README.md
 - test/fixtures/cross_agent_tests/attribute_configuration.json
+- test/fixtures/cross_agent_tests/aws.json
 - test/fixtures/cross_agent_tests/cat_map.json
 - test/fixtures/cross_agent_tests/docker_container_id/README.md
 - test/fixtures/cross_agent_tests/docker_container_id/cases.json
@@ -557,6 +561,8 @@ files:
 - test/fixtures/cross_agent_tests/docker_container_id/docker-1.3.txt
 - test/fixtures/cross_agent_tests/docker_container_id/empty.txt
 - test/fixtures/cross_agent_tests/docker_container_id/heroku.txt
+- test/fixtures/cross_agent_tests/docker_container_id/invalid-characters.txt
+- test/fixtures/cross_agent_tests/docker_container_id/invalid-length.txt
 - test/fixtures/cross_agent_tests/docker_container_id/ubuntu-14.04-lxc-container.txt
 - test/fixtures/cross_agent_tests/docker_container_id/ubuntu-14.04-no-container.txt
 - test/fixtures/cross_agent_tests/docker_container_id/ubuntu-14.10-no-container.txt
@@ -730,6 +736,8 @@ files:
 - test/multiverse/suites/active_record/config/newrelic.yml
 - test/multiverse/suites/active_record/db/migrate/20141105131800_create_users_and_aliases.rb
 - test/multiverse/suites/active_record/db/migrate/20141106082200_create_orders_and_shipments.rb
+- test/multiverse/suites/active_record/db/migrate/20150413011200_add_timestamps_to_orders.rb
+- test/multiverse/suites/active_record/db/migrate/20150414084400_create_groups.rb
 - test/multiverse/suites/activemerchant/Envfile
 - test/multiverse/suites/activemerchant/activemerchant_test.rb
 - test/multiverse/suites/agent_only/Envfile
@@ -755,6 +763,7 @@ files:
 - test/multiverse/suites/agent_only/rum_instrumentation_test.rb
 - test/multiverse/suites/agent_only/script/env_change.rb
 - test/multiverse/suites/agent_only/script/loading.rb
+- test/multiverse/suites/agent_only/script/public_api_when_disabled.rb
 - test/multiverse/suites/agent_only/script/symbol_env.rb
 - test/multiverse/suites/agent_only/service_timeout_test.rb
 - test/multiverse/suites/agent_only/set_transaction_name_test.rb
@@ -944,6 +953,7 @@ files:
 - test/new_relic/agent/attribute_processing_test.rb
 - test/new_relic/agent/audit_logger_test.rb
 - test/new_relic/agent/autostart_test.rb
+- test/new_relic/agent/aws_info_test.rb
 - test/new_relic/agent/busy_calculator_test.rb
 - test/new_relic/agent/commands/agent_command_router_test.rb
 - test/new_relic/agent/commands/agent_command_test.rb
@@ -1018,7 +1028,6 @@ files:
 - test/new_relic/agent/sampler_test.rb
 - test/new_relic/agent/samplers/cpu_sampler_test.rb
 - test/new_relic/agent/samplers/vm_sampler_test.rb
-- test/new_relic/agent/shim_agent_test.rb
 - test/new_relic/agent/sized_buffer_test.rb
 - test/new_relic/agent/sql_sampler_test.rb
 - test/new_relic/agent/stats_engine/gc_profiler_test.rb

data/lib/new_relic/agent/shim_agent.rb

@@ -1,33 +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.
-
-# This agent is loaded by the plug when the plug-in is disabled
-# It recreates just enough of the API to not break any clients that
-# invoke the Agent.
-module NewRelic
-  module Agent
-    class ShimAgent < NewRelic::Agent::Agent
-      def self.instance
-        @instance ||= self.new
-      end
-
-      def initialize
-        super
-        @stats_engine.extend NewRelic::Agent::StatsEngine::Shim
-        @transaction_sampler.extend NewRelic::Agent::TransactionSampler::Shim
-        @sql_sampler.extend NewRelic::Agent::SqlSampler::Shim
-        @error_collector.extend NewRelic::Agent::ErrorCollector::Shim
-      end
-
-      def after_fork *args; end
-      def start *args; end
-      def shutdown *args; end
-      def merge_data_for_endpoint *args; end
-      def push_trace_execution_flag *args; end
-      def pop_trace_execution_flag *args; end
-      def browser_timing_header; "" end
-      def browser_timing_footer; "" end
-    end
-  end
-end

data/test/new_relic/agent/shim_agent_test.rb

@@ -1,20 +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.dirname(__FILE__),'..','..','test_helper'))
-module NewRelic
-  module Agent
-    class ShimAgentTest < Minitest::Test
-
-      def setup
-        super
-        @agent = NewRelic::Agent::ShimAgent.new
-      end
-
-      def test_merge_data_for_endpoint
-        assert_equal(nil, @agent.merge_data_for_endpoint(:diggle, mock('metric data')))
-      end
-    end
-  end
-end