newrelic_rpm 3.6.2.96 → 3.6.3.103.beta

data/test/test_helper.rb

@@ -14,44 +14,48 @@ $LOAD_PATH.uniq!
 
 require 'rubygems'
 require 'rake'
+
 # We can speed things up in tests that don't need to load rails.
 # You can also run the tests in a mode without rails.  Many tests
 # will be skipped.
-
-begin
-  require 'config/environment'
-#   require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
-
-  # we need 'rails/test_help' for Rails 4
-  # we need 'test_help' for Rails 2
-  # we need neither for Rails 3
+if ENV["NO_RAILS"]
+  puts "Running tests in standalone mode without Rails."
+  require 'newrelic_rpm'
+else
   begin
-    require 'rails/test_help'
-  rescue LoadError
+    require 'config/environment'
+  #   require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
+
+    # we need 'rails/test_help' for Rails 4
+    # we need 'test_help' for Rails 2
+    # we need neither for Rails 3
     begin
-      require 'test_help'
+      require 'rails/test_help'
     rescue LoadError
-      # ignore load problems on test help - it doesn't exist in rails 3
+      begin
+        require 'test_help'
+      rescue LoadError
+        # ignore load problems on test help - it doesn't exist in rails 3
+      end
     end
-  end
-  require 'newrelic_rpm'
-rescue LoadError => e
-  puts "Running tests in standalone mode."
-  require 'bundler'
-  Bundler.require
-  require 'rails/all'
-  require 'newrelic_rpm'
-
-  # Bootstrap a basic rails environment for the agent to run in.
-  class MyApp < Rails::Application
-    config.active_support.deprecation = :log
-    config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
-    config.after_initialize do
-      NewRelic::Agent.manual_start
+    require 'newrelic_rpm'
+  rescue LoadError => e
+    puts "Running tests in standalone mode."
+    require 'bundler'
+    Bundler.require
+    require 'rails/all'
+    require 'newrelic_rpm'
+
+    # Bootstrap a basic rails environment for the agent to run in.
+    class MyApp < Rails::Application
+      config.active_support.deprecation = :log
+      config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+      config.after_initialize do
+        NewRelic::Agent.manual_start
+      end
     end
+    MyApp.initialize!
   end
-  MyApp.initialize!
-
 end
 
 require 'test/unit'
@@ -67,6 +71,8 @@ begin # 1.8.6
 rescue LoadError
 end
 
+require 'agent_helper'
+
 def default_service(stubbed_method_overrides = {})
   service = stub
   stubbed_method_defaults = {
@@ -102,153 +108,6 @@ class Test::Unit::TestCase
   end
 end
 
-def assert_between(floor, ceiling, value, message="expected #{floor} <= #{value} <= #{ceiling}")
-  assert((floor <= value && value <= ceiling), message)
-end
-
-def assert_in_delta(expected, actual, delta)
-  assert_between((expected - delta), (expected + delta), actual)
-end
-
-def check_metric_time(metric, value, delta)
-  time = NewRelic::Agent.get_stats(metric).total_call_time
-  assert_in_delta(value, time, delta)
-end
-
-def check_metric_count(metric, value)
-  count = NewRelic::Agent.get_stats(metric).call_count
-  assert_equal(value, count, "should have the correct number of calls")
-end
-
-def check_unscoped_metric_count(metric, value)
-  count = NewRelic::Agent.get_stats_unscoped(metric).call_count
-  assert_equal(value, count, "should have the correct number of calls")
-end
-
-def generate_unscoped_metric_counts(*metrics)
-  metrics.inject({}) do |sum, metric|
-    sum[metric] = NewRelic::Agent.get_stats_no_scope(metric).call_count
-    sum
-  end
-end
-
-def generate_metric_counts(*metrics)
-  metrics.inject({}) do |sum, metric|
-    sum[metric] = NewRelic::Agent.get_stats(metric).call_count
-    sum
-  end
-end
-
-def assert_does_not_call_metrics(*metrics)
-  first_metrics = generate_metric_counts(*metrics)
-  yield
-  last_metrics = generate_metric_counts(*metrics)
-  assert_equal first_metrics, last_metrics, "should not have changed these metrics"
-end
-
-def assert_calls_metrics(*metrics)
-  first_metrics = generate_metric_counts(*metrics)
-  yield
-  last_metrics = generate_metric_counts(*metrics)
-  assert_not_equal first_metrics, last_metrics, "should have changed these metrics"
-end
-
-def assert_calls_unscoped_metrics(*metrics)
-  first_metrics = generate_unscoped_metric_counts(*metrics)
-  yield
-  last_metrics = generate_unscoped_metric_counts(*metrics)
-  assert_not_equal first_metrics, last_metrics, "should have changed these metrics"
-end
-
-unless defined?( assert_includes )
-  def assert_includes( collection, member, msg=nil )
-    msg = build_message( msg, "Expected ? to include ?", collection, member )
-    assert_block( msg ) { collection.include?(member) }
-  end
-end
-
-unless defined?( assert_not_includes )
-  def assert_not_includes( collection, member, msg=nil )
-    msg = build_message( msg, "Expected ? not to include ?", collection, member )
-    assert_block( msg ) { !collection.include?(member) }
-  end
-end
-
-def compare_metrics(expected, actual)
-  actual.delete_if {|a| a.include?('GC/cumulative') } # in case we are in REE
-  assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
-end
-
-def metric_spec_from_specish(specish)
-  spec = case specish
-  when String then NewRelic::MetricSpec.new(specish)
-  when Array  then NewRelic::MetricSpec.new(*specish)
-  end
-  spec
-end
-
-def _normalize_metric_expectations(expectations)
-  case expectations
-  when Array
-    hash = {}
-    expectations.each { |k| hash[k] = { :call_count => 1 } }
-    hash
-  else
-    expectations
-  end
-end
-
-def assert_metrics_recorded(expected)
-  expected = _normalize_metric_expectations(expected)
-  expected.each do |specish, expected_attrs|
-    expected_spec = metric_spec_from_specish(specish)
-    actual_stats = NewRelic::Agent.instance.stats_engine.lookup_stats(*Array(specish))
-    if !actual_stats
-      all_specs = NewRelic::Agent.instance.stats_engine.metric_specs
-      matches = all_specs.select { |spec| spec.name == expected_spec.name }
-      matches.map! { |m| "  #{m.inspect}" }
-      msg = "Did not find stats for spec #{expected_spec.inspect}."
-      msg += "\nDid find specs: [\n#{matches.join(",\n")}\n]" unless matches.empty?
-      assert(actual_stats, msg)
-    end
-    expected_attrs.each do |attr, expected_value|
-      actual_value = actual_stats.send(attr)
-      if attr == :call_count
-        assert_equal(expected_value, actual_value,
-          "Expected #{attr} for #{expected_spec} to be #{expected_value}, got #{actual_value}")
-      else
-        assert_in_delta(expected_value, actual_value, 0.0001,
-          "Expected #{attr} for #{expected_spec} to be ~#{expected_value}, got #{actual_value}")
-      end
-    end
-  end
-end
-
-def assert_metrics_recorded_exclusive(expected, options={})
-  expected = _normalize_metric_expectations(expected)
-  assert_metrics_recorded(expected)
-  recorded_metrics = NewRelic::Agent.instance.stats_engine.metrics
-  if options[:filter]
-    recorded_metrics = recorded_metrics.select { |m| m.match(options[:filter]) }
-  end
-  expected_metrics = expected.keys.map { |s| metric_spec_from_specish(s).to_s }
-  unexpected_metrics = recorded_metrics.select{|m| m !~ /GC\/cumulative/}
-  unexpected_metrics -= expected_metrics
-  assert_equal(0, unexpected_metrics.size, "Found unexpected metrics: [#{unexpected_metrics.join(', ')}]")
-end
-
-def assert_metrics_not_recorded(not_expected)
-  not_expected = _normalize_metric_expectations(not_expected)
-  found_but_not_expected = []
-  not_expected.each do |specish, _|
-    spec = metric_spec_from_specish(specish)
-    if NewRelic::Agent.instance.stats_engine.lookup_stats(*Array(specish))
-      found_but_not_expected << spec
-    end
-  end
-  assert_equal([], found_but_not_expected, "Found unexpected metrics: [#{found_but_not_expected.join(', ')}]")
-end
-
 def with_config(config_hash, opts={})
   opts = { :level => 0, :do_not_cast => false }.merge(opts)
   if opts[:do_not_cast]
@@ -264,7 +123,6 @@ def with_config(config_hash, opts={})
   end
 end
 
-
 def with_verbose_logging
   orig_logger = NewRelic::Agent.logger
   $stderr.puts '', '---', ''
@@ -277,7 +135,6 @@ 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)
@@ -299,31 +156,6 @@ ensure
   ::NewRelic::Agent.logger = logger
 end
 
-def in_transaction(name='dummy')
-  NewRelic::Agent.instance.instance_variable_set(:@transaction_sampler,
-                        NewRelic::Agent::TransactionSampler.new)
-  NewRelic::Agent.instance.stats_engine.transaction_sampler = \
-    NewRelic::Agent.instance.transaction_sampler
-  NewRelic::Agent::Transaction.start(:other)
-  val = yield
-  NewRelic::Agent::Transaction.stop(name)
-  val
-end
-
-def freeze_time(now=Time.now)
-  Time.stubs(:now).returns(now)
-end
-
-def advance_time(seconds)
-  freeze_time(Time.now + seconds)
-end
-
-module NewRelic
-  def self.fixture_path(name)
-    File.join(File.dirname(__FILE__), 'fixtures', name)
-  end
-end
-
 def fixture_tcp_socket( response )
   # Don't actually talk to Google.
   socket = stub("socket") do
@@ -363,6 +195,50 @@ def fixture_tcp_socket( response )
   return socket
 end
 
+
+class ArrayLogDevice
+  def initialize( array=[] )
+    @array = array
+  end
+  attr_reader :array
+
+  def write( message )
+    @array << message
+  end
+
+  def close; end
+end
+
+def with_array_logger( level=:info )
+  orig_logger = NewRelic::Agent.logger
+  config = {
+      :log_file_path => nil,
+      :log_file_name => nil,
+      :log_level => level,
+    }
+  logdev = ArrayLogDevice.new
+  override_logger = Logger.new( logdev )
+  NewRelic::Agent.logger = NewRelic::Agent::AgentLogger.new(config, "", override_logger)
+
+  yield
+
+  return logdev
+ensure
+  NewRelic::Agent.logger = orig_logger
+end
+
+
+def with_debug_logging
+  orig_logger = NewRelic::Agent.logger
+  $stderr.puts '', '---', ''
+  NewRelic::Agent.logger =
+    NewRelic::Agent::AgentLogger.new( {:log_level => 'debug'}, '', Logger.new($stderr) )
+  yield
+ensure
+  NewRelic::Agent.logger = orig_logger
+end
+
+
 module TransactionSampleTestHelper
   module_function
   def make_sql_transaction(*sql)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.2.96
-  prerelease: 
+  version: 3.6.3.103.beta
+  prerelease: 10
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -131,6 +131,7 @@ files:
 - lib/new_relic/agent/instrumentation/merb/errors.rb
 - lib/new_relic/agent/instrumentation/metric_frame.rb
 - lib/new_relic/agent/instrumentation/net.rb
+- lib/new_relic/agent/instrumentation/padrino.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
 - lib/new_relic/agent/instrumentation/queue_time.rb
 - lib/new_relic/agent/instrumentation/rack.rb
@@ -148,6 +149,8 @@ files:
 - lib/new_relic/agent/instrumentation/sequel.rb
 - lib/new_relic/agent/instrumentation/sidekiq.rb
 - lib/new_relic/agent/instrumentation/sinatra.rb
+- lib/new_relic/agent/instrumentation/sinatra/ignorer.rb
+- lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
 - lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb
 - lib/new_relic/agent/method_tracer.rb
@@ -155,6 +158,7 @@ files:
 - lib/new_relic/agent/null_logger.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
+- lib/new_relic/agent/request_sampler.rb
 - lib/new_relic/agent/rules_engine.rb
 - lib/new_relic/agent/sampler.rb
 - lib/new_relic/agent/samplers/cpu_sampler.rb
@@ -237,6 +241,7 @@ files:
 - newrelic_rpm.gemspec
 - recipes/newrelic.rb
 - test/active_record_fixtures.rb
+- test/agent_helper.rb
 - test/config/newrelic.yml
 - test/config/test_control.rb
 - test/fixtures/proc_cpuinfo.txt
@@ -280,7 +285,10 @@ files:
 - test/multiverse/suites/config_file_loading/config_file_loading_test.rb
 - test/multiverse/suites/datamapper/Envfile
 - test/multiverse/suites/datamapper/config/newrelic.yml
-- test/multiverse/suites/datamapper/encoding_test.rb
+- test/multiverse/suites/datamapper/datamapper_test.rb
+- test/multiverse/suites/padrino/Envfile
+- test/multiverse/suites/padrino/config/newrelic.yml
+- test/multiverse/suites/padrino/padrino_test.rb
 - test/multiverse/suites/rails/Envfile
 - test/multiverse/suites/rails/app.rb
 - test/multiverse/suites/rails/app/views/foos/_foo.html.haml
@@ -294,6 +302,7 @@ files:
 - test/multiverse/suites/rails/error_tracing_test.rb
 - test/multiverse/suites/rails/gc_instrumentation_test.rb
 - test/multiverse/suites/rails/queue_time_test.rb
+- test/multiverse/suites/rails/request_statistics_test.rb
 - test/multiverse/suites/rails/view_instrumentation_test.rb
 - test/multiverse/suites/resque/Envfile
 - test/multiverse/suites/resque/Rakefile
@@ -307,10 +316,13 @@ files:
 - test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb
 - test/multiverse/suites/sinatra/Envfile
 - test/multiverse/suites/sinatra/config/newrelic.yml
+- test/multiverse/suites/sinatra/ignoring_test.rb
+- test/multiverse/suites/sinatra/sinatra_classic_test.rb
 - test/multiverse/suites/sinatra/sinatra_error_tracing_test.rb
 - test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb
+- test/multiverse/suites/sinatra/sinatra_modular_test.rb
 - test/multiverse/suites/sinatra/sinatra_routes_test.rb
-- test/multiverse/suites/sinatra/sinatra_test.rb
+- test/multiverse/suites/sinatra/sinatra_test_cases.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
@@ -359,6 +371,7 @@ files:
 - test/new_relic/agent/instrumentation/queue_time_test.rb
 - test/new_relic/agent/instrumentation/rack_test.rb
 - test/new_relic/agent/instrumentation/sequel_test.rb
+- test/new_relic/agent/instrumentation/sinatra/transaction_namer_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
@@ -369,6 +382,7 @@ files:
 - test/new_relic/agent/new_relic_service_test.rb
 - test/new_relic/agent/pipe_channel_manager_test.rb
 - test/new_relic/agent/pipe_service_test.rb
+- test/new_relic/agent/request_sampler_test.rb
 - test/new_relic/agent/rpm_agent_test.rb
 - test/new_relic/agent/rules_engine_test.rb
 - test/new_relic/agent/sampler_test.rb
@@ -512,19 +526,37 @@ files:
 - lib/new_relic/build.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.6.2 ##\n\n*
-  Sequel support\n\n  The Ruby agent now supports Sequel, a database toolkit for Ruby.
-  This\n  includes capturing SQL calls and model operations in transaction traces,
-  and\n  recording slow SQL calls. See https://newrelic.com/docs/ruby/sequel-instrumentation\n
-  \ for full details.\n\n* Thread profiling fix\n\n  The prior release of the agent
-  (version 3.6.1) broke thread profiling. A\n  profile would appear to run, but return
-  no data. This has been fixed.\n\n* Fix for over-counted Net::HTTP calls\n\n  Under
-  some circumstances, calls into Net::HTTP were being counted twice in\n  metrics
-  and transaction traces. This has been fixed.\n\n* Missing traced errors for Resque
-  applications\n\n  Traced errors weren't displaying for some Resque workers, although
-  the errors\n  were factored into the overall count graphs. This has been fixed,
-  and traced\n  errors should be available again after upgrading the agent.\n\nSee
-  https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of\nchanges.\n"
+post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## 3.6.3 ##\n\n*
+  Better Sinatra Support\n\n  A number of improvements have been made to our Sinatra
+  instrumentation.\n  More details: https://newrelic.com/docs/ruby/sinatra-support-in-the-ruby-agent\n\n
+  \ Sinatra instrumentation has been updated to more accurately reflect the final\n
+  \ route that was actually executed, taking pass and conditions into account.\n  \n
+  \ New Relic middlewares for error collection, real user monitoring, and cross\n
+  \ application tracing are automatically inserted into the middleware stack.\n  \n
+  \ Ignoring routes, similar to functionality available to Rails controllers, is\n
+  \ now available in Sinatra as well.\n  \n  Routes in 1.4 are properly formatting
+  in transaction names. Thanks Zachary\n  Anker for the contribution!\n\n* Padrino
+  Support\n\n  Along with improving our support of Sinatra, we've also extended that
+  to\n  supporting Padrino, a framework that builds on Sinatra. Web transactions\n
+  \ should show up in New Relic now for Padrino apps automatically. The agent has\n
+  \ been tested against the latest Padrino in versions 0.11.x and 0.10.x.\n  \n* Main
+  overview graph only shows web transactions\n  \n  In the past database times from
+  background jobs mixed with other web transaction\n  metrics in the main overview
+  graph. This often skewed graphs. A common workaround\n  was to send background jobs
+  to a separate application, but that should no longer\n  be necessary as the overview
+  graphs now only represent web transactions.\n\n## v3.6.2 ##\n\n* Sequel support\n\n
+  \ The Ruby agent now supports Sequel, a database toolkit for Ruby. This\n  includes
+  capturing SQL calls and model operations in transaction traces, and\n  recording
+  slow SQL calls. See https://newrelic.com/docs/ruby/sequel-instrumentation\n  for
+  full details.\n\n* Thread profiling fix\n\n  The prior release of the agent (version
+  3.6.1) broke thread profiling. A\n  profile would appear to run, but return no data.
+  This has been fixed.\n\n* Fix for over-counted Net::HTTP calls\n\n  Under some circumstances,
+  calls into Net::HTTP were being counted twice in\n  metrics and transaction traces.
+  This has been fixed.\n\n* Missing traced errors for Resque applications\n\n  Traced
+  errors weren't displaying for some Resque workers, although the errors\n  were factored
+  into the overall count graphs. This has been fixed, and traced\n  errors should
+  be available again after upgrading the agent.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
+  for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers
 - --inline-source