newrelic_rpm 3.17.1.326 → 3.17.2.327

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

@@ -100,6 +100,13 @@ class NewRelic::Agent::Instrumentation::MongodbCommandSubscriberTest < Minitest:
       assert_equal('mongodb-test', node[:database_name])
     end
 
+    def test_does_not_record_unknown_unknown_metric_when_data_empty
+      address = stub('address', :host => "", :port => "")
+      @started_event.stubs(:address).returns(address)
+      simulate_query
+      assert_metrics_not_recorded('Datastore/instance/MongoDB/unknown/unknown')
+    end
+
 
 
     def simulate_query

data/test/new_relic/agent/new_relic_service_test.rb

@@ -208,13 +208,21 @@ class NewRelicServiceTest < Minitest::Test
     end
   end
 
-  def test_initialize_uses_correct_license_key_settings
+  def test_initialize_uses_license_key_from_config
     with_config(:license_key => 'abcde') do
       service = NewRelic::Agent::NewRelicService.new
-      assert_equal 'abcde', service.instance_variable_get(:@license_key)
+      assert_equal 'abcde', service.send(:license_key)
     end
   end
 
+  def test_initialize_uses_license_key_from_manual_start
+    service = NewRelic::Agent::NewRelicService.new
+    NewRelic::Agent.manual_start :license_key => "geronimo"
+
+    assert_equal 'geronimo', service.send(:license_key)
+    NewRelic::Agent.shutdown
+  end
+
   def test_connect_sets_agent_id_and_config_data
     response = @service.connect
     assert_equal 1, response['agent_run_id']

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

@@ -66,13 +66,13 @@ module NewRelic
         def test_segment_records_expected_metrics_with_instance_identifier
           Transaction.stubs(:recording_web_transaction?).returns(true)
 
-          segment = DatastoreSegment.new "SQLite", "select", nil, "localhost", "1337807"
+          segment = DatastoreSegment.new "SQLite", "select", nil, "jonan-01", "1337807"
           segment.start
           advance_time 1
           segment.finish
 
           assert_metrics_recorded [
-            "Datastore/instance/SQLite/localhost/1337807",
+            "Datastore/instance/SQLite/jonan-01/1337807",
             "Datastore/operation/SQLite/select",
             "Datastore/SQLite/allWeb",
             "Datastore/SQLite/all",
@@ -81,16 +81,63 @@ module NewRelic
           ]
         end
 
+        def test_segment_records_expected_metrics_with_instance_identifier_host_only
+          Transaction.stubs(:recording_web_transaction?).returns(true)
+
+          segment = DatastoreSegment.new "SQLite", "select", nil, "jonan-01"
+          segment.start
+          advance_time 1
+          segment.finish
+
+          assert_metrics_recorded [
+            "Datastore/instance/SQLite/jonan-01/unknown",
+            "Datastore/operation/SQLite/select",
+            "Datastore/SQLite/allWeb",
+            "Datastore/SQLite/all",
+            "Datastore/allWeb",
+            "Datastore/all"
+          ]
+        end
+
+        def test_segment_records_expected_metrics_with_instance_identifier_port_only
+          Transaction.stubs(:recording_web_transaction?).returns(true)
+
+          segment = DatastoreSegment.new "SQLite", "select", nil, nil, 1337807
+          segment.start
+          advance_time 1
+          segment.finish
+
+          assert_metrics_recorded [
+            "Datastore/instance/SQLite/unknown/1337807",
+            "Datastore/operation/SQLite/select",
+            "Datastore/SQLite/allWeb",
+            "Datastore/SQLite/all",
+            "Datastore/allWeb",
+            "Datastore/all"
+          ]
+        end
+
+        def test_segment_does_not_record_expected_metrics_with_empty_data
+          Transaction.stubs(:recording_web_transaction?).returns(true)
+
+          segment = DatastoreSegment.new "SQLite", "select", nil
+          segment.start
+          advance_time 1
+          segment.finish
+
+          assert_metrics_not_recorded "Datastore/instance/SQLite/unknown/unknown"
+        end
+
         def test_segment_does_not_record_instance_id_metrics_when_disabled
           with_config(:'datastore_tracer.instance_reporting.enabled' => false) do
             Transaction.stubs(:recording_web_transaction?).returns(true)
 
-            segment = DatastoreSegment.new "SQLite", "select", nil, "localhost/1337807"
+            segment = DatastoreSegment.new "SQLite", "select", nil, "jonan-01", "1337807"
             segment.start
             advance_time 1
             segment.finish
 
-            assert_metrics_not_recorded "Datastore/instance/SQLite/localhost/1337807"
+            assert_metrics_not_recorded "Datastore/instance/SQLite/jonan-01/1337807"
           end
         end
 
@@ -98,7 +145,7 @@ module NewRelic
           segment = nil
 
           in_transaction do
