newrelic_rpm 3.15.2.317 → 3.16.0.318

data/test/fixtures/cross_agent_tests/sql_obfuscation/README.md

@@ -33,3 +33,4 @@ SQL Syntax Documentation:
 * [PostgreSQL](http://www.postgresql.org/docs/8.4/static/sql-syntax.html)
 * [Cassandra](http://docs.datastax.com/en/cql/3.1/cql/cql_reference/cql_lexicon_c.html)
 * [Oracle](http://docs.oracle.com/cd/B28359_01/appdev.111/b28370/langelems.htm)
+* [SQLite](https://www.sqlite.org/lang.html)

data/test/fixtures/cross_agent_tests/utilization/README.md

@@ -0,0 +1,13 @@
+# The Utilization Tests
+
+The Utilization tests ensure that the appropriate information is being gathered for pricing. It is centered around ensuring the JSON is correct. Each JSON block is a test case, with potentially the following fields:
+
+  - testname: The name of the test
+  - input_total_ram_mib: The total ram number calculated by the agent.
+  - input_logical_processors: The number of logical processors calculated by the agent.
+  - input_hostname: The hostname calculated by the agent.
+  - input_aws_id: The aws id determined by the agent.
+  - input_aws_type: The aws type determined by the agent.
+  - input_aws_zone: The aws zone determined by the agent.
+  - input_environment_variables: Any environment variables which have been set.
+  - expected_output_json: The expected JSON output from the agent for the utilization hash.

data/test/fixtures/cross_agent_tests/utilization/utilization_json.json

@@ -0,0 +1,132 @@
+[
+  {
+    "testname":"only agent derived data",
+    "input_total_ram_mib": 1024,
+    "input_logical_processors": 8,
+    "input_hostname": "myhost",
+    "expected_output_json": {
+      "metadata_version":2,
+      "logical_processors":8,
+      "total_ram_mib":1024,
+      "hostname":"myhost"
+    }
+  },
+  {
+    "testname":"only agent derived data with aws",
+    "input_total_ram_mib": 2048,
+    "input_logical_processors": 8,
+    "input_hostname": "myotherhost",
+    "input_aws_id": "8BADFOOD",
+    "input_aws_type": "t2.micro",
+    "input_aws_zone": "us-west-1",
+    "expected_output_json": {
+      "metadata_version":2,
+      "logical_processors":8,
+      "total_ram_mib":2048,
+      "hostname":"myotherhost",
+      "vendors": {
+        "aws": {
+          "id":"8BADFOOD",
+          "type":"t2.micro",
+          "zone":"us-west-1"
+        }
+      }
+    }
+  },
+  {
+    "testname":"only agent derived but bad data",
+    "input_total_ram_mib": null,
+    "input_logical_processors": null,
+    "input_hostname": "myotherhost",
+    "expected_output_json": {
+      "metadata_version": 2,
+      "logical_processors":null,
+      "total_ram_mib":null,
+      "hostname":"myotherhost"
+    }
+  },
+  {
+    "testname":"agent derived null and so environment variables",
+    "input_total_ram_mib": null,
+    "input_logical_processors": null,
+    "input_hostname": "myotherhost",
+    "input_environment_variables": {
+      "NEW_RELIC_UTILIZATION_LOGICAL_PROCESSORS": 8,
+      "NEW_RELIC_UTILIZATION_TOTAL_RAM_MIB" : 2048
+    },
+    "expected_output_json": {
+      "metadata_version": 2,
+      "logical_processors":null,
+      "total_ram_mib":null,
+      "hostname":"myotherhost",
+      "config" : {
+        "logical_processors": 8,
+        "total_ram_mib": 2048
+      }
+    }
+  },
+  {
+    "testname":"all environment variables",
+    "input_total_ram_mib": 1,
+    "input_logical_processors": 2,
+    "input_hostname": "myotherhost",
+    "input_environment_variables": {
+      "NEW_RELIC_UTILIZATION_LOGICAL_PROCESSORS": 16,
+      "NEW_RELIC_UTILIZATION_TOTAL_RAM_MIB" : 4096,
+      "NEW_RELIC_UTILIZATION_BILLING_HOSTNAME" : "localhost"
+    },
+    "expected_output_json": {
+      "metadata_version": 2,
+      "logical_processors":2,
+      "total_ram_mib":1,
+      "hostname":"myotherhost",
+      "config" : {
+        "logical_processors": 16,
+        "total_ram_mib": 4096,
+        "hostname": "localhost"
+      }
+    }
+  },
+  {
+    "testname":"all environment variables with error in processors",
+    "input_total_ram_mib": 1024,
+    "input_logical_processors": 4,
+    "input_hostname": "myotherhost",
+    "input_environment_variables": {
+      "NEW_RELIC_UTILIZATION_LOGICAL_PROCESSORS": "abc",
+      "NEW_RELIC_UTILIZATION_TOTAL_RAM_MIB" : 4096,
+      "NEW_RELIC_UTILIZATION_BILLING_HOSTNAME" : "localhost"
+    },
+    "expected_output_json": {
+      "metadata_version": 2,
+      "logical_processors":4,
+      "total_ram_mib":1024,
+      "hostname":"myotherhost",
+      "config" : {
+        "total_ram_mib": 4096,
+        "hostname": "localhost"
+      }
+    }
+  },
+  {
+    "testname":"all environment variables with error in ram",
+    "input_total_ram_mib": 1024,
+    "input_logical_processors": 4,
+    "input_hostname": "myotherhost",
+    "input_environment_variables": {
+      "NEW_RELIC_UTILIZATION_LOGICAL_PROCESSORS": 8,
+      "NEW_RELIC_UTILIZATION_TOTAL_RAM_MIB" : "notgood",
+      "NEW_RELIC_UTILIZATION_BILLING_HOSTNAME" : "localhost"
+    },
+    "expected_output_json": {
+      "metadata_version": 2,
+      "logical_processors":4,
+      "total_ram_mib":1024,
+      "hostname":"myotherhost",
+      "config" : {
+        "logical_processors": 8,
+        "hostname": "localhost"
+      }
+    }
+  }
+]

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

@@ -214,6 +214,88 @@ class AgentAttributesTest < Minitest::Test
     assert_browser_monitoring_has_agent_attribute("request.parameters.bar", "baz")
   end
 
+  def test_request_uri_captured_on_transaction_events_when_enabled
+    config = {:'transaction_events.attributes.include' => 'request_uri'}
+    txn_options = {
+      :request => stub(:path => "/foobar")
+    }
+    run_transaction(config, txn_options)
+
+    assert_event_has_agent_attribute("request_uri", "/foobar")
+    refute_error_has_agent_attribute("request_uri")
+    refute_transaction_trace_has_agent_attribute("request_uri")
+    refute_browser_monitoring_has_agent_attribute("request_uri")
+  end
+
+  def test_request_uri_excluded_by_default
+    config = {:'transaction_events.attributes.include' => ''}
+    txn_options = {
+      :request => stub(:path => "/foobar")
+    }
+    run_transaction(config, txn_options)
+
+    refute_event_has_agent_attribute("request_uri")
+    refute_error_has_agent_attribute("request_uri")
+    refute_transaction_trace_has_agent_attribute("request_uri")
+    refute_browser_monitoring_has_agent_attribute("request_uri")
+  end
+
+  def test_request_uri_not_captured_on_transaction_traces
+    config = {:'transaction_tracer.attributes.include' => 'request_uri'}
+    txn_options = {
+      :request => stub(:path => "/foobar")
+    }
+    run_transaction(config, txn_options)
+
+    refute_transaction_trace_has_agent_attribute("request_uri")
+  end
+
+  def test_request_uri_not_captured_on_error_traces
+    config = {:'error_collector.attributes.include' => 'request_uri'}
+    txn_options = {
+      :request => stub(:path => "/foobar")
+    }
+    run_transaction(config, txn_options)
+    
+    refute_error_has_agent_attribute("request_uri")
+  end
+
+  def test_request_uri_not_captured_on_traces_if_only_configured_as_general_attribute
+    config = {:'attributes.include' => 'request_uri'}
+    txn_options = {
+      :request => stub(:path => "/foobar")
+    }
+    run_transaction(config, txn_options)
+
+    refute_transaction_trace_has_agent_attribute("request_uri")
+    refute_error_has_agent_attribute("request_uri")
+    refute_event_has_agent_attribute("request_uri")
+  end
+
+  def test_request_uri_only_included_on_transaction_events_with_attributes_include_wildcard
+    config = { :'attributes.include' => '*',
+               :'transaction_events.attributes.include' => 'request_uri'}
+
+    txn_options = {
+      :request => stub(:path => "/foobar")
+    }
+    run_transaction(config, txn_options)
+
+    assert_event_has_agent_attribute("request_uri", "/foobar")
+    refute_transaction_trace_has_agent_attribute("request_uri")
+    refute_error_has_agent_attribute("request_uri")
+  end
+
+  def test_request_uri_captured_with_wildcard
+    config = {:'transaction_events.attributes.include' => '*'}
+    txn_options = {
+      :request => stub(:path => "/foobar")
+    }
+    run_transaction(config, txn_options)
+
+    assert_event_has_agent_attribute("request_uri", "/foobar")
+  end
+
   def test_http_response_code_excluded_in_txn_events_when_disabled
     with_config(:'transaction_events.attributes.exclude' => 'httpResponseCode') do
       in_web_transaction do |txn|

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

@@ -11,7 +11,7 @@ class UtilizationDataCollectionTest < Minitest::Test
   def test_sends_all_utilization_data_on_connect
     expected = {
       "hostname" => "host",
-      "metadata_version" => 1,
+      "metadata_version" => 2,
       "logical_processors" => 5,
       "total_ram_mib" => 128,
       "vendors" => {
@@ -46,7 +46,7 @@ class UtilizationDataCollectionTest < Minitest::Test
   def test_omits_sending_vendor_data_on_connect_when_not_available
      expected = {
       "hostname" => "host",
-      "metadata_version" => 1,
+      "metadata_version" => 2,
       "logical_processors" => 5,
       "total_ram_mib" => 128
     }
@@ -63,13 +63,6 @@ class UtilizationDataCollectionTest < Minitest::Test
     assert_equal expected, single_connect_posted.utilization
   end
 
-  def test_utilization_data_not_sent_when_disabled
-    with_config :disable_utilization => true do
-      setup_agent
-      assert_nil single_connect_posted.utilization, "Expected utilization data to be nil"
-    end
-  end
-
   def with_fake_metadata_service
     metadata_service = NewRelic::FakeInstanceMetadataService.new
     metadata_service.run

data/test/multiverse/suites/rails/Envfile

@@ -1,6 +1,6 @@
 if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
   gemfile <<-RB
-    gem 'rails', '5.0.0beta3'
+    gem 'rails', '5.0.0.rc1'
     gem 'haml', :require => false
     gem 'minitest', '5.2.3'
   RB

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

@@ -0,0 +1,81 @@
+# 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
+  require 'action_cable'
+rescue LoadError
+end
+
+if defined?(ActionCable::Channel)
+
+require 'stringio'
+require 'logger'
+require 'json'
+
+class ActionCableTest < Minitest::Test
+include MultiverseHelpers
+
+  class TestConnection
+    attr_reader :transmissions, :identifiers, :logger
+
+    def initialize
+      @transmissions = []
+      @identifiers = []
+      @logger = Logger.new StringIO.new
+    end
+
+    def transmit data
+      @transmissions << data
+    end
+
+    def last_transmission
+      JSON.parse @transmissions.last
+    end
+  end
+
+  class TestChannel < ActionCable::Channel::Base
+    def test_action data
+      transmit data['content']
+    end
+
+    def boom data
+      raise StandardError.new("Boom!")
+    end
+  end
+
+  setup_and_teardown_agent do
+    @connection = TestConnection.new
+    @channel = TestChannel.new @connection, "{id: 1}"
+  end
+
+  def test_creates_trace
+    @channel.perform_action({ 'action' => :test_action, 'content' => 'hello' })
+
+    last_sample = NewRelic::Agent.instance.transaction_sampler.last_sample
+    assert_equal('Controller/ActionCable/ActionCableTest::TestChannel/test_action', last_sample.transaction_name)
+  end
+
+  def test_creates_web_transaction
+    @channel.perform_action({ 'action'=> :test_action, 'content' => 'hello' })
+
+    expected_metrics = {
+      'HttpDispatcher' => { :call_count => 1 },
+      'Controller/ActionCable/ActionCableTest::TestChannel/test_action' => { :call_count => 1}
+    }
+
+    assert_metrics_recorded expected_metrics
+  end
+
+  def test_action_with_error_is_noticed_by_agent
+    @channel.perform_action({ 'action'=> :boom }) rescue nil
+
+    error_trace = last_traced_error
+
+    assert_equal "StandardError", error_trace.exception_class_name
+    assert_equal "Boom!", error_trace.message
+    assert_equal "Controller/ActionCable/ActionCableTest::TestChannel/boom", error_trace.path
+  end
+end
+
+end

data/test/new_relic/agent/agent_test.rb

@@ -311,7 +311,6 @@ module NewRelic
       def test_connect_does_not_retry_if_keep_retrying_false
         @agent.service.expects(:connect).once.raises(Timeout::Error)
         @agent.send(:connect, :keep_retrying => false)
-        assert(@agent.disconnected?)
       end
 
       def test_connect_does_not_retry_on_license_error

data/test/new_relic/agent/hash_extensions_test.rb

@@ -31,4 +31,29 @@ class HashExtensionsTest < Minitest::Test
     refute_same arg, result
     assert_includes arg.keys, :foo
   end
-end
+
+  def test_symbolize_keys_in_object_with_nested_hash
+    hash = {"foo" => {"bar" => [{"baz" => "qux"}, "quux"]}}
+    expected = {:foo => {:bar => [{:baz => "qux"}, "quux"]}}
+
+    actual = NewRelic::Agent::HashExtensions.symbolize_keys_in_object(hash)
+
+    assert_equal expected, actual
+  end
+
+  def test_symbolize_keys_in_object_with_array
+    array = ["foo", {"bar" => [{"baz" => "qux"}, "quux"]}]
+    expected = ["foo", {:bar => [{:baz => "qux"}, "quux"]}]
+
+    actual = NewRelic::Agent::HashExtensions.symbolize_keys_in_object(array)
+
+    assert_equal expected, actual
+  end
+
+  def test_symbolize_keys_in_object_does_not_mutate_argument
+    arg = {"foo" => "bar"}
+    result = NewRelic::Agent::HashExtensions.symbolize_keys_in_object(arg)
+    refute_same arg, result
+    assert_includes arg.keys, "foo"
+  end
+end

data/test/new_relic/agent/instrumentation/action_cable_subscriber_test.rb

@@ -0,0 +1,124 @@
+# 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?(::Rails) && ::Rails::VERSION::MAJOR.to_i >= 5
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+require 'new_relic/agent/instrumentation/action_cable_subscriber'
+
+
+module NewRelic
+  module Agent
+    module Instrumentation
+      class ActionCableSubscriberTest < Minitest::Test
+
+        def setup
+          freeze_time
+          @subscriber = ActionCableSubscriber.new
+
+          NewRelic::Agent.drop_buffered_data
+          @stats_engine = NewRelic::Agent.instance.stats_engine
+          @stats_engine.clear_stats
+          NewRelic::Agent.manual_start
+          NewRelic::Agent::TransactionState.tl_clear_for_testing
+        end
+
+        def teardown
+          NewRelic::Agent.shutdown
+          @stats_engine.clear_stats
+        end
+
+        def test_creates_web_transaction
+          @subscriber.start('perform_action.action_cable', :id, payload_for_perform_action)
+          assert NewRelic::Agent::TransactionState.tl_get.in_web_transaction?
+          advance_time(1.0)
+          @subscriber.finish('perform_action.action_cable', :id, payload_for_perform_action)
+
+          assert_equal('Controller/ActionCable/TestChannel/test_action',
+                       NewRelic::Agent.instance.transaction_sampler.last_sample.transaction_name)
+          assert_equal('Controller/ActionCable/TestChannel/test_action',
+                       NewRelic::Agent.instance.transaction_sampler.last_sample.root_node.called_nodes[0].metric_name)
+        end
+
+        def test_records_apdex_metrics
+          @subscriber.start('perform_action.action_cable', :id, payload_for_perform_action)
+          advance_time(1.5)
+          @subscriber.finish('perform_action.action_cable', :id, payload_for_perform_action)
+
+          expected_values = { :apdex_f => 0, :apdex_t => 1, :apdex_s => 0 }
+          assert_metrics_recorded(
+            'Apdex/ActionCable/TestChannel/test_action' => expected_values,
+            'Apdex' => expected_values
+          )
+        end
+
+        def test_sets_default_transaction_name_on_start
+          @subscriber.start('perform_action.action_cable', :id, payload_for_perform_action)
+          assert_equal 'Controller/ActionCable/TestChannel/test_action', NewRelic::Agent::Transaction.tl_current.best_name
+        ensure
+          @subscriber.finish('perform_action.action_cable', :id, payload_for_perform_action)
+        end
+
+        def test_sets_default_transaction_keeps_name_through_stop
+          @subscriber.start('perform_action.action_cable', :id, payload_for_perform_action)
+          txn = NewRelic::Agent::Transaction.tl_current
+          @subscriber.finish('perform_action.action_cable', :id, payload_for_perform_action)
+          assert_equal 'Controller/ActionCable/TestChannel/test_action', txn.best_name
+        end
+
+        def test_sets_transaction_name
+          @subscriber.start('perform_action.action_cable', :id, payload_for_perform_action)
+          NewRelic::Agent.set_transaction_name('something/else')
+          assert_equal 'Controller/ActionCable/something/else', NewRelic::Agent::Transaction.tl_current.best_name
+        ensure
+          @subscriber.finish('perform_action.action_cable', :id, payload_for_perform_action)
+        end
+
+        def test_sets_transaction_name_holds_through_stop
+          @subscriber.start('perform_action.action_cable', :id, payload_for_perform_action)
+          txn = NewRelic::Agent::Transaction.tl_current
+          NewRelic::Agent.set_transaction_name('something/else')
+          @subscriber.finish('perform_action.action_cable', :id, payload_for_perform_action)
+          assert_equal 'Controller/ActionCable/something/else', txn.best_name
+        end
+
+        def test_creates_tt_node_for_transmit
+          @subscriber.start('perform_action.action_cable', :id, payload_for_perform_action)
+          assert NewRelic::Agent::TransactionState.tl_get.in_web_transaction?
+          @subscriber.start('transmit.action_cable', :id, payload_for_transmit)
+          advance_time(1.0)
+          @subscriber.finish('transmit.action_cable', :id, payload_for_transmit)
+          @subscriber.finish('perform_action.action_cable', :id, payload_for_perform_action)
+
+          sample = NewRelic::Agent.instance.transaction_sampler.last_sample
+
+          assert_equal('Controller/ActionCable/TestChannel/test_action', sample.transaction_name)
+          metric_name = 'Ruby/ActionCable/TestChannel/transmit'
+          refute_nil(find_node_with_name(sample, metric_name), "Expected trace to have node with name: #{metric_name}")
+        end
+
+        def test_records_unscoped_metrics_but_does_not_create_trace_for_transmit_outside_of_active_txn
+          @subscriber.start('transmit.action_cable', :id, payload_for_transmit)
+          advance_time(1.0)
+          @subscriber.finish('transmit.action_cable', :id, payload_for_transmit)
+
+          sample = NewRelic::Agent.instance.transaction_sampler.last_sample
+
+          assert_nil sample, "Did not expect a transaction to be created for transmit"
+          assert_metrics_recorded ['Ruby/ActionCable/TestChannel/transmit']
+        end
+
+        def payload_for_perform_action action = 'test_action'
+          {:channel_class => "TestChannel", :action => action.to_sym, :data => {"action"=>"#{action}"}}
+        end
+
+        def payload_for_transmit data = {}, via = nil
+          {:channel_class => "TestChannel", :data => data, :via => via}
+        end
+      end
+    end
+  end
+end
+
+end