newrelic_rpm 3.6.6.147 → 3.6.7.152

data/test/new_relic/{command → cli}/deployments_test.rb

@@ -2,14 +2,15 @@
 # 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'))
-require File.expand_path(File.join(File.dirname(__FILE__),'/../../../lib/new_relic/command'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'new_relic/cli/command'
+require 'new_relic/cli/deployments'
 
-class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
+class NewRelic::Cli::DeploymentsTest < Test::Unit::TestCase
 
   def setup
-    NewRelic::Command::Deployments.class_eval do
-      attr_accessor :messages, :exit_status, :errors, :revision
+    NewRelic::Cli::Deployments.class_eval do
+      attr_accessor :messages, :exit_status, :errors, :revision, :license_key
       def err(message); @errors = @errors ? @errors + message : message; end
       def info(message); @messages = @messages ? @messages + message : message; end
       def just_exit(status=0); @exit_status ||= status; end
@@ -27,20 +28,20 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
   end
   def test_help
     begin
-      NewRelic::Command::Deployments.new "-h"
+      NewRelic::Cli::Deployments.new "-h"
       fail "should have thrown"
-    rescue NewRelic::Command::CommandFailure => c
+    rescue NewRelic::Cli::Command::CommandFailure => c
       assert_match /^Usage/, c.message
     end
   end
   def test_bad_command
-    assert_raise NewRelic::Command::CommandFailure do
-      NewRelic::Command::Deployments.new ["-foo", "bar"]
+    assert_raise NewRelic::Cli::Command::CommandFailure do
+      NewRelic::Cli::Deployments.new ["-foo", "bar"]
     end
   end
   def test_interactive
     mock_the_connection
-    @deployment = NewRelic::Command::Deployments.new(:appname => 'APP',
+    @deployment = NewRelic::Cli::Deployments.new(:appname => 'APP',
                                   :revision => 3838,
                                   :user => 'Bill',
                                   :description => "Some lengthy description")
@@ -54,7 +55,7 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
   def test_command_line_run
     mock_the_connection
     #    @mock_response.expects(:body).returns("<xml>deployment</xml>")
-    @deployment = NewRelic::Command::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")
     assert_nil @deployment.exit_status
     assert_nil @deployment.errors
     assert_equal '3838', @deployment.revision
@@ -69,13 +70,40 @@ class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
 
   def test_error_if_no_license_key
     with_config(:license_key => '') do
-      assert_raise NewRelic::Command::CommandFailure do
-      deployment = NewRelic::Command::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
+      assert_raise NewRelic::Cli::Command::CommandFailure do
+      deployment = NewRelic::Cli::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
         deployment.run
       end
     end
   end
 
+  def test_with_specified_license_key
+    mock_the_connection
+    @deployment = NewRelic::Cli::Deployments.new(:appname => 'APP',
+                                                     :revision => 3838,
+                                                     :user => 'Bill',
+                                                     :description => "Some lengthy description",
+                                                     :license_key => 'b' * 40)
+    assert_nil @deployment.exit_status
+    assert_nil @deployment.errors
+    assert_equal 'b' * 40, @deployment.license_key
+    @deployment.run
+    @deployment = nil
+  end
+
+  def test_with_unspecified_license_key
+    mock_the_connection
+    @deployment = NewRelic::Cli::Deployments.new(:appname => 'APP',
+                                                     :revision => 3838,
+                                                     :user => 'Bill',
+                                                     :description => "Some lengthy description")
+    assert_nil @deployment.exit_status
+    assert_nil @deployment.errors
+    assert_equal 'a' * 40, @deployment.license_key
+    @deployment.run
+    @deployment = nil
+  end
+
   private
 
   def mock_the_connection

data/test/new_relic/control/frameworks/rails_test.rb

@@ -6,8 +6,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'/../../../test_helper
 
 class NewRelic::Control::Frameworks::RailsTest < Test::Unit::TestCase
   def test_install_browser_monitoring
-    require(File.expand_path(File.join(File.dirname(__FILE__),
-                         '/../../../../lib/new_relic/rack/browser_monitoring')))
+    require 'new_relic/rack/browser_monitoring'
     middleware = stub('middleware config')
     config = stub('rails config', :middleware => middleware)
     middleware.expects(:use).with(NewRelic::Rack::BrowserMonitoring)

data/test/new_relic/control_test.rb

@@ -28,7 +28,6 @@ class NewRelic::ControlTest < Test::Unit::TestCase
       assert_equal :test, control.app
     end
     assert_equal :test, control.framework
-    assert_match /test/i, control.local_env.dispatcher_instance_id
     assert("" == NewRelic::Agent.config[:dispatcher].to_s,
            "Expected dispatcher to be empty, but was #{NewRelic::Agent.config[:dispatcher].to_s}")
     assert !NewRelic::Agent.config[:monitor_mode]
@@ -47,7 +46,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   end
 
   def test_info
-    NewRelic::Agent.manual_start(:dispatcher_instance_id => 'test')
+    NewRelic::Agent.manual_start
     if defined?(Rails)
       assert_match /jdbc|postgres|mysql|sqlite/, NewRelic::EnvironmentReport.new["Database adapter"]
     end

data/test/new_relic/dependency_detection_test.rb

@@ -124,4 +124,18 @@ class DependencyDetectionTest < Test::Unit::TestCase
     assert_falsy( ran_second_block )
   end
 
+  def test_defer_should_be_idempotent_when_given_same_name
+    run_count = 0
+
+    2.times do
+      DependencyDetection.defer do
+        named :foobar
+        executes { run_count += 1 }
+      end
+    end
+
+    DependencyDetection.detect!
+
+    assert_equal(1, run_count)
+  end
 end

data/test/new_relic/fake_collector.rb

@@ -27,6 +27,7 @@ module NewRelic
         'sql_trace_data'          => [200, {'return_value' => nil}],
         'transaction_sample_data' => [200, {'return_value' => nil}],
         'error_data'              => [200, {'return_value' => nil}],
+        'profile_data'            => [200, {'return_value' => nil}],
         'shutdown'                => [200, {'return_value' => nil}],
         'analytic_event_data'     => [200, {'return_value' => nil}]
       }

data/test/new_relic/helper_test.rb

@@ -2,11 +2,12 @@
 # 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'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 require 'test/unit'
 require 'newrelic_rpm'
 
+if RUBY_VERSION > '1.8.6'
+
 class HelperTest < Test::Unit::TestCase
 
   def test_json_serializer_method
@@ -25,3 +26,7 @@ class HelperTest < Test::Unit::TestCase
   end
 
 end
+
+else
+  puts "Skipping tests in #{__FILE__} because 1.8.6 character encoding is, um, less than stellar"
+end

data/test/new_relic/http_client_test_cases.rb

@@ -43,7 +43,7 @@ module HttpClientTestCases
     end
 
     @engine = NewRelic::Agent.instance.stats_engine
-    NewRelic::Agent::TransactionInfo.get.guid = TRANSACTION_GUID
+    NewRelic::Agent::TransactionState.get.request_guid = TRANSACTION_GUID
   end
 
   # Helpers to support shared tests
@@ -122,6 +122,38 @@ module HttpClientTestCases
     ])
   end
 
+  # Although rare, some clients do explicitly set the "host" header on their
+  # http requests. Respect that rather than the host IP on the request if so.
+  #
+  # https://github.com/newrelic/rpm/pull/124
+  def test_get_with_host_header
+    uri = default_uri
+    uri.host = '127.0.0.1'
+    res = get_response(uri.to_s, 'Host' => 'test.local')
+
+    assert_match %r/<head>/i, body(res)
+    assert_metrics_recorded([
+      "External/all",
+      "External/test.local/#{client_name}/GET",
+      "External/allOther",
+      "External/test.local/all"
+    ])
+  end
+
+  def test_get_with_host_header_lowercase
+    uri = default_uri
+    uri.host = '127.0.0.1'
+    res = get_response(uri.to_s, 'host' => 'test.local')
+
+    assert_match %r/<head>/i, body(res)
+    assert_metrics_recorded([
+      "External/all",
+      "External/test.local/#{client_name}/GET",
+      "External/allOther",
+      "External/test.local/all"
+    ])
+  end
+
   # Only some HTTP clients support explicit connection reuse, so this test
   # checks whether the host responds to get_response_multi before executing.
   def test_get_with_reused_connection

data/test/new_relic/local_environment_test.rb

@@ -17,19 +17,6 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
   end
   MOCK_OPTIONS = MockOptions.new
 
-#  def test_environment
-#    e = NewRelic::LocalEnvironment.new
-#    assert(nil == e.environment) # working around a bug in 1.9.1
-#    assert_match /test/i, e.dispatcher_instance_id
-#  end
-#  def test_no_webrick
-#    Object.const_set :OPTIONS, 'foo'
-#    e = NewRelic::LocalEnvironment.new
-#    assert(nil == e.environment) # working around a bug in 1.9.1
-#    assert_match /test/i, e.dispatcher_instance_id
-#    Object.class_eval { remove_const :OPTIONS }
-#  end
-
   def test_passenger
     class << self
       module ::PhusionPassenger
