newrelic_rpm 3.5.4.35.beta → 3.5.5.38

data/lib/new_relic/metric_data.rb

@@ -49,7 +49,7 @@ module NewRelic
       "#<MetricData metric_spec:#{metric_spec.inspect}, stats:#{stats.inspect}, metric_id:#{metric_id.inspect}>"
     end
 
-    def to_collector_array(marshaller=nil)
+    def to_collector_array(encoder=nil)
       stat_key = metric_id || { 'name' => metric_spec.name, 'scope' => metric_spec.scope }
       [ stat_key,
         [ stats.call_count, stats.total_call_time, stats.total_exclusive_time,

data/lib/new_relic/metric_spec.rb

@@ -44,7 +44,7 @@ class NewRelic::MetricSpec
   # return a new metric spec if the given regex
   # matches the name or scope.
   def sub(pattern, replacement, apply_to_scope = true)
-    NewRelic::Control.instance.log.warn("The sub method on metric specs is deprecated") rescue nil
+    ::NewRelic::Agent.logger.warn("The sub method on metric specs is deprecated") rescue nil
     return nil if name !~ pattern &&
      (!apply_to_scope || scope.nil? || scope !~ pattern)
     new_name = name.sub(pattern, replacement)[LENGTH_RANGE]

data/lib/new_relic/noticed_error.rb

@@ -45,7 +45,7 @@ class NewRelic::NoticedError
     end
   end
 
-  def to_collector_array(marshaller=nil)
+  def to_collector_array(encoder=nil)
     [ (@timestamp.to_f * 1000).round, @path, @message, @exception_class,
       @params ]
   end

data/lib/new_relic/rack/browser_monitoring.rb

@@ -48,14 +48,14 @@ module NewRelic::Rack
 
         head_pos = if x_ua_compatible_found
           # put at end of header if X-UA-Compatible meta tag found
-          NewRelic::Agent.logger.debug "Detected X-UA-Compatible meta tag. Attempting to insert RUM header at end of head."
+          ::NewRelic::Agent.logger.debug "Detected X-UA-Compatible meta tag. Attempting to insert RUM header at end of head."
           beginning_of_source.index("</head>")
         elsif head_open = beginning_of_source.index("<head")
-          NewRelic::Agent.logger.debug "Attempting to insert RUM header at beginning of head."
+          ::NewRelic::Agent.logger.debug "Attempting to insert RUM header at beginning of head."
           # put at the beginning of the header
           beginning_of_source.index(">", head_open) + 1
         else
-          NewRelic::Agent.logger.debug "Failed to detect head tag. Attempting to insert RUM header at above body tag."
+          ::NewRelic::Agent.logger.debug "Failed to detect head tag. Attempting to insert RUM header at above body tag."
           # otherwise put the header right above body start
           body_start
         end
@@ -71,9 +71,9 @@ module NewRelic::Rack
             source[body_close..-1]
         else
           if head_pos
-            NewRelic::Agent.logger.debug "Skipping RUM instrumentation. Failed to detect head tags."
+            ::NewRelic::Agent.logger.debug "Skipping RUM instrumentation. Failed to detect head tags."
           else
-            NewRelic::Agent.logger.debug "Skipping RUM instrumentation. Detected head is after detected body close."
+            ::NewRelic::Agent.logger.debug "Skipping RUM instrumentation. Detected head is after detected body close."
           end
         end
       end

data/lib/new_relic/stats.rb

@@ -219,13 +219,15 @@ module NewRelic
       super
     end
 
-    def to_json(*a)
-      {'call_count' => call_count,
-        'min_call_time' => min_call_time,
-        'max_call_time' => max_call_time,
-        'total_call_time' => total_call_time,
-        'total_exclusive_time' => total_exclusive_time,
-        'sum_of_squares' => sum_of_squares}.to_json(*a)
+    def to_json(*_)
+      {
+        'call_count'           => call_count.to_i,
+        'min_call_time'        => min_call_time.to_f,
+        'max_call_time'        => max_call_time.to_f,
+        'total_call_time'      => total_call_time.to_f,
+        'total_exclusive_time' => total_exclusive_time.to_f,
+        'sum_of_squares'       => sum_of_squares.to_f
+      }.to_json(*_)
     end
 
 

data/lib/new_relic/transaction_sample.rb

@@ -62,13 +62,8 @@ module NewRelic
         @root_segment.to_array ]
     end
 
-    def to_collector_array(marshaller)
-      trace_tree = if marshaller.respond_to?(:encode_compress)
-        marshaller.encode_compress(self.to_array)
-      else
-        self.to_array
-      end
-
+    def to_collector_array(encoder)
+      trace_tree = encoder.encode(self.to_array)
       [ Helper.time_to_millis(@start_time), Helper.time_to_millis(duration),
         @params[:path], @params[:uri], trace_tree, @guid, nil,
         !!@force_persist ]

data/lib/new_relic/version.rb

@@ -18,7 +18,7 @@ module NewRelic
     GEMSPEC_PATH = File.join(File.dirname(__FILE__), '..', '..', 'newrelic_rpm.gemspec')
     MAJOR = 3
     MINOR = 5
-    TINY  = 4
+    TINY  = 5
     BUILD = parse_build_from_gemspec(GEMSPEC_PATH)
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')

data/lib/newrelic_rpm.rb

@@ -28,7 +28,7 @@ if defined?(Merb) && defined?(Merb::BootLoader)
     end
   end
 elsif defined? Rails
-  if Rails.respond_to?(:version) && Rails.version =~ /^3/
+  if Rails.respond_to?(:version) && Rails.version > '3'
     module NewRelic
       class Railtie < Rails::Railtie
 

data/newrelic_rpm.gemspec.erb

@@ -27,26 +27,24 @@ EOS
     "<%= file %>",<% end %>
   ]
   s.homepage = "http://www.github.com/newrelic/rpm"
-  s.post_install_message = <<-EOS
-PLEASE NOTE:
 
-Developer Mode is now a Rack middleware.
+  <% # Print this version's CHANGELOG as a post_install_message.
+    version_count = 0
+    changes = []
+    File.read(File.join(File.dirname(__FILE__), 'CHANGELOG')).each_line do |line|
+      if line.match(/##\s+v[\d.]+\s+##/)
+        version_count += 1
+      end
+      break if version_count >= 2
+      changes << line.chomp
+    end
+  %>
 
-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.
+  s.post_install_message = <<'EOS'
+<%= changes.join("\n") %>
 
+See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
+changes.
 EOS
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]

data/test/config/newrelic.yml

@@ -24,7 +24,7 @@ test:
     - a
     - b
     - c
-  log_file_path: <%= ::Rails::VERSION::MAJOR == 3 ? Rails.root : RAILS_ROOT %>/log
+  log_file_path: <%= ::Rails::VERSION::MAJOR >= 3 ? Rails.root : RAILS_ROOT %>/log
 
   # Some fixtures for newrelic.yml parsing tests
   erb_value: <%= 'hey'*3 %>

data/test/config/test_control.rb

@@ -1,34 +1,34 @@
 require 'new_relic/control/frameworks/rails'
 require 'new_relic/control/frameworks/rails3'
+require 'new_relic/control/frameworks/rails4'
 
-if defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_i == 3
-  parent_class = NewRelic::Control::Frameworks::Rails3
-else
-  parent_class = NewRelic::Control::Frameworks::Rails
+if defined?(::Rails) && ::Rails.respond_to?(:version)
+  parent_class = case ::Rails.version.to_i
+  when 4
+    NewRelic::Control::Frameworks::Rails4
+  when 3
+    NewRelic::Control::Frameworks::Rails3
+  end
 end
-
+parent_class ||= NewRelic::Control::Frameworks::Rails
 
 class NewRelic::Control::Frameworks::Test < parent_class
   def env
     'test'
   end
+
   def app
-    if defined?(Rails) && Rails.respond_to?(:version) && Rails.version.to_i == 3
-      :rails3
-    else
-      :rails
+    if defined?(::Rails::VERSION)
+      if ::Rails::VERSION::MAJOR.to_i == 4
+        :rails4
+      elsif ::Rails::VERSION::MAJOR.to_i == 3
+        :rails3
+      else
+        :rails
+      end
     end
   end
 
-  def initialize *args
-    super
-    setup_log
-  end
-  # when running tests, don't write out stderr
-  def log!(msg, level=:info)
-    log.send level, msg if log
-  end
-
   # Add the default route in case it's missing.  Need it for testing.
   def install_devmode_route
     super

data/test/fixtures/gemspec_no_build.rb

@@ -125,7 +125,6 @@ EOS
     "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",
@@ -300,7 +299,6 @@ EOS
     "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/fake_collector.rb",

data/test/fixtures/gemspec_with_build.rb

@@ -125,7 +125,6 @@ EOS
     "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",
@@ -300,7 +299,6 @@ EOS
     "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/fake_collector.rb",

data/test/fixtures/gemspec_with_build_and_stage.rb

@@ -125,7 +125,6 @@ EOS
     "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",
@@ -300,7 +299,6 @@ EOS
     "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/fake_collector.rb",

data/test/multiverse/README.md

@@ -13,22 +13,17 @@ painless.
 
 ## Getting started
 
-To run tests against the agent invoke the runner script.
-
-    script/runner
-
-
 You can invoke this via rake
 
-    rake test
+    rake test:multiverse
 
 If you only want to run some test suites you can filter by their names
 
-    script/runner sinatra
+    rake test:multiverse[sinatra]
 
 You can run tests of multiverse itself with
 
-    rake test:self
+    rake test:multiverse:self
 
 ### Adding a test suite
 

data/test/multiverse/suites/agent_only/Envfile

@@ -1,3 +1,4 @@
 gemfile <<-RB
   gem 'rack'
+  gem 'mocha', '< 0.13'
 RB

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

@@ -0,0 +1,99 @@
+# RUBY-981 Audit Log
+
+require 'newrelic_rpm'
+require 'fake_collector'
+require 'mocha'
+
+class AuditLogTest < Test::Unit::TestCase
+  # Initialization
+  def setup
+    $collector ||= NewRelic::FakeCollector.new
+    $collector.reset
+    $collector.run
+
+    @string_log = StringIO.new
+    NewRelic::Agent::AuditLogger.any_instance.stubs(:ensure_log_path).returns(@string_log)
+  end
+
+  def teardown
+    $collector.reset
+  end
+
+  def audit_log_contents
+    if @contents.nil?
+      @string_log.rewind
+      @contents = @string_log.read
+    end
+    @contents
+  end
+
+  def assert_audit_log_contains(needle)
+    # Original request bodies dumped to the log have symbol keys, but once
+    # they go through a dump/load, they're strings again, so we strip
+    # double-quotes and colons from the log, and the strings we searching for.
+    regex = /[:"]/
+    needle = needle.gsub(regex, '')
+    haystack = audit_log_contents.gsub(regex, '')
+    assert(haystack.include?(needle), "Expected log to contain '#{needle}'")
+  end
+
+  # Because we don't generate a strictly machine-readable representation of
+  # request bodies for the audit log, the transformation into strings is
+  # effectively one-way. This, combined with the fact that Hash traversal order
+  # is arbitrary in Ruby 1.8.x means that it's difficult to directly assert that
+  # some object graph made it into the audit log (due to different possible 
+  # orderings of the key/value pairs in Hashes that were embedded in the request
+  # body). So, this method traverses an object graph and only makes assertions
+  # about the terminal (non-Array-or-Hash) nodes therein.
+  def assert_audit_log_contains_object(o, format)
+    if format == :json
+      assert_audit_log_contains(JSON.dump(o))
+    else
+      case o
+      when Hash
+        o.each do |k,v|
+          assert_audit_log_contains_object(v, format)
+        end
+      when Array
+        o.each do |el|
+          assert_audit_log_contains_object(el, format)
+        end
+      else
+        assert_audit_log_contains(o.inspect)
+      end
+    end
+  end
+
+  def run_agent_with_options(options)
+    NewRelic::Agent.manual_start(options)
+    yield NewRelic::Agent.agent if block_given?
+    NewRelic::Agent.shutdown    
+  end
+
+  def test_logs_nothing_by_default
+    run_agent_with_options({})
+    assert_equal('', audit_log_contents)
+  end
+
+  def test_logs_nothing_when_disabled
+    run_agent_with_options({ :'audit_log.enabled' => false })
+    assert_equal('', audit_log_contents)
+  end
+
+  def test_logs_request_bodies_human_readably_ish
+    format = NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported? ? :json : :pruby
+    run_agent_with_options({ :'audit_log.enabled' => true }) do |agent|
+      agent.sql_sampler.notice_first_scope_push(nil)
+      agent.sql_sampler.notice_sql("select * from test",
+                                    "Database/test/select",
+                                    nil, 1.5)
+      agent.sql_sampler.notice_scope_empty
+      agent.send(:harvest_and_send_slowest_sql)
+    end
+
+    $collector.agent_data.each do |req|
+      body = $collector.unpack_inner_blobs(req)
+      assert_audit_log_contains_object(body, format)
+    end
+  end
+end

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

@@ -43,7 +43,7 @@ class MarshalingTest < Test::Unit::TestCase
 
     assert_equal(666,
                  $collector.agent_data.select{|x| x.action == 'transaction_sample_data'}[0].body[0])
-    assert_equal(expected_sample.to_collector_array(marshaller),
+    assert_equal(expected_sample.to_collector_array(marshaller.default_encoder),
                  $collector.agent_data.select{|x| x.action == 'transaction_sample_data'}[0].body[1][0])
   end
 

data/test/multiverse/suites/config_file_loading/Envfile

@@ -0,0 +1,7 @@
+# don't start the agent
+self.newrelic_gemfile_options=(':require => false')
+gemfile <<-RB
+  # stub file system so we can test that newrelic.yml can be loaded from
+  # various places.
+  gem 'fakefs', :require => 'fakefs/safe'
+RB

data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb

@@ -0,0 +1,106 @@
+# Test the logic for loading the newrelic.yml config file.
+#
+# We will look at (in this priority):
+# 1. ENV['NRCONFIG'] (if set)
+# 2. ./config/newrelic.yml
+# 3. ./newrelic.yml
+# 4. ~/.newrelic/newrelic.yml
+# 5. ~/newrelic.yml
+#
+# If this fails the agent will attempt to dial Lew Cirne's cell phone and ask
+# that he verbally describe how it should be configured.
+class ConfigFileLoadingTest < Test::Unit::TestCase
+
+  def setup
+    # While FakeFS stubs out all the File system related libraries (i.e. File,
+    # FileUtils, Dir, etc.)  It doesn't handle the Logger library that is used
+    # to create the agent log file.  Therefore we check for the presence of the
+    # log directory in the FakeFS, then error when we try to open the file in
+    # the Real FS.  Set the log file to /dev/null to work around this issue.
+    # It's incidental to the functionality being tested.
+    #
+    # '/dev/null' can be changed to 'stdout' if more debugging output is needed
+    # in these tests.
+    ENV['NEW_RELIC_LOG'] = '/dev/null'
+
+    # Figure out where multiverse is in the real file system.
+    @cwd = Dir.pwd
+    # Use a fake file system so we don't damage the real one.
+    FakeFS.activate!
+    FakeFS::FileSystem.clear
+
+    # require the agent after we're in FakeFS
+    require 'newrelic_rpm'
+
+    FileUtils.mkdir_p(@cwd)
+  end
+
+  def teardown
+    ENV['NEW_RELIC_LOG'] = nil
+    FakeFS.deactivate!
+  end
+
+  def setup_config(path, manual_config_options = {})
+    NewRelic::Agent.shutdown
+    FileUtils.mkdir_p(File.dirname(path))
+    Dir.chdir @cwd
+    File.open(path, 'w') do |f|
+      f.print <<-YAML
+development:
+  foo: "success!!"
+test:
+  foo: "success!!"
+bazbangbarn:
+  i_am: "bazbangbarn"
+      YAML
+    end
+    NewRelic::Agent.reset_config
+    NewRelic::Agent.manual_start(manual_config_options)
+  end
+
+  def assert_config_read_from(path)
+    setup_config(path)
+    assert NewRelic::Agent.config[:foo] == "success!!", "Failed to read yaml config from #{path.inspect}\n\n#{NewRelic::Agent.config.inspect}"
+  end
+
+  def assert_config_not_read_from(path)
+    setup_config(path)
+    assert NewRelic::Agent.config[:foo] != "success!!", "Read yaml config from #{path.inspect}\n\n#{NewRelic::Agent.config.inspect}"
+  end
+
+  def test_config_loads_from_config_newrelic_yml
+    assert_config_read_from(File.dirname(__FILE__) + "/config/newrelic.yml")
+  end
+
+  def test_config_loads_from_newrelic_yml
+    assert_config_read_from(File.dirname(__FILE__) + "/newrelic.yml")
+  end
+
+  def test_config_loads_from_home_newrelic_yml
+    assert_config_read_from(ENV['HOME'] + "/newrelic.yml")
+  end
+
+  def test_config_loads_from_home_dot_newrelic_newrelic_yml
+    assert_config_read_from(ENV['HOME'] + "/.newrelic/newrelic.yml")
+  end
+
+  def test_config_loads_from_env_NRCONFIG
+    ENV["NRCONFIG"] = "/tmp/foo/bar.yml"
+    assert_config_read_from("/tmp/foo/bar.yml")
+  ensure
+    ENV["NRCONFIG"] = nil
+  end
+
+  def test_config_isnt_loaded_from_somewhere_crazy
+    assert_config_not_read_from(File.dirname(__FILE__) + "/somewhere/crazy/newrelic.yml")
+  end
+
+  def test_config_will_load_settings_for_environment_passed_manual_start
+    path = File.dirname(__FILE__) + "/config/newrelic.yml"
+
+    # pass an env key to NewRelic::Agent.manual_start which should cause it to
+    # load that section of newrelic.yml
+    setup_config(path, {:env => 'bazbangbarn'} )
+    assert_equal 'bazbangbarn', NewRelic::Agent.config[:i_am], "Agent.config did not load bazbangbarn config as requested"
+  end
+end