newrelic_rpm 3.6.2.96 → 3.6.3.103.beta

data/test/multiverse/suites/agent_only/thread_profiling_test.rb

@@ -16,8 +16,9 @@ class ThreadProfilingTest < Test::Unit::TestCase
     $collector.run
 
     NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
-    NewRelic::Agent.manual_start(:'thread_profiler.enabled' => true)
+    NewRelic::Agent.manual_start(:'thread_profiler.enabled' => true, :force_send => true)
     NewRelic::Agent.instance.service.request_timeout = 0.5
+    NewRelic::Agent.instance.service.agent_id = 666
 
     @agent = NewRelic::Agent.instance
     @thread_profiler = @agent.thread_profiler
@@ -67,9 +68,8 @@ class ThreadProfilingTest < Test::Unit::TestCase
     let_it_finish
 
     profile_data = $collector.calls_for('profile_data')[0]
-    assert_equal('666', profile_data.run_id)
-
-    assert profile_data.poll_count > 25, "Expected poll_count > 25, but was #{profile_data.poll_count}"
+    assert_equal('666', profile_data.run_id, "Missing run_id, profile_data was #{profile_data.inspect}")
+    assert(profile_data.poll_count > 10, "Expected poll_count > 10, but was #{profile_data.poll_count}")
 
     assert_saw_traces(profile_data, "OTHER")
     assert_saw_traces(profile_data, "AGENT")
@@ -86,9 +86,8 @@ class ThreadProfilingTest < Test::Unit::TestCase
     let_it_finish
 
     profile_data = $collector.calls_for('profile_data')[0]
-    assert_equal('666', profile_data.run_id)
-
-    assert profile_data.poll_count < 10, "Expected poll_count < 10, but was #{profile_data.poll_count}"
+    assert_equal('666', profile_data.run_id, "Missing run_id, profile_data was #{profile_data.inspect}")
+    assert(profile_data.poll_count < 50, "Expected poll_count < 50, but was #{profile_data.poll_count}")
   end
 
   # Runs a thread we expect to span entire test and be killed at the end
@@ -106,7 +105,7 @@ class ThreadProfilingTest < Test::Unit::TestCase
       end
     end
 
-    NewRelic::Agent.shutdown
+    @agent.send(:transmit_data, true)
   end
 
   def assert_saw_traces(profile_data, type)

data/test/multiverse/suites/datamapper/Envfile

@@ -4,5 +4,12 @@ end
 
 gemfile <<-RB
   gem 'datamapper'
+  gem 'dm-sqlite-adapter'
+
+  if RUBY_VERSION >= '1.9.0'
+    gem 'mocha', '~> 0.13.0', :require => 'mocha/setup'
+  else
+    gem 'mocha', '< 0.13'
+  end
 RB
 

data/test/multiverse/suites/datamapper/datamapper_test.rb

@@ -0,0 +1,105 @@
+# 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 'data_mapper'
+require 'newrelic_rpm'
+require 'test/unit'
+
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
+
+DataMapper::Logger.new("/dev/null", :debug)
+DataMapper.setup(:default, 'sqlite::memory:')
+class Post
+  include DataMapper::Resource
+  property :id,         Serial    # An auto-increment integer key
+  property :title,      String    # A varchar type string, for short strings
+  property :body,       Text      # A text block, for longer string data.
+end
+DataMapper.auto_migrate!
+DataMapper.finalize
+
+class DummyConnection
+  module DummyLogging
+    def log(*args); end
+  end
+
+  include DummyLogging
+  include NewRelic::Agent::Instrumentation::DataMapperInstrumentation
+end
+
+class DataMapperTest < Test::Unit::TestCase
+  def setup
+    NewRelic::Agent.instance.reset_stats
+  end
+
+  def test_basic_metrics
+    post = Post.create(:title => "Dummy post", :body => "whatever, man")
+    post = Post.get(post.id)
+    post.update(:title => 'other title')
+    post.destroy
+    assert_metrics_recorded(
+      'ActiveRecord/Post/save' => { :call_count => 2 },
+      'ActiveRecord/Post/get'  => { :call_count => 1 },
+      'ActiveRecord/Post/update'  => { :call_count => 1 },
+      'ActiveRecord/Post/destroy' => { :call_count => 1 }
+    )
+  end
+
+  def test_rollup_metrics_for_create
+    post = Post.create(:title => 'foo', :body => 'bar')
+    post.save
+    assert_metrics_recorded(['ActiveRecord/save'])
+  end
+
+  def test_rollup_metrics_for_update
+    post = Post.create(:title => 'foo', :body => 'bar')
+    post.body = 'baz'
+    post.save
+    assert_metrics_recorded('ActiveRecord/save' => { :call_count => 2 })
+  end
+
+  def test_rollup_metrics_for_destroy
+    post = Post.create(:title => 'foo', :body => 'bar')
+    post.save
+    post.destroy
+    assert_metrics_recorded(['ActiveRecord/destroy'])
+  end
+
+  def test_rollup_metrics_should_include_all_if_in_web_transaction
+    in_web_transaction do
+      Post.create(:title => 'foo', :body => 'bar').save
+    end
+    assert_metrics_recorded([
+      'ActiveRecord/save',
+      'ActiveRecord/all'
+    ])
+  end
+
+  def test_rollup_metrics_should_omit_all_if_not_in_web_transaction
+    in_transaction do
+      Post.create(:title => 'foo', :body => 'bar').save
+    end
+    assert_metrics_recorded(['ActiveRecord/save'])
+    assert_metrics_not_recorded(['ActiveRecord/all'])
+  end
+
+  # https://support.newrelic.com/tickets/2101
+  # https://github.com/newrelic/rpm/pull/42
+  # https://github.com/newrelic/rpm/pull/45
+  def test_should_not_bomb_out_if_a_query_is_in_an_invalid_encoding
+    db = DummyConnection.new
+    q = "select ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000"
+    q.force_encoding 'UTF-8' if RUBY_VERSION >= '1.9'
+
+    msg = mock
+    msg.stubs(:duration).returns(1)
+    msg.stubs(:query).returns(q)
+
+    assert_equal false, msg.query.valid_encoding? if RUBY_VERSION >= '1.9'
+    assert_nothing_raised do
+      db.send(:log, msg)
+    end
+  end
+end
+

data/test/multiverse/suites/padrino/Envfile

@@ -0,0 +1,16 @@
+suite_condition("Sinatra not compatible with 1.8.6") do
+  RUBY_VERSION != '1.8.6'
+end
+
+gemfile <<-RB
+  # Gemspec from rubygems on this version gets illformed warnings on 1.8.7
+  gem 'http_router', '0.11.0', :git => 'git://github.com/joshbuddy/http_router.git'
+
+  gem 'padrino', '~> 0.11.0'
+  gem 'rack-test', :require => 'rack/test'
+RB
+
+gemfile <<-RB
+  gem 'padrino', '~> 0.10.0'
+  gem 'rack-test', :require => 'rack/test'
+RB

data/test/multiverse/suites/padrino/config/newrelic.yml

@@ -0,0 +1,24 @@
+---
+development:
+  error_collector:
+    capture_source: true
+    enabled: true
+  apdex_t: 0.5
+  ssl: false
+  agent_enabled: true
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  sync_startup: true
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  port: <%= 30_000 + ($$ % 10_000) %>
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false
+  log_level: debug
+  disable_serialization: false

data/test/multiverse/suites/padrino/padrino_test.rb

