newrelic_rpm 3.5.3.25 → 3.5.4.29.beta

data/test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb

@@ -61,7 +61,8 @@ class SinatraMetricExplosionTest < Test::Unit::TestCase
     get '/hello/isitmeyourelookingfor?'
     get '/another_controller'
 
-    metric_names = ::NewRelic::Agent.agent.stats_engine.stats_hash.keys.map{|k| k.name} - ['CPU/User Time']
+    metric_names = ::NewRelic::Agent.agent.stats_engine.stats_hash.keys.
+      map{|k| k.name} - ['CPU/User Time', "Middleware/all", "WebFrontend/QueueTime", "WebFrontend/WebServer/all"]
     assert_equal 6, metric_names.size, "Explosion detected in: #{metric_names.inspect}"
   end
 

data/test/multiverse/suites/sinatra/sinatra_test.rb

@@ -0,0 +1,55 @@
+
+class SinatraRouteTestApp < Sinatra::Base
+  configure do
+    # create a condition (sintra's version of a before_filter) that returns the
+    # value that was passed into it.
+    set :my_condition do |boolean|
+      condition do
+        halt 404 unless boolean
+      end
+    end
+  end
+
+  get '/user/login' do
+    "please log in"
+  end
+
+  # this action will always return 404 because of the condition.
+  get '/user/:id', :my_condition => false do |id|
+    "Welcome #{id}"
+  end
+end
+
+class SinatraTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+  include ::NewRelic::Agent::Instrumentation::Sinatra
+
+  def app
+    SinatraRouteTestApp
+  end
+
+  def setup
+    ::NewRelic::Agent.manual_start
+  end
+
+  # https://support.newrelic.com/tickets/24779
+  def test_lower_priority_route_conditions_arent_applied_to_higher_priority_routes
+    get '/user/login'
+    assert_equal 200, last_response.status
+    assert_equal 'please log in', last_response.body
+  end
+
+  def test_conditions_are_applied_to_an_action_that_uses_them
+    get '/user/1'
+    assert_equal 404, last_response.status
+  end
+
+  def test_queue_time_headers_are_passed_to_agent
+    get '/user/login', {}, {"X-Request-Start" => 't=1234567890'}
+    metric_names = ::NewRelic::Agent.agent.stats_engine.stats_hash.keys.map{|k| k.name}
+    assert metric_names.include?("Middleware/all")
+    assert metric_names.include?("WebFrontend/QueueTime")
+    assert metric_names.include?("WebFrontend/WebServer/all")
+    assert ::NewRelic::Agent.agent.stats_engine.get_stats("WebFrontend/WebServer/all")
+  end
+end

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

@@ -118,6 +118,20 @@ class NewRelic::Agent::Instrumentation::QueueTimeTest < Test::Unit::TestCase
     check_metric_time('WebFrontend/WebServer/serverb', 1.0, 0.1)
   end
 
+  def test_parse_server_time_accepting_milliseconds_resolution_separator_char
+    env = {'HTTP_X_REQUEST_START' => "t=1000.000000"}
+    create_test_start_time(env)
+    env['HTTP_X_QUEUE_START'] = "t=1001.000000"
+    assert_calls_metrics('WebFrontend/WebServer/all') do
+      assert_equal(Time.at(1000), parse_server_time_from(env))
+    end
+    assert_calls_metrics('WebFrontend/QueueTime') do
+      assert_equal(Time.at(1001), parse_queue_time_from(env))
+    end
+    check_metric_time('WebFrontend/WebServer/all', 2.0, 0.1)
+    check_metric_time('WebFrontend/QueueTime', 1.0, 0.1)
+  end
+
   # test for backwards compatibility with old header
   def test_parse_server_time_from_with_no_server_name
     env = {'HTTP_X_REQUEST_START' => "t=#{convert_to_microseconds(Time.at(1001))}"}

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

