newrelic_rpm 3.17.0.325 → 3.17.1.326

data/test/multiverse/suites/redis/redis_instrumentation_test.rb

@@ -34,7 +34,8 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
       "Datastore/Redis/allOther" => { :call_count => 2 },
       "Datastore/Redis/all" => { :call_count => 2 },
       "Datastore/allOther" => { :call_count => 2 },
-      "Datastore/all" => { :call_count => 2 }
+      "Datastore/all" => { :call_count => 2 },
+      "Datastore/instance/Redis/#{NewRelic::Agent::Hostname.get}/6379" => { :call_count => 2 }
     }
 
     assert_metrics_recorded_exclusive(expected, :ignore_filter => /Supportability/)
@@ -63,7 +64,8 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
       "Datastore/Redis/allOther" => { :call_count => 1 },
       "Datastore/Redis/all"=> { :call_count => 1 },
       "Datastore/allOther"=> { :call_count => 1 },
-      "Datastore/all"=> { :call_count => 1 }
+      "Datastore/all"=> { :call_count => 1 },
+      "Datastore/instance/Redis/#{NewRelic::Agent::Hostname.get}/6379" => { :call_count => 1 }
     }
     assert_metrics_recorded(expected)
   end
@@ -78,7 +80,8 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
       "Datastore/Redis/allWeb" => { :call_count => 1 },
       "Datastore/Redis/all"=> { :call_count => 1 },
       "Datastore/allWeb"=> { :call_count => 1 },
-      "Datastore/all"=> { :call_count => 1 }
+      "Datastore/all"=> { :call_count => 1 },
+      "Datastore/instance/Redis/#{NewRelic::Agent::Hostname.get}/6379" => { :call_count => 1 }
     }
     assert_metrics_recorded(expected)
   end
@@ -91,7 +94,8 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
       "Datastore/Redis/allOther" => { :call_count => 1 },
       "Datastore/Redis/all"=> { :call_count => 1 },
       "Datastore/allOther"=> { :call_count => 1 },
-      "Datastore/all"=> { :call_count => 1 }
+      "Datastore/all"=> { :call_count => 1 },
+      "Datastore/instance/Redis/#{NewRelic::Agent::Hostname.get}/6379" => { :call_count => 1 }
     }
     assert_metrics_recorded(expected)
   end
@@ -128,7 +132,8 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
       "Datastore/Redis/allWeb" => { :call_count => 1 },
       "Datastore/Redis/all"=> { :call_count => 1 },
       "Datastore/allWeb"=> { :call_count => 1 },
-      "Datastore/all"=> { :call_count => 1 }
+      "Datastore/all"=> { :call_count => 1 },
+      "Datastore/instance/Redis/#{NewRelic::Agent::Hostname.get}/6379" => { :call_count => 1 }
     }
     assert_metrics_recorded(expected)
   end
@@ -144,7 +149,8 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
       "Datastore/Redis/allOther" => { :call_count => 1 },
       "Datastore/Redis/all" => { :call_count => 1 },
       "Datastore/allOther" => { :call_count => 1 },
-      "Datastore/all" => { :call_count => 1 }
+      "Datastore/all" => { :call_count => 1 },
+      "Datastore/instance/Redis/#{NewRelic::Agent::Hostname.get}/6379" => { :call_count => 1 }
     }
     assert_metrics_recorded_exclusive(expected, :ignore_filter => /Supportability/)
   end
@@ -174,7 +180,8 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
       "Datastore/Redis/allOther" => { :call_count => 1 },
       "Datastore/Redis/all" => { :call_count => 1 },
       "Datastore/allOther" => { :call_count => 1 },
-      "Datastore/all" => { :call_count => 1 }
+      "Datastore/all" => { :call_count => 1 },
+      "Datastore/instance/Redis/#{NewRelic::Agent::Hostname.get}/6379" => { :call_count => 1 }
     }
     assert_metrics_recorded_exclusive(expected, :ignore_filter => /Supportability/)
   end
@@ -208,5 +215,90 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
 
     assert_equal("multi\nset \"darkpact\" \"sorcery\"\nget \"chaos orb\"\nexec", pipeline_node[:statement])
   end
+
+  def test_records_instance_parameters_on_tt_node_for_get
+    in_transaction do
+      @redis.get("foo")
+    end
+
+    tt = last_transaction_trace
+
+    get_node = tt.root_node.called_nodes[0].called_nodes[0]
+    assert_equal(NewRelic::Agent::Hostname.get, get_node[:host])
+    assert_equal('6379', get_node[:port_path_or_id])
+    assert_equal('0', get_node[:database_name])
+  end
+
+  def test_records_hostname_on_tt_node_for_get_with_unix_domain_socket
+    redis = Redis.new
+    redis.client.stubs(:path).returns('/tmp/redis.sock')
+
+    in_transaction do
+      redis.get("foo")
+    end
+
+    tt = last_transaction_trace
+
+    node = tt.root_node.called_nodes[0].called_nodes[0]
+    assert_equal(NewRelic::Agent::Hostname.get, node[:host])
+    assert_equal('/tmp/redis.sock', node[:port_path_or_id])
+  end
+
+  def test_records_instance_parameters_on_tt_node_for_multi
+    in_transaction do
+      @redis.multi do
+        @redis.get("foo")
+      end
+    end
+
+    tt = last_transaction_trace
+
+    node = tt.root_node.called_nodes[0].called_nodes[0]
+    assert_equal(NewRelic::Agent::Hostname.get, node[:host])
+    assert_equal('6379', node[:port_path_or_id])
+    assert_equal('0', node[:database_name])
+  end
+
+  def test_records_hostname_on_tt_node_for_multi_with_unix_domain_socket
+    redis = Redis.new
+    redis.client.stubs(:path).returns('/tmp/redis.sock')
+
+    in_transaction do
+      redis.multi do
+        redis.get("foo")
+      end
+    end
+
+    tt = last_transaction_trace
+
+    node = tt.root_node.called_nodes[0].called_nodes[0]
+    assert_equal(NewRelic::Agent::Hostname.get, node[:host])
+    assert_equal('/tmp/redis.sock', node[:port_path_or_id])
+  end
+
+  def test_records_unknown_unknown_metric_when_error_gathering_instance_data
+    redis = Redis.new
+    redis.client.stubs(:path).raises StandardError.new
+
+    redis.get("foo")
+
+    assert_metrics_recorded('Datastore/instance/Redis/unknown/unknown')
+  end
+
+  def test_instrumentation_returns_expected_values
+    assert_equal 0, @redis.del('foo')
+
+    assert_equal 'OK', @redis.set('foo', 'bar')
+    assert_equal 'bar', @redis.get('foo')
+    assert_equal 1, @redis.del('foo')
+
+    assert_equal ['OK','OK'], @redis.multi { @redis.set('foo', 'bar'); @redis.set('baz', 'bat') }
+    assert_equal ['bar', 'bat'], @redis.multi { @redis.get('foo'); @redis.get('baz') }
+    assert_equal 2, @redis.del('foo', 'baz')
+
+    assert_equal ['OK','OK'], @redis.pipelined { @redis.set('foo', 'bar'); @redis.set('baz', 'bat') }
+    assert_equal ['bar', 'bat'], @redis.pipelined { @redis.get('foo'); @redis.get('baz') }
+    assert_equal 2, @redis.del('foo', 'baz')
+  end
 end
 end

data/test/new_relic/agent/hostname_test.rb

@@ -85,6 +85,29 @@ module NewRelic
         end
       end
 
+      def test_local_predicate_true_when_host_local
+        hosts = %w(localhost 0.0.0.0 127.0.0.1 0:0:0:0:0:0:0:1
+                   0:0:0:0:0:0:0:0 ::1 ::)
+        hosts.each do |host|
+          assert NewRelic::Agent::Hostname.local?(host)
+        end
+      end
+
+      def test_localhost_predicate_false_when_host_nonlocal
+        hosts = %w(drscheffler jonan-show jonan.tm)
+        hosts.each do |host|
+          refute NewRelic::Agent::Hostname.local?(host)
+        end
+      end
+
+      def test_get_external_returns_host_for_localhost
+        assert_equal "Rivendell", NewRelic::Agent::Hostname.get_external("localhost")
+      end
+
+      def test_get_external_returns_argument_for_nonlocalhost
+        assert_equal "drscheffler", NewRelic::Agent::Hostname.get_external("drscheffler")
+      end
+
       def with_dyno_name(dyno_name, config_options)
         with_config(config_options) do
           ENV['DYNO'] = dyno_name

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

@@ -92,6 +92,17 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     refute node.params.key?(:database_name)
   end
 
+  def test_records_unknown_unknown_when_error_gathering_instance_data
+    NewRelic::Agent::Hostname.stubs(:get).raises StandardError.new
+    NewRelic::Agent::Instrumentation::ActiveRecordHelper::InstanceIdentification.stubs(:mysql_default_case?).raises StandardError.new
+    config = {:adapter => 'mysql', :host => "127.0.0.1"}
+    @subscriber.stubs(:active_record_config).returns(config)
+
+    simulate_query
+
+    assert_metrics_recorded("Datastore/instance/MySQL/unknown/unknown")
+  end
+
   def test_records_nothing_if_tracing_disabled
     freeze_time
 

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