-            segment = NewRelic::Agent::Transaction.start_datastore_segment "SQLite", "select", nil, "localhost", "1337807"
+            segment = NewRelic::Agent::Transaction.start_datastore_segment "SQLite", "select", nil, "jonan-01", "1337807"
             advance_time 1
             segment.finish
           end
@@ -106,10 +153,21 @@ module NewRelic
           sample = NewRelic::Agent.agent.transaction_sampler.last_sample
           node = find_node_with_name(sample, segment.name)
 
-          assert_equal "localhost", node.params[:host]
+          assert_equal "jonan-01", node.params[:host]
           assert_equal "1337807", node.params[:port_path_or_id]
         end
 
+        def test_localhost_replaced_by_system_hostname
+          NewRelic::Agent::Hostname.stubs(:get).returns("jonan.gummy_planet")
+
+          %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 ::].each do |host|
+            segment = NewRelic::Agent::Transaction.start_datastore_segment "SQLite", "select", "blogs", host, "1337"
+            segment.finish
+
+            assert_equal "jonan.gummy_planet", segment.host
+          end
+        end
+
         def test_does_not_add_instance_identifier_segment_parameter_when_disabled
           with_config(:'datastore_tracer.instance_reporting.enabled' => false) do
             segment = nil
@@ -223,6 +281,38 @@ module NewRelic
             segment.finish
           end
         end
+
+        def test_set_instance_info_with_valid_data
+          segment = DatastoreSegment.new "SQLite", "select", nil
+          segment.set_instance_info 'jonan.gummy_planet', 1337807
+          assert_equal 'jonan.gummy_planet', segment.host
+          assert_equal '1337807', segment.port_path_or_id
+        end
+
+        def test_set_instance_info_with_empty_host
+          segment = DatastoreSegment.new "SQLite", "select", nil
+          segment.set_instance_info nil, 1337807
+          assert_equal 'unknown', segment.host
+          assert_equal '1337807', segment.port_path_or_id
+        end
+
+        def test_set_instance_info_with_empty_port_path_or_id
+          segment = DatastoreSegment.new "SQLite", "select", nil
+          segment.set_instance_info 'jonan.gummy_planet', nil
+          assert_equal 'jonan.gummy_planet', segment.host
+          assert_equal 'unknown', segment.port_path_or_id
+        end
+
+        def test_set_instance_info_with_empty_data
+          segment = DatastoreSegment.new "SQLite", "select", nil
+          segment.set_instance_info nil, nil
+          assert_nil segment.host
+          assert_nil segment.port_path_or_id
+
+          segment.set_instance_info '', ''
+          assert_nil segment.host
+          assert_nil segment.port_path_or_id
+        end
       end
     end
   end

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

@@ -91,6 +91,15 @@ module NewRelic
           end
         end
 
+        def test_start_datastore_segment_provides_defaults_without_params
+            segment = Transaction.start_datastore_segment
+            segment.finish
+
+            assert_equal "Datastore/operation/Unknown/other", segment.name
+            assert_equal "Unknown", segment.product
+            assert_equal "other", segment.operation
+        end
+
         def test_start_segment_with_tracing_disabled_in_transaction
           segment = nil
           in_transaction "test_txn" do |txn|

data/test/new_relic/agent_test.rb

@@ -451,7 +451,7 @@ module NewRelic
         end
 
         if a.respond_to? :constants
-          stack.concat a.constants.map { |c| a.const_get c }.select do |c|
+          consts = a.constants.map { |c| a.const_get c }.select do |c|
             if valid.include?(c.class) && !c.ancestors.include?(Minitest::Test)
               assert_instance_of String, c.name
               c.name.start_with?(a.name)
@@ -459,6 +459,7 @@ module NewRelic
               false
             end
           end
+          stack.concat consts
         end
 
         break if stack.empty?

data/test/new_relic/latest_changes_test.rb

@@ -14,7 +14,7 @@ module NewRelic
       # the gem post-installation, since that's run in our gem's context. So
       # just fix up the pathing in the test for finding default changelog.
       if RUBY_VERSION < '1.9.1'
-        NewRelic::LatestChanges.stubs(:default_changelog).returns(File.join(File.dirname(__FILE__), '..', '..', 'CHANGELOG'))
+        NewRelic::LatestChanges.stubs(:default_changelog).returns(File.join(File.dirname(__FILE__), '..', '..', 'CHANGELOG.md'))
       end
     end
 

data/test/new_relic/rack/error_collector_test.rb

@@ -30,6 +30,10 @@ module NewRelic::Rack
       assert NewRelic::Agent.instance.error_collector.enabled?
     end
 
+    def teardown
+      NewRelic::Agent.drop_buffered_data
+    end
+
     def test_notice_and_reraise_errors
       assert_raises RuntimeError do
         get '/'

data/test/script/before_install/gemstash_mirror.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# our testing kicks off > 180 travis "builds" so let's use a local gemstash
+# mirror for all of our rubygems needs if we are in our internal testing env
+
+set -ev
+
+if [ -n "$GEMSTASH_MIRROR" ]; then
+  bundle config mirror.https://rubygems.org $GEMSTASH_MIRROR
+fi

data/test/script/before_install/jruby_bundler.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# currently there's an incompatibility between Bundler 1.13 with JRuby 1.7, see Bundler issue #4975
+# so we revert bundler versions to 1.12.5 on that version
+#
+# further digging suggests the bundler/jruby problem was actually a jruby bug,
+# apparently fixed in 1.7.26. if we upgrade our older jruby testing, which seems
+# unlikely at this point, be sure to change this uninstall line to point to the
+# correct location.
+#
+# TODO: remove when older rubies are deprecated, RUBY-1668
+
+set -ev
+
+if [[ `ruby --version` =~ ^jruby\ 1\. ]]; then
+  gem uninstall -x -i $HOME/.rvm/gems/jruby-1.7.23@global bundler
+  if [ -n "$GEMSTASH_MIRROR" ]; then
+    gem install --clear-sources --source $GEMSTASH_MIRROR bundler -v 1.12.5
+  else
+    gem install bundler -v 1.12.5
+  fi
+fi

data/test/script/before_install/revert_rubygems.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# revert to older rubygems version for ruby versions prior to 2.0
+#
+# TODO: remove when older rubies are deprecated, RUBY-1668
+
+set -ev
+
+if [[ `ruby --version` =~ ^ruby\ 1\. ]]; then
+  if [ -n "$GEMSTASH_MIRROR" ]; then
+    gem update --clear-sources --source $GEMSTASH_MIRROR --system 1.8.25
+  else
+    gem update --system 1.8.25
+  fi
+fi

data/test/script/before_script/install_mongodb.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Travis default Mongo is currently 2.4.14, which has some instrumentation differences with >= 2.6.
+
+set -ev
+
+if [[ $GROUP == "database" ]]; then
+  wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -O /tmp/mongodb.tgz
+  mkdir -p /tmp/mongodb/data
+  tar -xvf /tmp/mongodb.tgz -C /tmp/mongodb
+  /tmp/mongodb/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath /tmp/mongodb/data --bind_ip 127.0.0.1 --noauth &> /dev/null &
+fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.17.1.326
+  version: 3.17.2.327
 platform: ruby
 authors:
 - Tim Krajcar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -154,7 +154,7 @@ executables:
 - nrdebug
 extensions: []
 extra_rdoc_files:
-- CHANGELOG
+- CHANGELOG.md
 - LICENSE
 - README.md
 - CONTRIBUTING.md
@@ -164,7 +164,7 @@ files:
 - ".project"
 - ".travis.yml"
 - ".yardopts"
-- CHANGELOG
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -251,6 +251,7 @@ files:
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record.rb
 - lib/new_relic/agent/instrumentation/active_record_4.rb
+- lib/new_relic/agent/instrumentation/active_record_5.rb
 - lib/new_relic/agent/instrumentation/active_record_helper.rb
 - lib/new_relic/agent/instrumentation/active_record_subscriber.rb
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
@@ -550,6 +551,7 @@ files:
 - test/fixtures/cross_agent_tests/data_transport/data_transport.json
 - test/fixtures/cross_agent_tests/data_transport/data_transport.md
 - test/fixtures/cross_agent_tests/datastores/README.md
+- test/fixtures/cross_agent_tests/datastores/datastore_api.json
 - test/fixtures/cross_agent_tests/datastores/datastore_instances.json
 - test/fixtures/cross_agent_tests/docker_container_id/README.md
 - test/fixtures/cross_agent_tests/docker_container_id/cases.json
@@ -981,6 +983,7 @@ files:
 - test/new_relic/agent/agent_test.rb
 - test/new_relic/agent/agent_test_controller.rb
 - test/new_relic/agent/apdex_from_server_test.rb
+- test/new_relic/agent/api_tests/datastore_api_test.rb
 - test/new_relic/agent/attribute_filter_test.rb
 - test/new_relic/agent/attribute_processing_test.rb
 - test/new_relic/agent/audit_logger_test.rb
@@ -1211,8 +1214,11 @@ files:
 - test/performance/suites/thread_profiling.rb
 - test/performance/suites/trace_execution_scoped.rb
 - test/performance/suites/transaction_tracing.rb
+- test/script/before_install/gemstash_mirror.sh
+- test/script/before_install/jruby_bundler.sh
+- test/script/before_install/revert_rubygems.sh
+- test/script/before_script/install_mongodb.sh
 - test/script/ci.sh
-- test/script/install_mongodb.sh
 - test/script/path_hash.rb
 - test/test_helper.rb
 - ui/helpers/developer_mode_helper.rb

data/test/script/install_mongodb.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz -O /tmp/mongodb.tgz
-mkdir -p /tmp/mongodb/data
-tar -xvf /tmp/mongodb.tgz -C /tmp/mongodb
-/tmp/mongodb/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath /tmp/mongodb/data --bind_ip 127.0.0.1 --noauth &> /dev/null &