@@ -0,0 +1,54 @@
+# 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 File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper.rb')
+
+# Shhhh
+Padrino::Logger::Config[:development][:stream] = :null
+
+class PadrinoTestApp < Padrino::Application
+
+  register Padrino::Rendering
+  register Padrino::Helpers
+
+  get '/user/login' do
+    "please log in"
+  end
+
+  get /\/regex.*/ do
+    "with extra regex's please!"
+  end
+end
+
+class PadrinoRoutesTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    PadrinoTestApp
+  end
+
+  def setup
+    ::NewRelic::Agent.manual_start
+  end
+
+  def test_basic_route
+    get '/user/login'
+    assert_equal 200, last_response.status
+    assert_equal 'please log in', last_response.body
+
+    assert_metrics_recorded([
+        "Controller/Sinatra/PadrinoTestApp/GET user/login",
+        "Apdex/Sinatra/PadrinoTestApp/GET user/login"])
+  end
+
+  def test_regex_route
+    get '/regexes'
+    assert_equal 200, last_response.status
+    assert_equal "with extra regex's please!", last_response.body
+
+    assert_metrics_recorded([
+        "Controller/Sinatra/PadrinoTestApp/GET regex.*",
+        "Apdex/Sinatra/PadrinoTestApp/GET regex.*"])
+  end
+end

data/test/multiverse/suites/rails/Envfile

@@ -4,22 +4,22 @@ end
 
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
-    gem 'rails', '~>4.0.0.beta1'
-    gem 'haml'
+    gem 'rails', '~>4.0.0.rc1'
+    gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   RB
 end
 
 gemfile <<-RB
   gem 'rails', '~>3.2.0'
-  gem 'haml'
+  gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
 RB
 
 gemfile <<-RB
   gem 'rails', '~>3.1.0'
-  gem 'haml'
+  gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
 RB
 
 gemfile <<-RB
   gem 'rails', '~>3.0.0'
-  gem 'haml'
+  gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
 RB

data/test/multiverse/suites/rails/app.rb

@@ -30,6 +30,7 @@ if !defined?(MyApp)
     # We need a secret token for session, cookies, etc.
     config.active_support.deprecation = :log
     config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+    config.eager_load = false
     initializer "install_error_middleware" do
       config.middleware.use ErrorMiddleware
     end

data/test/multiverse/suites/rails/request_statistics_test.rb

@@ -0,0 +1,118 @@
+# 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.
+
+# https://newrelic.atlassian.net/browse/RUBY-1096
+
+require 'rails/test_help'
+require './app'
+
+class RequestStatsController < ApplicationController
+  include Rails.application.routes.url_helpers
+
+  def stats_action
+    sleep 0.01
+    render :text => 'some stuff'
+  end
+end
+
+class RequestStatsTest < ActionController::TestCase
+  tests RequestStatsController
+  extend Multiverse::Color
+
+  def setup
+    $collector ||= NewRelic::FakeCollector.new
+    $collector.reset
+    setup_collector
+    $collector.run
+
+    NewRelic::Agent.reset_config
+    NewRelic::Agent.instance_variable_set(:@agent, nil)
+    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
+    NewRelic::Agent.manual_start
+    NewRelic::Agent::TransactionInfo.reset
+  end
+
+  def teardown
+    NewRelic::Agent::Agent.instance.shutdown if NewRelic::Agent::Agent.instance
+    NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
+  end
+
+
+  #
+  # Tests
+  #
+
+  def test_is_disabled_by_default
+    200.times { get :stats_action }
+
+    NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+
+    assert_nil $collector.agent_data.find {|post| post.action == 'analytic_event_data' }
+  end
+
+  def test_request_times_should_be_reported_if_enabled
+    with_config( :'request_sampler.enabled' => true ) do
+      200.times { get :stats_action }
+
+      NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+
+      post = $collector.agent_data.find {|post| post.action == 'analytic_event_data' }
+
+      assert_not_nil( post )
+      assert_kind_of Array, post.body
+      assert_kind_of Array, post.body.first
+
+      sample = post.body.first.first
+      assert_kind_of Hash, sample
+
+      assert_equal 'Controller/request_stats/stats_action', sample['name']
+      assert_encoding 'utf-8', sample['name']
+      assert_equal 'Transaction', sample['type']
+      assert_kind_of Float, sample['duration']
+      assert_valid_time sample['timestamp']
+    end
+  end
+
+
+
+  #
+  # Helpers
+  #
+
+  def setup_collector
+    $collector.mock['connect'] = [200, {'return_value' => {"agent_run_id" => 666 }}]
+  end
+
+  def assert_encoding( encname, string )
+    return unless string.respond_to?( :encoding )
+    expected_encoding = Encoding.find( encname ) or raise "no such encoding #{encname.dump}"
+    msg = "Expected encoding of %p to be %p, but it was %p" %
+      [ string, expected_encoding, string.encoding ]
+    assert_equal( expected_encoding, string.encoding, msg )
+  end
+
+  def assert_valid_time( object )
+    return if object.is_a?( Time )
+    assert_kind_of Time, Time.parse(object.to_s) rescue object
+  end
+
+  # :TODO: Remove this if/when test_helper is available from multiverse tests
+  def with_config(config_hash, opts={})
+    opts = { :level => 0, :do_not_cast => false }.merge(opts)
+    if opts[:do_not_cast]
+      config = config_hash
+    else
+      config = NewRelic::Agent::Configuration::DottedHash.new(config_hash)
+    end
+    NewRelic::Agent.config.apply_config(config, opts[:level])
+    begin
+      yield
+    ensure
+      NewRelic::Agent.config.remove_config(config)
+    end
+  end
+
+
+end
+

data/test/multiverse/suites/sinatra/Envfile

@@ -3,13 +3,19 @@ suite_condition("Sinatra not compatible with 1.8.6") do
 end
 
 gemfile <<-RB
-  gem 'sinatra', '1.3.3'
+  gem 'sinatra', '~> 1.4.0'
   gem 'rack-test', :require => 'rack/test'
   gem 'mocha'
 RB
 
 gemfile <<-RB
-  gem 'sinatra', '1.2.8'
+  gem 'sinatra', '~> 1.3.0'
+  gem 'rack-test', :require => 'rack/test'
+  gem 'mocha'
+RB
+
+gemfile <<-RB
+  gem 'sinatra', '~> 1.2.0'
   gem 'rack-test', :require => 'rack/test'
   gem 'mocha'
 RB

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

@@ -0,0 +1,185 @@
+# 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.
+
+class SinatraIgnoreTestApp < Sinatra::Base
+  get '/record' do request.path_info end
+
+  newrelic_ignore '/ignore'
+  get '/ignore' do request.path_info end
+
+  newrelic_ignore '/splat*'
+  get '/splattered' do request.path_info end
+
+  newrelic_ignore '/named/:id'
+  get '/named/:id' do request.path_info end
+
+  newrelic_ignore '/v1', '/v2'
+  get '/v1' do request.path_info end
+  get '/v2' do request.path_info end
+  get '/v3' do request.path_info end
+
+  newrelic_ignore(/\/.+regex.*/)
+  get '/skip_regex' do request.path_info end
+  get '/regex_seen' do request.path_info end
+
+  newrelic_ignore '/ignored_erroring'
+  get '/ignored_erroring' do raise 'boom'; end
+
+  newrelic_ignore_apdex '/no_apdex'
+  get '/no_apdex' do request.path_info end
+
+  newrelic_ignore_enduser '/no_enduser'
+  get '/no_enduser' do request.path_info end
+
+end
+
+class SinatraTestCase < Test::Unit::TestCase
+  include Rack::Test::Methods
+  include ::NewRelic::Agent::Instrumentation::Sinatra
+
+  def setup
+    NewRelic::Agent.manual_start
+    NewRelic::Agent.instance.stats_engine.reset_stats
+  end
+
+  def get_and_assert_ok(path)
+    get(path)
+    assert_equal 200, last_response.status
+    assert_equal path, last_response.body
+  end
+
+  # Keep Test::Unit happy by specifying at least one test method here
+  # Real tests are defined in subclasses.
+  def test_nothing; end
+end
+
+class SinatraIgnoreTest < SinatraTestCase
+  def app
+    SinatraIgnoreTestApp
+  end
+
+  def app_name
+    app.to_s
+  end
+
+  def get_and_assert_ok(path)
+    get(path)
+    assert_equal 200, last_response.status
+    assert_equal path, last_response.body
+  end
+
+  def test_seen_route
+    get_and_assert_ok '/record'
+    assert_metrics_recorded([
+      "Controller/Sinatra/#{app_name}/GET record",
+      "Apdex/Sinatra/#{app_name}/GET record"])
+  end
+
+  def test_ignores_exact_match
+    get_and_assert_ok '/ignore'
+    assert_metrics_not_recorded([
+      "Controller/Sinatra/#{app_name}/GET ignore",
+      "Apdex/Sinatra/#{app_name}/GET ignore"])
+  end
+
+  def test_ignores_by_splats
+    get_and_assert_ok '/splattered'
+    assert_metrics_not_recorded([
+      "Controller/Sinatra/#{app_name}/GET splattered",
+      "Apdex/Sinatra/#{app_name}/GET splattered"])
+  end
+
+  def test_ignores_can_be_declared_in_batches
+    get_and_assert_ok '/v1'
+    get_and_assert_ok '/v2'
+    get_and_assert_ok '/v3'
+
+    assert_metrics_not_recorded([
+      "Controller/Sinatra/#{app_name}/GET v1",
+      "Controller/Sinatra/#{app_name}/GET v2",
+      "Apdex/Sinatra/#{app_name}/GET v1",
+      "Apdex/Sinatra/#{app_name}/GET v2"])
+
+    assert_metrics_recorded([
+      "Controller/Sinatra/#{app_name}/GET v3",
+      "Apdex/Sinatra/#{app_name}/GET v3"])
+  end
+
+  def test_seen_with_regex
+    get_and_assert_ok '/regex_seen'
+    assert_metrics_recorded([
+      "Controller/Sinatra/#{app_name}/GET regex_seen",
+      "Apdex/Sinatra/#{app_name}/GET regex_seen"])
+  end
+
+  def test_ignores_by_regex
+    get_and_assert_ok '/skip_regex'
+    assert_metrics_not_recorded([
+      "Controller/Sinatra/#{app_name}/GET skip_regex",
+      "Apdex/Sinatra/#{app_name}/GET skip_regex"])
+  end
+
+  def test_ignore_apdex
+    get_and_assert_ok '/no_apdex'
+    assert_metrics_recorded(["Controller/Sinatra/#{app_name}/GET no_apdex"])
+    assert_metrics_not_recorded(["Apdex/Sinatra/#{app_name}/GET no_apdex"])
+  end
+
+  def test_ignore_enduser
+    get_and_assert_ok '/no_enduser'
+
+    assert NewRelic::Agent::TransactionInfo.get.ignore_end_user?
+    assert_metrics_recorded([
+      "Controller/Sinatra/#{app_name}/GET no_enduser",
+      "Apdex/Sinatra/#{app_name}/GET no_enduser"])
+  end
+
+  def test_ignore_errors_in_ignored_transactions
+    get '/ignored_erroring'
+    assert_metrics_not_recorded(["Errors/all"])
+  end
+end
+
+# Blanket ignore for whole app if newrelic_ignore called without parameters
+class SinatraIgnoreItAllApp < Sinatra::Base
+  newrelic_ignore
+
+  get '/' do request.path_info end
+end
+
+class SinatraIgnoreItAllTest < SinatraTestCase
+  def app
+    SinatraIgnoreItAllApp
+  end
+
+  def test_ignores_everything
+    get_and_assert_ok '/'
+    assert_metrics_recorded_exclusive([])
+  end
+end
+
+
+# Blanket ignore for whole app if calls made without parameters
+class SinatraIgnoreApdexAndEndUserApp < Sinatra::Base
+  newrelic_ignore_apdex
+  newrelic_ignore_enduser
+
+  get '/' do request.path_info end
+end
+
+class SinatraIgnoreApdexAndEndUserTest < SinatraTestCase
+  def app
+    SinatraIgnoreApdexAndEndUserApp
+  end
+
+  def test_ignores_apdex
+    get_and_assert_ok '/'
+    assert_metrics_not_recorded(["Apdex/Sinatra/#{app.to_s}/GET "])
+  end
+
+  def test_ignores_enduser
+    get_and_assert_ok '/'
+    assert NewRelic::Agent::TransactionInfo.get.ignore_end_user?
+  end
+end