@@ -39,12 +26,10 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     e = NewRelic::LocalEnvironment.new
     assert_equal :passenger, e.discovered_dispatcher
     assert_equal :passenger, NewRelic::Agent.config[:dispatcher]
-    assert_nil e.dispatcher_instance_id, "dispatcher instance id should be nil: #{e.dispatcher_instance_id}"
 
     with_config(:app_name => 'myapp') do
       e = NewRelic::LocalEnvironment.new
       assert_equal :passenger, e.discovered_dispatcher
-      assert_nil e.dispatcher_instance_id
     end
 
   ensure
@@ -88,12 +73,4 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
       end
     end
   end
-
-  def test_default_port
-    e = NewRelic::LocalEnvironment.new
-    assert_equal 3000, e.send(:default_port)
-    ARGV.push '--port=3121'
-    assert_equal '3121', e.send(:default_port)
-    ARGV.pop
-  end
 end

data/test/new_relic/metric_data_test.rb

@@ -104,6 +104,7 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
     assert((spec.hash ^ stats.hash) == md1.hash, "expected #{spec.hash ^ stats.hash} to equal #{md1.hash}")
   end
 
+  if {}.respond_to?(:to_json)
   def test_to_json_no_metric_id
     md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new, nil)
     json = md.to_json
@@ -115,6 +116,9 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
     md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new, 12345)
     assert_equal('{"metric_spec":null,"stats":{"total_exclusive_time":0.0,"min_call_time":0.0,"call_count":0,"sum_of_squares":0.0,"total_call_time":0.0,"max_call_time":0.0},"metric_id":12345}', md.to_json, "should not include the metric spec and should have a metric_id")
   end
+  else
+    puts "Skipping tests in #{__FILE__} because Hash#to_json not available"
+  end
 
   def test_to_s_with_metric_spec
     md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new, 12345)

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -96,44 +96,45 @@ EOL
     assert !app.should_instrument?({NewRelic::Rack::BrowserMonitoring::ALREADY_INSTRUMENTED_KEY => true}, 200, {'Content-Type' => 'text/html'})
   end
 
-  def test_insert_timing_header_right_after_open_head_if_no_meta_tags
-    get '/'
-
-    assert(last_response.body.include?("head>#{NewRelic::Agent.browser_timing_header}"),
-           last_response.body)
-    TestApp.doc = nil
-  end
-
   def test_insert_header_should_mark_environment
     get '/'
     assert last_request.env.key?(NewRelic::Rack::BrowserMonitoring::ALREADY_INSTRUMENTED_KEY)
-    TestApp.doc = nil
   end
 
-  def test_insert_timing_header_right_before_head_close_if_ua_compatible_found
-    TestApp.doc = <<-EOL
-<html>
-  <head>
-    <title>im a title</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <script>
-      junk
-    </script>
-  </head>
-  <body>im some body text</body>
-</html>
-EOL
-    get '/'
+  # RUM header auto-insertion testing
+  # We read *.source.html files from the test/rum directory, and then
+  # compare the results of them to *.result.html files.
 
-    assert(last_response.body.include?("#{NewRelic::Agent.browser_timing_header}</head>"),
-           last_response.body)
-  end
+  source_files = Dir[File.join(File.dirname(__FILE__), "..", "..", "rum", "*.source.html")]
 
-  def test_insert_timing_footer_right_before_html_body_close
-    get '/'
+  RUM_HEADER = "|||I AM THE RUM HEADER|||"
+  RUM_FOOTER = "|||I AM THE RUM FOOTER|||"
 
-    assert_match(/.*NREUMQ\.push.*new Date\(\)\.getTime\(\),"","","","",""\]\);<\/script><\/body>/,
-                 last_response.body)
+  source_files.each do |source_file|
+    source_filename = File.basename(source_file).gsub(".", "_")
+    source_html = File.read(source_file)
+
+    result_file = source_file.gsub(".source.", ".result.")
+
+    define_method("test_#{source_filename}") do
+      TestApp.doc = source_html
+      NewRelic::Agent.instance.stubs(:browser_timing_header).returns(RUM_HEADER)
+      NewRelic::Agent.instance.stubs(:browser_timing_footer).returns(RUM_FOOTER)
+
+      get '/'
+
+      expected_content = File.read(result_file)
+      assert_equal(expected_content, last_response.body)
+    end
+
+    define_method("test_dont_touch_#{source_filename}") do
+      TestApp.doc = source_html
+      NewRelic::Rack::BrowserMonitoring.any_instance.stubs(:should_instrument?).returns(false)
+
+      get '/'
+
+      assert_equal(source_html, last_response.body)
+    end
   end
 
   def test_should_not_throw_exception_on_empty_reponse

data/test/performance/lib/performance/result.rb

@@ -2,6 +2,8 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+require 'time'
+
 module Performance
   class Result
     attr_reader :test_name, :measurements, :tags, :timer, :artifacts
@@ -52,15 +54,22 @@ module Performance
       @measurements.merge(:elapsed => elapsed)
     end
 
+    def format_timestamp(t)
+      t.utc.iso8601
+    end
+
     def to_h
-      {
+      h = {
         "suite"     => suite_name,
         "name"      => @test_name,
         "measurements" => measurements_hash,
-        "tags"         => @tags,
-        "exception"    => @exception,
-        "artifacts"    => @artifacts
+        "tags"         => @tags
       }
+      h['exception'] = @exception if @exception
+      h['artifacts'] = @artifacts if @artifacts && !@artifacts.empty?
+      h['started_at'] = format_timestamp(@timer.start_timestamp) if @timer.start_timestamp
+      h['finished_at'] = format_timestamp(@timer.stop_timestamp) if @timer.stop_timestamp
+      h
     end
 
     def self.from_hash(hash)
@@ -70,6 +79,8 @@ module Performance
       result.tags.merge! hash['tags']
       result.exception = hash['exception']
       result.elapsed = elapsed
+      result.timer.start_timestamp = Time.iso8601(hash['started_at']) if hash['started_at']
+      result.timer.stop_timestamp = Time.iso8601(hash['finished_at']) if hash['finished_at']
       result
     end
 

data/test/performance/lib/performance/timer.rb

@@ -4,9 +4,11 @@
 
 module Performance
   class Timer
+    attr_accessor :start_timestamp, :stop_timestamp
+
     def initialize
       @start_timestamp = nil
-      @end_timestamp = nil
+      @stop_timestamp = nil
     end
 
     def start(t=Time.now)
@@ -34,5 +36,9 @@ module Performance
         nil
       end
     end
+
+    def inspect
+      "<Performance::Timer @start_timestamp=#{start_timestamp.inspect}, @stop_timestamp=#{stop_timestamp.inspect}, elapsed=#{elapsed}>"
+    end
   end
 end

data/test/performance/script/baselines

@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+
+# 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 'optparse'
+require 'rubygems'
+require 'httparty'
+require 'tmpdir'
+require 'json'
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'performance')
+
+GEM_NAME = 'newrelic_rpm'
+
+class GemWorkspace
+  attr_reader :path
+
+  def initialize(path=nil)
+    @path = File.expand_path(path || Dir.mktmpdir)
+    FileUtils.mkdir_p(gems_dir)
+    FileUtils.mkdir_p(extracted_gems_dir)
+  end
+
+  def gems_dir
+    File.join(@path, 'gems')
+  end
+
+  def extracted_gems_dir
+    File.join(@path, 'extracted_gems')
+  end
+end
+
+class FetchedGem
+  attr_reader :name, :version
+
+  def initialize(workspace, name, version)
+    @workspace = workspace
+    @name = name
+    @version = version
+  end
+
+  def gem_filename
+    "#{@name}-#{@version}.gem"
+  end
+
+  def path
+    File.join(@workspace.gems_dir, gem_filename)
+  end
+
+  def extracted_path
+    File.join(@workspace.extracted_gems_dir, gem_filename.gsub(/\.gem$/, ''))
+  end
+
+  def uri
+    "https://rubygems.org/downloads/#{gem_filename}"
+  end
+
+  def fetch!
+    File.open(path, "w") do |f|
+      rsp = HTTParty.get(uri)
+      f.write(rsp.body)
+    end
+  end
+
+  def fetched?
+    File.exist?(path)
+  end
+
+  def git_sha
+    `git rev-parse #{@version}`.strip
+  end
+
+  def extract!
+    fetch! unless fetched?
+    cmd = "cd #{@workspace.extracted_gems_dir} && gem unpack '#{path}'"
+    system(cmd)
+  end
+end
+
+versions_url = "https://rubygems.org/api/v1/versions/#{GEM_NAME}.json"
+result = Net::HTTP.get(URI.parse(versions_url))
+
+gem_versions = JSON.parse(result)
+ga_gem_versions = gem_versions.reject { |v| v['prerelease'] }
+
+workspace = GemWorkspace.new(ARGV.first)
+ga_gem_versions.each do |version|
+  gem = FetchedGem.new(workspace, GEM_NAME, version['number'])
+  gem.extract!
+  options = {
+    :agent_path => gem.extracted_path,
+    :reporter_classes => ["ConsoleReporter", "HakoReporter"],
+    :tags => {
+      :series => 'baseline',
+      :newrelic_rpm_git_sha => gem.git_sha
+    }
+  }
+  runner = Performance::Runner.new(options)
+  runner.run_and_report
+end