newrelic_rpm 3.5.4.35.beta → 3.5.5.38

data/test/new_relic/dispatcher_test.rb

@@ -0,0 +1,54 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
+
+# Test logic around detecting or configuring dispatcher
+class DispatcherTest < Test::Unit::TestCase
+
+  def setup
+    NewRelic::Agent.shutdown
+    NewRelic::Agent.reset_config
+  end
+
+  def assert_dispatcher_reported_to_environment_report(dispatcher)
+    NewRelic::Control.instance.local_env.gather_environment_info
+    key, value = NewRelic::Control.instance.local_env.snapshot.detect do |(k, v)|
+      k == "Dispatcher"
+    end
+    assert_equal dispatcher.to_s, value
+  end
+
+  def test_detects_dispatcher_via_loaded_libraries
+    class << self
+      module ::PhusionPassenger
+      end
+    end
+    assert_equal :passenger, NewRelic::Agent.config[:dispatcher]
+    assert_dispatcher_reported_to_environment_report :passenger
+  ensure
+    Object.send(:remove_const, :PhusionPassenger)
+  end
+
+  def test_detects_dispatcher_via_ENV_NEW_RELIC_DISPATCHER
+    ENV['NEW_RELIC_DISPATCHER'] = "foobared"
+    NewRelic::Agent.reset_config
+    assert_equal :foobared, NewRelic::Agent.config[:dispatcher]
+    assert_dispatcher_reported_to_environment_report :foobared
+  ensure
+    ENV['NEW_RELIC_DISPATCHER'] = nil
+  end
+
+  def test_detects_dispatcher_via_ENV_NEWRELIC_DISPATCHER
+    ENV['NEWRELIC_DISPATCHER'] = "bazbang"
+    NewRelic::Agent.reset_config
+    assert_equal :bazbang, NewRelic::Agent.config[:dispatcher]
+    assert_dispatcher_reported_to_environment_report :bazbang
+  ensure
+    ENV['NEWRELIC_DISPATCHER'] = nil
+  end
+
+  def test_detects_dispatcher_based_on_arguments_to_manual_start
+    NewRelic::Agent.manual_start(:dispatcher   => :resque)
+    assert_equal :resque, NewRelic::Agent.config[:dispatcher]
+    assert_dispatcher_reported_to_environment_report :resque
+  end
+
+end

data/test/new_relic/fake_collector.rb

@@ -4,11 +4,16 @@ require 'uri'
 require 'socket'
 require 'timeout'
 require 'ostruct'
+require File.join(File.dirname(__FILE__), 'fakes_sending_data')
+
+require 'json' if RUBY_VERSION >= '1.9'
 
 module NewRelic
   class FakeCollector
     attr_accessor :agent_data, :mock
 
+    include FakesSendingData
+
     def initialize
       @id_counter = 0
       @base_expectations = {
@@ -34,9 +39,10 @@ module NewRelic
       uri = URI.parse(req.url)
       if uri.path =~ /agent_listener\/\d+\/.+\/(\w+)/
         method = $1
+        format = json_format?(uri) && RUBY_VERSION >= '1.9' ? :json : :pruby
         if @mock.keys.include? method
           res.status = @mock[method][0]
-          if json_format?(uri)
+          if format == :json
             res.write JSON.dump(@mock[method][1])
           else
             res.write Marshal.dump(@mock[method][1])
@@ -47,25 +53,20 @@ module NewRelic
         end
         run_id = uri.query =~ /run_id=(\d+)/ ? $1 : nil
         req.body.rewind
-        body = if json_format?(uri) && RUBY_VERSION >= '1.9'
-          require 'json'
-          JSON.load(req.body.read)
+        
+        body = if format == :json
+          body = JSON.load(req.body.read)
         else
-          Marshal.load(req.body.read)
+          body = Marshal.load(req.body.read)
         end
-        @agent_data << OpenStruct.new(:action => method,
-                                      :body   => body,
-                                      :run_id => run_id)
+        @agent_data << OpenStruct.new(:action       => method,
+                                      :body         => body,
+                                      :run_id       => run_id,
+                                      :format       => format)
       end
       res.finish
     end
 
-    def calls_for(method)
-      @agent_data. \
-        select { |d| d.action == method }. \
-        map { |d| d.body }
-    end
-
     def json_format?(uri)
       uri.query && uri.query.include?('marshal_format=json')
     end

data/test/new_relic/fake_service.rb

@@ -1,9 +1,12 @@
 require 'ostruct'
+require File.join(File.dirname(__FILE__), 'fakes_sending_data')
 
 module NewRelic
   class FakeService
     attr_accessor :request_timeout, :agent_id, :agent_data, :collector, :mock
-    
+
+    include FakesSendingData
+
     def initialize
       @agent_data = []
       @supported_methods = [ :connect, :metric_data, :transaction_sample_data,

data/test/new_relic/fakes_sending_data.rb

@@ -0,0 +1,30 @@
+module NewRelic
+  module FakesSendingData
+    def calls_for(method)
+      @agent_data. \
+        select { |d| d.action == method }. \
+        map { |d| d.body }
+    end
+
+    # Unpeel the inner layers of encoding applied by the JSON marshaller.
+    # I'm sorry.
+    def unpack_inner_blobs(req)
+      body = req.body
+      if req.format == :json
+        case req.action
+        when 'profile_data' then
+          body[0][4] = unpack(body[0][4])
+        when 'sql_trace_data' then
+          body[0][0][9] = unpack(body[0][0][9])
+        when 'transaction_sample_data' then
+          body[4] = unpack(body[4])
+        end
+      end
+      body
+    end
+
+    def unpack(blob)
+      JSON.load(Zlib::Inflate.inflate(Base64.decode64(blob)))
+    end
+  end
+end

data/test/new_relic/framework_test.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
+
+# Test logic around detecting or configuring framework
+class FrameworkTest < Test::Unit::TestCase
+
+  def setup
+
+    # muck with this constant which forces the agent to load the
+    # NewRelic::Control::Frameworks::Test control so we can test the logic used
+    # to load the appropriate control object.
+    @old_newrelic_test_const = ::NewRelic::TEST
+    ::NewRelic.send(:remove_const, :TEST)
+
+    NewRelic::Agent.shutdown
+    NewRelic::Agent.reset_config
+
+    # don't bomb out trying to load frameworks that don't exist.
+    NewRelic::Control.stubs(:new_instance).returns(stub :init_plugin => nil)
+  end
+
+  def teardown
+    # Put things back how we found them
+    ::NewRelic.send(:const_set, :TEST,  @old_newrelic_test_const)
+  end
+
+  def test_detects_framework_via_loaded_libraries
+    class << self
+      module ::Merb
+        module Plugins
+        end
+      end
+    end
+    assert_equal :merb, NewRelic::Agent.config[:framework]
+  ensure
+    Object.send(:remove_const, :Merb)
+  end
+
+  def test_detects_framework_via_ENV_NEW_RELIC_FRAMEWORK
+    ENV['NEW_RELIC_FRAMEWORK'] = "foobared"
+    NewRelic::Agent.reset_config
+    assert_equal :foobared, NewRelic::Agent.config[:framework]
+  ensure
+    ENV['NEW_RELIC_FRAMEWORK'] = nil
+  end
+
+  def test_detects_framework_via_ENV_NEWRELIC_FRAMEWORK
+    ENV['NEWRELIC_FRAMEWORK'] = "bazbang"
+    NewRelic::Agent.reset_config
+    assert_equal :bazbang, NewRelic::Agent.config[:framework]
+  ensure
+    ENV['NEWRELIC_FRAMEWORK'] = nil
+  end
+end

data/test/new_relic/local_environment_test.rb

@@ -31,16 +31,19 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
       module ::PhusionPassenger
       end
     end
+    NewRelic::Agent.reset_config
     e = NewRelic::LocalEnvironment.new
-    assert_equal :passenger, e.environment
+    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.environment
+      assert_equal :passenger, e.discovered_dispatcher
       assert_nil e.dispatcher_instance_id
     end
 
+  ensure
     Object.send(:remove_const, :PhusionPassenger)
   end
 

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -51,7 +51,8 @@ EOL
       :beacon => 'beacon',
       :application_id => 5,
       :'rum.enabled' => true,
-      :episodes_file => 'this_is_my_file'
+      :episodes_file => 'this_is_my_file',
+      :license_key => 'a' * 40
     }
     NewRelic::Agent.config.apply_config(@config)
     NewRelic::Agent.manual_start

data/test/new_relic/rack/developer_mode_test.rb

@@ -16,7 +16,7 @@ class DeveloperModeTest < Test::Unit::TestCase
   end
 
   def setup
-    @test_config = { 'developer_mode' => true }
+    @test_config = { :developer_mode => true }
     NewRelic::Agent.config.apply_config(@test_config)
     @sampler = NewRelic::Agent::TransactionSampler.new
     run_sample_trace_on(@sampler, '/here')

data/test/new_relic/stats_test.rb

@@ -399,6 +399,16 @@ class NewRelic::StatsTest < Test::Unit::TestCase
     assert_in_delta(s3.standard_deviation, 4.743, 0.01)
   end
 
+  if RUBY_VERSION >= '1.9'
+    def test_to_json_enforces_float_values
+      s1 = NewRelic::MethodTraceStats.new
+      s1.trace_call 3.to_r
+      s1.trace_call 7.to_r
+
+      assert_equal 3.0, JSON.load(s1.to_json)['min_call_time']
+    end
+  end
+
   private
   def validate (stats, count, total, min, max, exclusive = nil)
     assert_equal stats.call_count, count

data/test/new_relic/transaction_sample_test.rb

@@ -5,7 +5,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   ::SQL_STATEMENT = "SELECT * from sandwiches"
 
   def setup
-    @test_config = { 'developer_mode' => true }
+    @test_config = { :developer_mode => true }
     NewRelic::Agent.config.apply_config(@test_config)
     @connection_stub = Mocha::Mockery.instance.named_mock('connection')
     @connection_stub.stubs(:execute).returns([['QUERY RESULT']])
@@ -213,7 +213,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
                       trace_tree,
                       @t.guid, nil, !!@t.force_persist]
 
-    assert_equal expected_array, @t.to_collector_array(marshaller)
+    assert_equal expected_array, @t.to_collector_array(marshaller.default_encoder)
   end
 
   def compress(string)

data/test/script/ci.sh

@@ -144,7 +144,7 @@ else
 fi
 
 if [ "x$RUBY" == "x1.8.6" ]; then
-  # Bundler 0.1 dropped support for ruby 1.8.6
+  # Bundler 1.1 dropped support for ruby 1.8.6
   bundle -h > /dev/null || gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
 else
   bundle -h > /dev/null || gem install bundler --no-rdoc --no-ri

data/test/test_helper.rb

@@ -137,6 +137,29 @@ def with_config(config_hash, level=0)
   end
 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)
+  ::NewRelic::Agent.logger.stubs(level)
+  ::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
+end
+
+# Sometimes need to test cases where we muddle with the global logger
+# If so, use this method to ensure it gets restored after we're done
+def without_logger
+  logger = ::NewRelic::Agent.logger
+  ::NewRelic::Agent.logger = nil
+  yield
+ensure
+  ::NewRelic::Agent.logger = logger
+end
+
 module NewRelic
   def self.fixture_path(name)
     File.join(File.dirname(__FILE__), 'fixtures', name)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.4.35.beta
-  prerelease: 9
+  version: 3.5.5.38
+  prerelease: 
 platform: ruby
 authors:
 - Jason Clark
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -46,7 +46,6 @@ files:
 - CHANGELOG
 - GUIDELINES_FOR_CONTRIBUTING.md
 - Gemfile
-- InstallationNotes.md
 - LICENSE
 - README.md
 - Rakefile
@@ -64,6 +63,8 @@ files:
 - lib/conditional_vendored_metric_parser.rb
 - lib/new_relic/agent.rb
 - lib/new_relic/agent/agent.rb
+- lib/new_relic/agent/agent_logger.rb
+- lib/new_relic/agent/audit_logger.rb
 - lib/new_relic/agent/beacon_configuration.rb
 - lib/new_relic/agent/browser_monitoring.rb
 - lib/new_relic/agent/busy_calculator.rb
@@ -72,8 +73,10 @@ files:
 - lib/new_relic/agent/configuration/defaults.rb
 - lib/new_relic/agent/configuration/environment_source.rb
 - lib/new_relic/agent/configuration/manager.rb
+- lib/new_relic/agent/configuration/mask_defaults.rb
 - lib/new_relic/agent/configuration/server_source.rb
 - lib/new_relic/agent/configuration/yaml_source.rb
+- 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/instrumentation.rb
@@ -81,6 +84,7 @@ files:
 - lib/new_relic/agent/instrumentation/active_record.rb
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
 - lib/new_relic/agent/instrumentation/authlogic.rb
+- lib/new_relic/agent/instrumentation/browser_monitoring_timings.rb
 - lib/new_relic/agent/instrumentation/controller_instrumentation.rb
 - lib/new_relic/agent/instrumentation/data_mapper.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
@@ -135,11 +139,11 @@ files:
 - lib/new_relic/control/frameworks/merb.rb
 - lib/new_relic/control/frameworks/rails.rb
 - lib/new_relic/control/frameworks/rails3.rb
+- lib/new_relic/control/frameworks/rails4.rb
 - lib/new_relic/control/frameworks/ruby.rb
 - lib/new_relic/control/frameworks/sinatra.rb
 - lib/new_relic/control/instance_methods.rb
 - lib/new_relic/control/instrumentation.rb
-- lib/new_relic/control/logging_methods.rb
 - lib/new_relic/control/profiling.rb
 - lib/new_relic/control/server_methods.rb
 - lib/new_relic/delayed_job_injection.rb
@@ -184,7 +188,6 @@ files:
 - test/intentional_fail.rb
 - test/multiverse/.gitignore
 - test/multiverse/README.md
-- test/multiverse/Rakefile
 - test/multiverse/lib/multiverse/color.rb
 - test/multiverse/lib/multiverse/envfile.rb
 - test/multiverse/lib/multiverse/environment.rb
@@ -198,6 +201,7 @@ files:
 - test/multiverse/suites/active_record/config/newrelic.yml
 - test/multiverse/suites/active_record/encoding_test.rb
 - 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/http_response_code_test.rb
 - test/multiverse/suites/agent_only/marshaling_test.rb
@@ -207,9 +211,14 @@ files:
 - 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/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
@@ -242,7 +251,6 @@ files:
 - 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/problem_response.html
 - 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
@@ -266,10 +274,12 @@ files:
 - test/new_relic/agent/agent/connect_test.rb
 - test/new_relic/agent/agent/start_test.rb
 - test/new_relic/agent/agent/start_worker_thread_test.rb
+- test/new_relic/agent/agent_logger_test.rb
 - test/new_relic/agent/agent_test.rb
 - test/new_relic/agent/agent_test_controller.rb
 - test/new_relic/agent/agent_test_controller_test.rb
 - test/new_relic/agent/apdex_from_server_test.rb
+- test/new_relic/agent/audit_logger_test.rb
 - test/new_relic/agent/beacon_configuration_test.rb
 - test/new_relic/agent/browser_monitoring_test.rb
 - test/new_relic/agent/busy_calculator_test.rb
@@ -277,10 +287,12 @@ files:
 - test/new_relic/agent/configuration/manager_test.rb
 - test/new_relic/agent/configuration/server_source_test.rb
 - test/new_relic/agent/configuration/yaml_source_test.rb
+- test/new_relic/agent/cross_process_monitoring_test.rb
 - 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/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
 - test/new_relic/agent/instrumentation/instrumentation_test.rb
 - test/new_relic/agent/instrumentation/metric_frame/pop_test.rb
@@ -318,11 +330,13 @@ files:
 - test/new_relic/command/deployments_test.rb
 - test/new_relic/control/class_methods_test.rb
 - test/new_relic/control/frameworks/rails_test.rb
-- test/new_relic/control/logging_methods_test.rb
 - test/new_relic/control_test.rb
 - test/new_relic/delayed_job_injection_test.rb
+- test/new_relic/dispatcher_test.rb
 - test/new_relic/fake_collector.rb
 - test/new_relic/fake_service.rb
+- test/new_relic/fakes_sending_data.rb
+- test/new_relic/framework_test.rb
 - test/new_relic/load_test.rb
 - test/new_relic/local_environment_test.rb
 - test/new_relic/metric_data_test.rb
@@ -433,39 +447,31 @@ files:
 - newrelic_rpm.gemspec
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-post_install_message: ! 'PLEASE NOTE:
-
-
-  Developer Mode is now a Rack middleware.
-
-
-  Developer Mode is no longer available in Rails 2.1 and earlier.
-
-  However, starting in version 2.12 you can use Developer Mode in any
-
-  Rack based framework, in addition to Rails.  To install developer mode
-
-  in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
-
-  your middleware stack.
-
-
-  If you are using JRuby, we recommend using at least version 1.4 or
-
-  later because of issues with the implementation of the timeout library.
-
-
-  Refer to the README.md file for more information.
-
-
-  Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
-
-  for a complete description of the features and enhancements available
-
-  in this version of the Ruby Agent.
-
-
-'
+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
+  configuration key to true.\n    You may also control the location of the audit log
+  with the audit_log.path key. \n\n  * Use config system for dispatcher, framework,
+  and config file detection\n\n    Several aspects of the agent's configuration were
+  not being handled by the\n    configuration system.  Detection/configuration of
+  the dispatcher (e.g. passenger,\n    unicorn, resque), framework (e.g. rails3, sinatra),
+  and newrelic.yml\n    location are now handled via the Agent environment, manual,
+  and default\n    configuration sources.\n\n  * Updates to logging across the agent\n\n
+  \   We've carefully reviewed the logging messages that the agent outputs, adding\n
+  \   details in some cases, and removing unnecessary clutter. We've also altered\n
+  \   the startup sequence to ensure that we don't spam STDOUT with messages\n    during
+  initialization.\n\n  * Fix passing environment to manual_start()\n\n    Thanks to
+  Justin Hannus.  The :env key, when passed to Agent.manual_start,\n    can again
+  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
+  for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers
 - --inline-source