@@ -15,6 +15,8 @@ class NewRelic::Agent::Instrumentation::MongodbCommandSubscriberTest < Minitest:
       @started_event.stubs(:command_name).returns('find')
       @started_event.stubs(:database_name).returns('mongodb-test')
       @started_event.stubs(:command).returns({ 'find' => 'users', 'filter' => { 'name' => 'test' }})
+      address = stub('address', :host => "127.0.0.1", :port => 27017)
+      @started_event.stubs(:address).returns(address)
 
       @succeeded_event = mock('succeeded event')
       @succeeded_event.stubs(:operation_id).returns(1)
@@ -22,6 +24,7 @@ class NewRelic::Agent::Instrumentation::MongodbCommandSubscriberTest < Minitest:
 
       @subscriber = NewRelic::Agent::Instrumentation::MongodbCommandSubscriber.new
 
+      NewRelic::Agent::Hostname.stubs(:get).returns("nerd-server")
       @stats_engine = NewRelic::Agent.instance.stats_engine
       @stats_engine.clear_stats
     end
@@ -65,6 +68,40 @@ class NewRelic::Agent::Instrumentation::MongodbCommandSubscriberTest < Minitest:
       simulate_query
     end
 
+    def test_records_instance_metrics_for_tcp_connection
+      simulate_query
+      assert_metrics_recorded('Datastore/instance/MongoDB/nerd-server/27017')
+    end
+
+    def test_records_instance_metrics_for_unix_domain_socket
+      address = stub('address', :host => "/tmp/mongodb-27017.sock", :port => nil)
+      @started_event.stubs(:address).returns(address)
+      simulate_query
+      assert_metrics_recorded('Datastore/instance/MongoDB/nerd-server//tmp/mongodb-27017.sock')
+    end
+
+    def test_records_unknown_unknown_metric_when_error_gathering_instance_data
+      @started_event.stubs(:address).returns(nil)
+      simulate_query
+      assert_metrics_recorded('Datastore/instance/MongoDB/unknown/unknown')
+    end
+
+    def test_records_tt_segment_parameters_for_datastore_instance
+      in_transaction do
+        simulate_query
+      end
+
+      tt = last_transaction_trace
+
+      node = find_node_with_name_matching tt, /^Datastore\//
+
+      assert_equal(NewRelic::Agent::Hostname.get, node[:host])
+      assert_equal('27017', node[:port_path_or_id])
+      assert_equal('mongodb-test', node[:database_name])
+    end
+
+
+
     def simulate_query
       @subscriber.started(@started_event)
       advance_time @succeeded_event.duration

data/test/new_relic/agent/transaction/datastore_segment_test.rb

@@ -211,6 +211,18 @@ module NewRelic
             segment.finish
           end
         end
+
+        def test_notice_nosql_statement
+          statement = "set mykey 123"
+          in_transaction do
+            segment = NewRelic::Agent::Transaction.start_datastore_segment "Redis", "set"
+            segment.notice_nosql_statement statement
+            advance_time 2.0
+
+            Agent.instance.transaction_sampler.expects(:notice_nosql_statement).with(statement, 2.0)
+            segment.finish
+          end
+        end
       end
     end
   end

data/test/new_relic/agent/transaction/tracing_test.rb

@@ -114,6 +114,14 @@ module NewRelic
           assert_nil segment.transaction, "Did not expect segment to associated with a transaction"
           refute_metrics_recorded ["Custom/segment/method", "Custom/all"]
         end
+
+        def test_current_segment_in_transaction
+          in_transaction "test_txn" do |txn|
+            segment = Transaction.start_datastore_segment "SQLite", "insert", "Blog"
+            assert_equal segment, txn.current_segment
+            segment.finish
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.17.0.325
+  version: 3.17.1.326
 platform: ruby
 authors:
 - Tim Krajcar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -268,6 +268,7 @@ files:
 - lib/new_relic/agent/instrumentation/httpclient.rb
 - lib/new_relic/agent/instrumentation/ignore_actions.rb
 - lib/new_relic/agent/instrumentation/memcache.rb
+- lib/new_relic/agent/instrumentation/memcache/dalli.rb
 - lib/new_relic/agent/instrumentation/merb/controller.rb
 - lib/new_relic/agent/instrumentation/merb/errors.rb
 - lib/new_relic/agent/instrumentation/metric_frame.rb