@@ -0,0 +1,25 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper'))
+require 'new_relic/agent/instrumentation/sinatra'
+
+class NewRelic::Agent::Instrumentation::SinatraTest < Test::Unit::TestCase
+  class SinatraTestApp
+    def initialize(response)
+      @response = response
+    end
+
+    def dispatch!
+      @response = response
+    end
+
+    include NewRelic::Agent::Instrumentation::Sinatra
+    alias dispatch_without_newrelic dispatch!
+    alias dispatch! dispatch_with_newrelic
+  end
+
+  def test_newrelic_request_headers
+    app = SinatraTestApp.new([200, {}, ["OK"]])
+    expected_headers = {:fake => :header}
+    app.expects(:request).returns(mock('request', :env => expected_headers))
+    assert_equal app.send(:newrelic_request_headers), expected_headers
+  end
+end

data/test/new_relic/version_number_test.rb

@@ -86,4 +86,36 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
     assert_equal '1.2.0', NewRelic::VersionNumber.new('1.2.0').to_s
     assert_equal '1.2', NewRelic::VersionNumber.new('1.2').to_s
   end
+
+  def test_gemspec_version_parsing
+    gemspec_contents = File.read(File.join(File.dirname(__FILE__), '..', '..', 'newrelic_rpm.gemspec'))
+    gemspec_contents =~ /s\.version\s*=\s*"(.*)"/
+    real_version = $1
+    assert_equal real_version, NewRelic::VERSION::STRING
+  end
+
+  def test_gemspec_parse_no_build
+    version = NewRelic::VERSION.parse_build_from_gemspec(NewRelic.fixture_path('gemspec_no_build.rb'))
+    assert_nil version
+  end
+
+  def test_gemspec_parse_with_build
+    version = NewRelic::VERSION.parse_build_from_gemspec(NewRelic.fixture_path('gemspec_with_build.rb'))
+    assert_equal '123', version
+  end
+
+  def test_gemspec_parse_with_build_and_stage
+    version = NewRelic::VERSION.parse_build_from_gemspec(NewRelic.fixture_path('gemspec_with_build_and_stage.rb'))
+    assert_equal '123.dev', version
+  end
+
+  def test_gemspec_parse_no_rubygems
+    Kernel.stubs(:const_defined?).with(:Gem).returns(false)
+    version = NewRelic::VERSION.parse_build_from_gemspec(NewRelic.fixture_path('gemspec_with_build_and_stage.rb'))
+    assert_equal '123.dev', version
+  end
+
+  def test_gemspec_parse_nonexistent
+    assert_nil NewRelic::VERSION.parse_build_from_gemspec('/really/not/a/real/path')
+  end
 end

data/test/test_helper.rb

@@ -137,6 +137,12 @@ def with_config(config_hash, level=0)
   end
 end
 
+module NewRelic
+  def self.fixture_path(name)
+    File.join(File.dirname(__FILE__), 'fixtures', name)
+  end
+end
+
 module TransactionSampleTestHelper
   module_function
   def make_sql_transaction(*sql)

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.3.25
-  prerelease: 
+  version: 3.5.4.29.beta
+  prerelease: 9
 platform: ruby
 authors:
 - Jason Clark
 - Sam Goldstein
 - Jon Guymon
+- Ben Weintraub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -176,6 +177,9 @@ files:
 - test/active_record_fixtures.rb
 - test/config/newrelic.yml
 - test/config/test_control.rb
+- test/fixtures/gemspec_no_build.rb
+- test/fixtures/gemspec_with_build.rb
+- test/fixtures/gemspec_with_build_and_stage.rb
 - test/fixtures/proc_cpuinfo.txt
 - test/intentional_fail.rb
 - test/multiverse/.gitignore
@@ -245,6 +249,7 @@ files:
 - test/multiverse/suites/sinatra/config/newrelic.yml
 - test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb
 - test/multiverse/suites/sinatra/sinatra_routes_test.rb
+- test/multiverse/suites/sinatra/sinatra_test.rb
 - test/multiverse/test/multiverse_test.rb
 - test/multiverse/test/suite_examples/one/a/Envfile
 - test/multiverse/test/suite_examples/one/a/a_test.rb
@@ -283,6 +288,7 @@ files:
 - test/new_relic/agent/instrumentation/net_instrumentation_test.rb
 - test/new_relic/agent/instrumentation/queue_time_test.rb
 - test/new_relic/agent/instrumentation/rack_test.rb
+- test/new_relic/agent/instrumentation/sinatra_test.rb
 - test/new_relic/agent/instrumentation/task_instrumentation_test.rb
 - test/new_relic/agent/memcache_instrumentation_test.rb
 - test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb