newrelic_rpm 3.5.5.540.dev → 3.5.6.42.beta

data/test/new_relic/agent/event_listener_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+
+class EventListenerTest < Test::Unit::TestCase
+
+  def setup
+    @events = NewRelic::Agent::EventListener.new
+
+    @called = false
+    @called_with = nil
+
+    @check_method = Proc.new do |*args|
+      @called = true
+      @called_with = args
+    end
+  end
+
+  def test_notifies
+    @events.subscribe(:before_call, &@check_method)
+    @events.notify(:before_call, :env => "env")
+
+    assert_was_called
+    assert_equal([{:env => "env"}], @called_with)
+  end
+
+  def test_failure_during_notify_doesnt_block_other_hooks
+    @events.subscribe(:after_call) { raise "Boo!" }
+    @events.subscribe(:after_call, &@check_method)
+
+    @events.notify(:after_call)
+
+    assert_was_called
+  end
+
+  def test_runaway_events
+    @events.runaway_threshold = 0
+    expects_logging(:debug, includes("my_event"))
+    @events.subscribe(:my_event) {}
+  end
+
+
+  def assert_was_called
+    assert @called, "Event wasn't called"
+  end
+
+end
+

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

@@ -1,39 +1,66 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
 
-class NewRelic::Agent::Instrumentation::BrowserMonitoringTimingsTest < Test::Unit::TestCase
-
-  def setup
-    Time.stubs(:now).returns(2000)
-    @transaction = stub(
-      :transaction_name => "Name",
-      :start_time => 0
-    )
-  end
+module NewRelic::Agent::Instrumentation
+  class BrowserMonitoringTimingsTest < Test::Unit::TestCase
 
-  def test_queue_time
-    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(1000.1234, @transaction)
-    assert_equal 1_000_123, t.queue_time_in_millis
-  end
+    def setup
+      Time.stubs(:now).returns(2000)
+      @transaction = stub(
+        :transaction_name => "Name",
+        :start_time => 0
+      )
+    end
 
-  def test_queue_time_clamps_to_positive
-    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(-1000, @transaction)
-    assert_equal 0, t.queue_time_in_millis
-  end
+    def test_queue_time_in_millis
+      t = BrowserMonitoringTimings.new(1000.1234, @transaction)
+      assert_equal 1_000_123, t.queue_time_in_millis
+    end
 
-  def test_app_time
-    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(nil, @transaction)
-    assert_equal 2_000_000, t.app_time_in_millis
-  end
+    def test_queue_time_in_seconds
+      t = BrowserMonitoringTimings.new(1000.1234, @transaction)
+      assert_equal 1_000.1234, t.queue_time_in_seconds
+    end
 
-  def test_transaction_name
-    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(nil, @transaction)
-    assert_equal "Name", t.transaction_name
-  end
+    def test_queue_time_clamps_to_positive
+      t = BrowserMonitoringTimings.new(-1000, @transaction)
+      assert_equal 0, t.queue_time_in_millis
+    end
 
-  def test_defaults_to_transaction_info
-    t = NewRelic::Agent::Instrumentation::BrowserMonitoringTimings.new(1000, nil)
-    assert_equal nil, t.transaction_name
-    assert_equal 0.0, t.start_time_in_millis
-  end
+    def test_queue_time_clamps_to_positive_in_seconds
+      t = BrowserMonitoringTimings.new(-1000, @transaction)
+      assert_equal 0, t.queue_time_in_seconds
+    end
+
+    def test_app_time_in_millis
+      t = BrowserMonitoringTimings.new(nil, @transaction)
+      assert_equal 2_000_000, t.app_time_in_millis
+    end
 
+    def test_app_time_in_seconds
+      t = BrowserMonitoringTimings.new(nil, @transaction)
+      assert_equal 2_000, t.app_time_in_seconds
+    end
+
+    def test_locks_time_at_instantiation
+      t = BrowserMonitoringTimings.new(1000, @transaction)
+      original = t.app_time_in_seconds
+
+      Time.stubs(:now).returns(3000)
+      later = t.app_time_in_seconds
+
+      assert_equal original, later
+    end
+
+    def test_transaction_name
+      t = BrowserMonitoringTimings.new(nil, @transaction)
+      assert_equal "Name", t.transaction_name
+    end
+
+    def test_defaults_to_transaction_info
+      t = BrowserMonitoringTimings.new(1000, nil)
+      assert_equal nil, t.transaction_name
+      assert_equal 0.0, t.start_time_in_millis
+    end
+
+  end
 end

data/test/new_relic/agent/worker_loop_test.rb

@@ -71,7 +71,7 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
   end
 
   def test_task_error__server
-    expects_no_logging(:error, any_parameters)
+    expects_no_logging(:error)
     expects_logging(:debug, any_parameters)
     @worker_loop.run(0) do
       @worker_loop.stop

data/test/new_relic/fake_collector.rb

@@ -71,7 +71,19 @@ module NewRelic
       uri.query && uri.query.include?('marshal_format=json')
     end
 
-    def run(port=30303)
+    # We generate a "unique" port for ourselves based off our pid
+    # If this logic changes, look for multiverse newrelic.yml files to update
+    # with it duplicated (since we can't easily pull this ruby into a yml)
+    def self.determine_port
+      30_000 + ($$ % 10_000)
+    end
+
+    def determine_port
+      FakeCollector.determine_port
+    end
+
+    def run(port=nil)
+      port ||= determine_port
       return if @thread && @thread.alive?
       serve_on_port(port) do
         @thread = Thread.new do
@@ -85,6 +97,7 @@ module NewRelic
     end
 
     def serve_on_port(port)
+      port ||= determine_port
       if is_port_available?('127.0.0.1', port)
         yield
         loop do
@@ -127,7 +140,7 @@ module NewRelic
 
   # might we need this?  I'll just leave it here for now
   class FakeCollectorProcess < FakeCollector
-    def run(port=30303)
+    def run(port)
       serve_on_port(port) do
         @pid = Process.fork do
           ::Rack::Handler::WEBrick.run(self, :Port => port)
@@ -262,9 +275,9 @@ if $0 == __FILE__
     end
 
     def invoke(method, post={}, code=200)
-      uri = URI.parse("http://127.0.0.1:30303/agent_listener/8/12345/#{method}")
+      uri = URI.parse("http://127.0.0.1:#{determine_port}/agent_listener/8/12345/#{method}")
       request = Net::HTTP::Post.new("#{uri.path}?#{uri.query}")
-      if uri.query && uri.query.include?('marsha_format=json')
+      if uri.query && uri.query.include?('marshal_format=json')
         request.body = JSON.dump(post)
       else
         request.body = Marshal.dump(post)

data/test/new_relic/rack/agent_hooks_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'new_relic/rack/agent_hooks'
+
+class AgentHooksTest < Test::Unit::TestCase
+
+  def setup
+    @app = stub_everything
+    @hooks = NewRelic::Rack::AgentHooks.new(@app)
+    @env = {:env => "env"}
+
+    NewRelic::Agent.instance.events.stubs(:notify)
+  end
+
+  def test_before_call
+    NewRelic::Agent.instance.events.expects(:notify).with(:before_call, @env)
+
+    @hooks.call(@env)
+  end
+
+  def test_after_call
+    result = stub
+    @app.stubs(:call).returns(result)
+
+    NewRelic::Agent.instance.events.expects(:notify).with(:after_call, @env, result)
+
+    @hooks.call(@env)
+  end
+
+end
+

data/test/new_relic/rack/error_collector_test.rb

@@ -66,6 +66,22 @@ module NewRelic::Rack
       assert(NewRelic::Agent.instance.error_collector.errors.empty?,
              'noticed an error that should have been ignored')
     end
+
+    def test_handles_parameter_parsing_exceptions
+      bad_request = stub(:env => {}, :path => '/', :referer => '')
+      bad_request.stubs(:params).raises(TypeError, "can't convert nil into Hash")
+      Rack::Request.stubs(:new).returns(bad_request)
+
+      assert_raise RuntimeError do
+        get '/'
+      end
+
+      assert_equal('unhandled error',
+                   NewRelic::Agent.instance.error_collector.errors[0].message)
+      assert_match(/failed to capture request parameters/i,
+                   NewRelic::Agent.instance.error_collector.errors[0].params[:request_params]['error'])
+    end
+
   end
 end
 

data/test/new_relic/version_number_test.rb

@@ -82,40 +82,16 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
     assert v0 < '1.2.0.1'
     assert v0 > '1.1.0.1'
   end
+
   def test_string
     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')
+  def test_build_version_string
+    version_string = NewRelic::VERSION.build_version_string(1, 2, 3, '4.beta')
+    assert_equal('1.2.3.4.beta', version_string)
+    version_string = NewRelic::VERSION.build_version_string(1, 2, 3, nil)
+    assert_equal('1.2.3', version_string)
   end
 end

data/test/script/ci.sh

@@ -64,13 +64,10 @@ fi
 
 echo `which ruby`
 ruby -v
+gem --version
 
 rake -h > /dev/null || gem install rake
 
-echo "generating gemspec"
-rake gemspec
-
-
 # make sure that we're in the project root
 script_dirname=`dirname $0`
 cd "$script_dirname/../../"
@@ -87,13 +84,17 @@ rpm_test_app_cache=~/workspace/.rpm_test_app_cache
   echo "updating local cache of rpm_test_app in $rpm_test_app_cache"
   git clone --mirror git://github.com/newrelic/rpm_test_app.git $rpm_test_app_cache || true
   cd $rpm_test_app_cache
+  git fetch || true
 )
 
 git clone $rpm_test_app_cache rpm_test_app
 cd rpm_test_app
 
+git fetch || true
 git checkout -t origin/$BRANCH || git checkout $BRANCH
-
+if [ -x $HOME/.rbenv/plugins/rbenv-gemsets ]; then
+  echo "$RUBY-$BRANCH" > .rbenv-gemsets
+fi
 
 # Re-write database.yml to this here doc
 ( cat << "YAML" ) > config/database.yml

data/test/test_contexts.rb

@@ -10,6 +10,7 @@ module TestContexts
         NewRelic::Agent::Agent.instance.service = NewRelic::FakeService.new
         NewRelic::Agent.manual_start :log => @log
         @agent = NewRelic::Agent.instance
+        @agent.metric_ids.clear
         @agent.transaction_sampler.send :clear_builder
         @agent.transaction_sampler.reset!
         @agent.stats_engine.clear_stats

data/test/test_helper.rb

@@ -144,10 +144,8 @@ def expects_logging(level, *with_params)
   ::NewRelic::Agent.logger.expects(level).with(*with_params).once
 end
 
-# Similarly, have to be specific about the message we "never" expect...
-def expects_no_logging(level, *with_params)
-  ::NewRelic::Agent.logger.stubs(level)
-  ::NewRelic::Agent.logger.expects(level).with(*with_params).never
+def expects_no_logging(level)
+  ::NewRelic::Agent.logger.expects(level).never
 end
 
 # Sometimes need to test cases where we muddle with the global logger

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.5.540.dev
-  prerelease: 10
+  version: 3.5.6.42.beta
+  prerelease: 9
 platform: ruby
 authors:
 - Jason Clark
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -79,6 +79,7 @@ files:
 - lib/new_relic/agent/cross_process_monitoring.rb
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/error_collector.rb
+- lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record.rb
@@ -156,6 +157,7 @@ files:
 - lib/new_relic/metrics.rb
 - lib/new_relic/noticed_error.rb
 - lib/new_relic/rack.rb
+- lib/new_relic/rack/agent_hooks.rb
 - lib/new_relic/rack/browser_monitoring.rb
 - lib/new_relic/rack/developer_mode.rb
 - lib/new_relic/rack/error_collector.rb
@@ -176,14 +178,11 @@ files:
 - lib/tasks/install.rake
 - lib/tasks/tests.rake
 - newrelic.yml
-- newrelic_rpm.gemspec.erb
+- newrelic_rpm.gemspec
 - recipes/newrelic.rb
 - 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
@@ -203,56 +202,43 @@ files:
 - test/multiverse/suites/agent_only/Envfile
 - test/multiverse/suites/agent_only/audit_log_test.rb
 - test/multiverse/suites/agent_only/config/newrelic.yml
+- test/multiverse/suites/agent_only/cross_process_test.rb
 - test/multiverse/suites/agent_only/http_response_code_test.rb
+- test/multiverse/suites/agent_only/logging_test.rb
 - test/multiverse/suites/agent_only/marshaling_test.rb
 - test/multiverse/suites/agent_only/method_visibility_test.rb
+- test/multiverse/suites/agent_only/no_dns_resolv.rb
 - test/multiverse/suites/agent_only/pipe_manager_test.rb
+- test/multiverse/suites/agent_only/rum_instrumentation_test.rb
 - test/multiverse/suites/agent_only/service_timeout_test.rb
+- test/multiverse/suites/agent_only/start_up_test.rb
 - test/multiverse/suites/agent_only/test_trace_method_with_punctuation.rb
 - test/multiverse/suites/agent_only/test_trace_transaction_with_punctuation.rb
+- test/multiverse/suites/agent_only/testing_app.rb
 - test/multiverse/suites/agent_only/thread_profiling_test.rb
 - test/multiverse/suites/config_file_loading/Envfile
 - 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/logging/Envfile
-- test/multiverse/suites/logging/config/newrelic.yml
-- test/multiverse/suites/logging/logging_test.rb
-- test/multiverse/suites/monitor_mode_false/Envfile
-- test/multiverse/suites/monitor_mode_false/config/newrelic.yml
-- test/multiverse/suites/monitor_mode_false/no_dns_resolv.rb
-- test/multiverse/suites/no_load/Envfile
-- test/multiverse/suites/no_load/config/newrelic.yml
-- test/multiverse/suites/no_load/start_up_test.rb
-- test/multiverse/suites/rails_3_error_tracing/Envfile
-- test/multiverse/suites/rails_3_error_tracing/config/newrelic.yml
-- test/multiverse/suites/rails_3_error_tracing/error_tracing_test.rb
-- test/multiverse/suites/rails_3_gc/Envfile
-- test/multiverse/suites/rails_3_gc/config/newrelic.yml
-- test/multiverse/suites/rails_3_gc/instrumentation_test.rb
-- test/multiverse/suites/rails_3_queue_time/Envfile
-- test/multiverse/suites/rails_3_queue_time/config/newrelic.yml
-- test/multiverse/suites/rails_3_queue_time/queue_time_test.rb
-- test/multiverse/suites/rails_3_views/.gitignore
-- test/multiverse/suites/rails_3_views/Envfile
-- test/multiverse/suites/rails_3_views/app/views/foos/_foo.html.haml
-- test/multiverse/suites/rails_3_views/app/views/test/_a_partial.html.erb
-- test/multiverse/suites/rails_3_views/app/views/test/_mid_partial.html.erb
-- test/multiverse/suites/rails_3_views/app/views/test/_top_partial.html.erb
-- test/multiverse/suites/rails_3_views/app/views/test/deep_partial.html.erb
-- test/multiverse/suites/rails_3_views/app/views/test/haml_view.html.haml
-- test/multiverse/suites/rails_3_views/app/views/test/index.html.erb
-- test/multiverse/suites/rails_3_views/config/newrelic.yml
-- test/multiverse/suites/rails_3_views/view_instrumentation_test.rb
+- test/multiverse/suites/rails/Envfile
+- test/multiverse/suites/rails/app.rb
+- test/multiverse/suites/rails/app/views/foos/_foo.html.haml
+- test/multiverse/suites/rails/app/views/views/_a_partial.html.erb
+- test/multiverse/suites/rails/app/views/views/_mid_partial.html.erb
+- test/multiverse/suites/rails/app/views/views/_top_partial.html.erb
+- test/multiverse/suites/rails/app/views/views/deep_partial.html.erb
+- test/multiverse/suites/rails/app/views/views/haml_view.html.haml
+- test/multiverse/suites/rails/app/views/views/index.html.erb
+- test/multiverse/suites/rails/config/newrelic.yml
+- 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/view_instrumentation_test.rb
 - test/multiverse/suites/resque/Envfile
 - test/multiverse/suites/resque/config/newrelic.yml
 - test/multiverse/suites/resque/dump.rdb
 - test/multiverse/suites/resque/instrumentation_test.rb
-- test/multiverse/suites/rum_auto_instrumentation/Envfile
-- test/multiverse/suites/rum_auto_instrumentation/config/newrelic.yml
-- test/multiverse/suites/rum_auto_instrumentation/responses/worst_case_small.html
-- test/multiverse/suites/rum_auto_instrumentation/sanity_test.rb
 - test/multiverse/suites/sinatra/Envfile
 - test/multiverse/suites/sinatra/config/newrelic.yml
 - test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb
@@ -291,6 +277,7 @@ files:
 - test/new_relic/agent/database_test.rb
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
+- test/new_relic/agent/event_listener_test.rb
 - test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb
 - test/new_relic/agent/instrumentation/browser_monitoring_timings_test.rb
 - test/new_relic/agent/instrumentation/controller_instrumentation_test.rb
@@ -343,6 +330,7 @@ files:
 - test/new_relic/metric_parser/metric_parser_test.rb
 - test/new_relic/metric_spec_test.rb
 - test/new_relic/noticed_error_test.rb
+- test/new_relic/rack/agent_hooks_test.rb
 - test/new_relic/rack/all_test.rb
 - test/new_relic/rack/browser_monitoring_test.rb
 - test/new_relic/rack/developer_mode_helper_test.rb
@@ -444,10 +432,14 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_frontend.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb
-- newrelic_rpm.gemspec
+- 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.5.5 ##\n\n
+  \ * Add thread profiling support\n\n    Thread profiling performs statistical sampling
+  of backtraces of all threads\n    within your Ruby processes. This feature requires
+  MRI >= 1.9.2, and is\n    controlled via the New Relic web UI. JRuby support (in
+  1.9.x compat mode) is\n    considered experimental, due to issues with JRuby's Thread#backtrace.\n\n
   \ * Add audit logging capability\n\n    The agent can now log all of the data it
   sends to the New Relic servers to\n    a special log file for human inspection.
   This feature is off by default, and\n    can be enabled by setting the audit_log.enabled
@@ -466,7 +458,7 @@ post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.5.5 #
   be used to specify which section of newrelic.yml is loaded.\n\n  * Rails 4 support\n\n
   \   This release includes preliminary support for Rails 4 as of 4.0.0.beta.\n    Rails
   4 is still in development, but the agent should work as expected for\n    people
-  who are experimenting with the beta.\n\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
+  who are experimenting with the beta.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers