newrelic_rpm 4.1.0.333 → 4.2.0.334

data/test/fixtures/cross_agent_tests/url_clean.json

@@ -1,15 +0,0 @@
-[
-  {"testname":"only domain",    "expected":"domain.com",                "input":"domain.com"},
-  {"testname":"domain path",    "expected":"domain.com/a/b/c",          "input":"domain.com/a/b/c"},
-  {"testname":"port",           "expected":"domain.com:port/a/b/c",     "input":"domain.com:port/a/b/c"},
-  {"testname":"user",           "expected":"domain.com/a/b/c",          "input":"user@domain.com/a/b/c"},
-  {"testname":"user pw",        "expected":"domain.com/a/b/c",          "input":"user:password@domain.com/a/b/c"},
-  {"testname":"scheme domain",  "expected":"p://domain.com",            "input":"p://domain.com"},
-  {"testname":"scheme path",    "expected":"p://domain.com/a/b/c",      "input":"p://domain.com/a/b/c"},
-  {"testname":"scheme port",    "expected":"p://domain.com:port/a/b/c", "input":"p://domain.com:port/a/b/c"},
-  {"testname":"scheme user",    "expected":"p://domain.com/a/b/c",      "input":"p://user@domain.com/a/b/c"},
-  {"testname":"scheme user pw", "expected":"p://domain.com/a/b/c",      "input":"p://user:password@domain.com/a/b/c"},
-  {"testname":"fragment",       "expected":"p://domain.com/a/b/c",      "input":"p://user:password@domain.com/a/b/c#fragment"},
-  {"testname":"query",          "expected":"p://domain.com/a/b/c",      "input":"p://user:password@domain.com/a/b/c?query=yes"},
-  {"testname":"semi-colon",     "expected":"p://domain.com/a/b/c",      "input":"p://user:password@domain.com/a/b/c;semi=yes"}
-]

data/test/fixtures/cross_agent_tests/url_domain_extraction.json

@@ -1,35 +0,0 @@
-[
-  {"expected":"domain",    "input":"scheme://domain:port/path?query_string#fragment_id"},
-  {"expected":"0.0.0.0",   "input":"scheme://0.0.0.0:port/path?query_string#fragment_id"},
-  {"expected":"localhost", "input":"scheme://localhost:port/path?query_string#fragment_id"},
-  {"expected":"127.0.0.1", "input":"scheme://127.0.0.1:port/path?query_string#fragment_id"},
-
-  {"expected":"0.0.0.0",   "input":"scheme://0.0.0.0:8087/path?query_string#fragment_id"},
-  {"expected":"localhost", "input":"scheme://localhost:8087/path?query_string#fragment_id"},
-  {"expected":"127.0.0.1", "input":"scheme://127.0.0.1:8087/path?query_string#fragment_id"},
-
-  {"expected":"a.b", "input":"a.b"},
-  {"expected":"a.b", "input":"user@a.b"},
-  {"expected":"a.b", "input":"user:pass@a.b"},
-  {"expected":"a.b", "input":"a.b:123"},
-  {"expected":"a.b", "input":"user@a.b:123"},
-  {"expected":"a.b", "input":"user:pass@a.b:123"},
-  {"expected":"a.b", "input":"a.b/c/d?e=f"},
-  {"expected":"a.b", "input":"user@a.b/c/d?e=f"},
-  {"expected":"a.b", "input":"user:pass@a.b/c/d?e=f"},
-  {"expected":"a.b", "input":"a.b:123/c/d?e=f"},
-  {"expected":"a.b", "input":"user@a.b:123/c/d?e=f"},
-  {"expected":"a.b", "input":"user:pass@a.b:123/c/d?e=f"},
-  {"expected":"a.b", "input":"p://a.b"},
-  {"expected":"a.b", "input":"p://user@a.b"},
-  {"expected":"a.b", "input":"p://user:pass@a.b"},
-  {"expected":"a.b", "input":"p://a.b:123"},
-  {"expected":"a.b", "input":"p://user@a.b:123"},
-  {"expected":"a.b", "input":"p://user:pass@a.b:123"},
-  {"expected":"a.b", "input":"p://a.b/c/d?e=f"},
-  {"expected":"a.b", "input":"p://user@a.b/c/d?e=f"},
-  {"expected":"a.b", "input":"p://user:pass@a.b/c/d?e=f"},
-  {"expected":"a.b", "input":"p://a.b:123/c/d?e=f"},
-  {"expected":"a.b", "input":"p://user@a.b:123/c/d?e=f"},
-  {"expected":"a.b", "input":"p://user:pass@a.b:123/c/d?e=f"}
-]

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

@@ -1,13 +0,0 @@
-# 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

@@ -1,132 +0,0 @@
-[
-  {
-    "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/helpers/exceptions.rb

@@ -1,16 +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.
-
-module NewRelic
-  module TestHelpers
-    module Exceptions
-      class TestError < StandardError; end
-      class IgnoredError < StandardError; end
-      class ServerIgnoredError < StandardError; end
-      class TestRuntimeError < RuntimeError; end
-      class ParentException < Exception; end
-      class ChildException < ParentException; end
-    end
-  end
-end

data/test/helpers/file_searching.rb

@@ -1,28 +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.
-
-module NewRelic
-  module TestHelpers
-    module FileSearching
-      def all_rb_files
-        pattern = File.expand_path(gem_root + "/**/*.{rb,rhtml}")
-        Dir[pattern]
-      end
-
-      def all_rb_and_js_files
-        pattern = File.expand_path(gem_root + "/**/*.{rb,js}")
-        Dir[pattern]
-      end
-
-      def all_files
-        pattern = File.expand_path(gem_root + "/**/*")
-        Dir[pattern]
-      end
-
-      def gem_root
-        File.expand_path(File.dirname(__FILE__) + "/../../")
-      end
-    end
-  end
-end

data/test/helpers/logging.rb

@@ -1,37 +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.
-
-def with_verbose_logging
-  orig_logger = NewRelic::Agent.logger
-  $stderr.puts '', '---', ''
-  new_logger = NewRelic::Agent::AgentLogger.new('', Logger.new($stderr) )
-  NewRelic::Agent.logger = new_logger
-
-  with_config(:log_level => 'debug') do
-    yield
-  end
-ensure
-  NewRelic::Agent.logger = orig_logger
-end
-
-# Need to be a bit sloppy when testing against the logging--let everything
-# through, but check we (at least) get our particular message we care about
-def expects_logging(level, *with_params)
-  ::NewRelic::Agent.logger.stubs(level)
-  ::NewRelic::Agent.logger.expects(level).with(*with_params).once
-end
-
-def expects_no_logging(level)
-  ::NewRelic::Agent.logger.expects(level).never
-end
-
-# Sometimes need to test cases where we muddle with the global logger
-# If so, use this method to ensure it gets restored after we're done
-def without_logger
-  logger = ::NewRelic::Agent.logger
-  ::NewRelic::Agent.logger = nil
-  yield
-ensure
-  ::NewRelic::Agent.logger = logger
-end

data/test/helpers/minitest.rb

@@ -1,50 +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.
-
-unless defined?(Minitest::Test)
-  Minitest::Test = MiniTest::Unit::TestCase
-end
-
-# Set up a watcher for leaking agent threads out of tests.  It'd be nice to
-# disable the threads everywhere, but not all tests have newrelic.yml loaded to
-# us to rely on, so instead we'll just watch for it.
-class Minitest::Test
-
-  def before_setup
-    if self.respond_to?(:name)
-      test_method_name = self.name
-    else
-      test_method_name = self.__name__
-    end
-
-    NewRelic::Agent.logger.info("*** #{self.class}##{test_method_name} **")
-
-    @__thread_count = ruby_threads.count
-    super
-  end
-
-  def after_teardown
-    unfreeze_time
-
-    threads = ruby_threads
-    if @__thread_count != threads.count
-      backtraces = threads.map do |thread|
-        trace = Hometown.for(thread)
-        trace.backtrace.join("\n    ")
-      end.join("\n\n")
-
-      fail "Thread count changed in this test from #{@__thread_count} to #{threads.count}\n#{backtraces}"
-    end
-
-    super
-  end
-
-  # We only want to count threads that were spun up from Ruby (i.e.
-  # Thread.new) JRuby has system threads we don't care to track.
-  def ruby_threads
-    Thread.list.select { |t| Hometown.for(t) }
-  end
-
-end
-

data/test/helpers/misc.rb

@@ -1,87 +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.
-
-def default_service(stubbed_method_overrides = {})
-  service = stub
-  stubbed_method_defaults = {
-    :connect => {},
-    :shutdown => nil,
-    :agent_id= => nil,
-    :agent_id => nil,
-    :collector => stub_everything,
-    :request_timeout= =>  nil,
-    :metric_data => nil,
-    :error_data => nil,
-    :transaction_sample_data => nil,
-    :sql_trace_data => nil,
-    :get_agent_commands => [],
-    :agent_command_results => nil,
-    :analytic_event_data => nil,
-    :valid_to_marshal? => true
-  }
-
-  service.stubs(stubbed_method_defaults.merge(stubbed_method_overrides))
-
-  # When session gets called yield to the given block.
-  service.stubs(:session).yields
-  service
-end
-
-def fixture_tcp_socket( response )
-  # Don't actually talk to Google.
-  socket = stub("socket") do
-    stubs(:closed?).returns(false)
-    stubs(:close)
-    stubs(:setsockopt)
-
-    # Simulate a bunch of socket-ey stuff since Mocha doesn't really
-    # provide any other way to do it
-    class << self
-      attr_accessor :response, :write_checker
-    end
-
-    def self.check_write
-      self.write_checker = Proc.new
-    end
-
-    def self.write( buf )
-      self.write_checker.call( buf ) if self.write_checker
-      buf.length
-    end
-
-    def self.sysread( size, buf='' )
-      @data ||= response.to_s
-      raise EOFError if @data.empty?
-      buf.replace @data.slice!( 0, size )
-      buf
-    end
-    class << self
-      alias_method :read_nonblock, :sysread
-    end
-
-  end
-
-  socket.response = response
-  TCPSocket.stubs( :open ).returns( socket )
-
-  return socket
-end
-
-def dummy_mysql_explain_result(hash=nil)
-  hash ||= {
-    'Id' => '1',
-    'Select Type' => 'SIMPLE',
-    'Table' => 'sandwiches',
-    'Type' => 'range',
-    'Possible Keys' => 'PRIMARY',
-    'Key' => 'PRIMARY',
-    'Key Length' => '4',
-    'Ref' => '',
-    'Rows' => '1',
-    'Extra' => 'Using index'
-  }
-  explain_result = mock('explain result')
-  explain_result.stubs(:each_hash).yields(hash)
-  explain_result
-end

data/test/helpers/mongo_metric_builder.rb

@@ -1,34 +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 'new_relic/agent/datastores/mongo/metric_translator'
-
-module NewRelic
-  module TestHelpers
-    module MongoMetricBuilder
-      def build_test_metrics(name, instance_metrics=false)
-        host = nil
-        port = nil
-
-        if instance_metrics
-          host = NewRelic::Agent::Hostname.get
-          port = 27017
-        end
-
-        NewRelic::Agent::Datastores::MetricHelper.metrics_for(
-          "MongoDB", name, @collection_name, host, port)
-      end
-
-      def metrics_with_attributes(metrics, attributes = { :call_count => 1 })
-        metric_attributes = {}
-
-        metrics.each do |metric|
-          metric_attributes[metric] = attributes.dup
-        end
-
-        metric_attributes
-      end
-    end
-  end
-end