newrelic_rpm 3.1.0 → 3.1.1.beta1

data/test/new_relic/collection_helper_test.rb

@@ -117,11 +117,29 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
       #puts e.backtrace.grep(/trace/).join("\n")
       #puts "\n\n"
       clean_trace = strip_nr_from_backtrace(e.backtrace)
-      assert_equal 0, clean_trace.grep(/newrelic_rpm/).size, clean_trace.join("\n")
-      assert_equal 0, clean_trace.grep(/trace/).size, clean_trace.join("\n")
-      assert (clean_trace.grep(/find/).size >= 3), "should see at least three frames with 'find' in them (#{e}): \n#{clean_trace.join("\n")}"
+      assert_equal(0, clean_trace.grep(/newrelic_rpm/).size,
+               "should remove all instances of new relic from backtrace but got: #{clean_trace.join("\n")}")
+      assert_equal(0, clean_trace.grep(/trace/).size, 
+                   "should remove trace method tags from method names but got: #{clean_trace.join("\n")}")
+      assert((clean_trace.grep(/find/).size >= 3),
+             "should see at least three frames with 'find' in them (#{e}): \n#{clean_trace.join("\n")}")
     ensure
       ActiveRecordFixtures.teardown
     end
   end if defined?(::ActiveRecord)
+
+  def test_disabled_strip_backtrace
+    NewRelic::Control.instance['disable_backtrace_cleanup'] = true
+    begin
+      flunk "should throw"
+    rescue => e
+      clean_trace = strip_nr_from_backtrace(e.backtrace)
+      assert_equal(1, clean_trace.grep(/new_relic/).size,
+            "should not remove instances of new relic from backtrace but got: #{clean_trace.join("\n")}")
+      assert_equal(1, clean_trace.grep(/trace/).size, 
+                   "should not remove trace method tags from method names but got: #{clean_trace.join("\n")}")
+#       assert (clean_trace.grep(/find/).size >= 3), "should see at least three frames with 'find' in them (#{e}): \n#{clean_trace.join("\n")}"
+    end
+    NewRelic::Control.instance['disable_backtrace_cleanup'] = false
+  end
 end

data/test/new_relic/control/configuration_test.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'/../../test_helper'))
+class NewRelic::Control::ConfigurationTest < Test::Unit::TestCase
+  require 'new_relic/control/configuration'
+  include NewRelic::Control::Configuration
+  def test_license_key_defaults_to_env_variable
+    ENV['NEWRELIC_LICENSE_KEY'] = nil
+    self.expects(:fetch).with('license_key', nil)
+    license_key
+
+    ENV['NEWRELIC_LICENSE_KEY'] = "a string"
+    self.expects(:fetch).with('license_key', 'a string')
+    license_key
+  end
+  
+  def test_log_file_path_uses_default_if_not_set
+    root = ::Rails::VERSION::MAJOR == 3 ? Rails.root : RAILS_ROOT
+    assert_equal(File.join(root, 'log'),
+                 NewRelic::Control.instance.log_file_path)
+  end
+
+  def test_log_file_path_uses_given_value
+    NewRelic::Control.instance['log_file_path'] = '/lerg'
+    assert_equal '/lerg', NewRelic::Control.instance.log_file_path
+  end
+end

data/test/new_relic/data_serialization_test.rb

@@ -1,6 +1,13 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 require 'new_relic/data_serialization'
 class NewRelic::DataSerializationTest < Test::Unit::TestCase
+  
+  def setup
+    NewRelic::Control.instance['log_file_path'] = './log'
+    FileUtils.rm_rf('./log/newrelic_agent_store.db')
+    FileUtils.rm_rf('./log/newrelic_agent_store.age')    
+  end
+  
   def test_read_and_write_from_file_read_only
     file = './log/newrelic_agent_store.db'
     File.open(file, 'w') do |f|
@@ -55,16 +62,64 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
     assert(NewRelic::DataSerialization.should_send_data?, 'Should be over limit')
   end
 
+  def test_read_until_eoferror
+    file = './log/newrelic_agent_store.db'    
+    File.open(file, 'w') do |f|
+      f.write("a" * 10_001)
+    end
+    value = ""
+    File.open(file,'r') do |f|
+      value << NewRelic::DataSerialization.instance_eval { read_until_eof_error(f) }
+    end
+    assert_equal('a' * 10_001, value, "should retrieve all the contents from the string and not raise EOFerrors")
+  end
+  
+  def test_write_contents_nonblockingly
+    file = './log/newrelic_agent_store.db'    
+    File.open(file, 'w') do |f|
+      f.write("") # write nothing! NOTHING
+    end
+
+    File.open(file, 'w') do |f|
+      NewRelic::DataSerialization.instance_eval { write_contents_nonblockingly(f, 'a' * 10_001) }
+    end
+    value = File.read(file)
+    assert_equal('a' * 10_001, value, "should write a couple thousand 'a's to a file without exploding")
+  end
+
   def test_should_send_data_disabled
     NewRelic::Control.instance.expects(:disable_serialization?).returns(true)
     assert(NewRelic::DataSerialization.should_send_data?, 'should send data when disabled')
   end
 
   def test_should_send_data_under_limit
-    NewRelic::DataSerialization.expects(:max_size).returns(50)
-    NewRelic::DataSerialization.read_and_write_to_file do
+    NewRelic::DataSerialization.expects(:max_size).returns(2000)
+    NewRelic::DataSerialization.read_and_write_to_file do | old_data |
       "a" * 5
     end
-    assert(!NewRelic::DataSerialization.should_send_data?, 'Should be under the limit')
+    
+    assert(!NewRelic::DataSerialization.should_send_data?,
+           'Should be under the limit')
+  end
+
+  def test_should_handle_empty_spool_file
+    NewRelic::Control.instance.log.expects(:error).never
+    assert_nil NewRelic::DataSerialization.instance_eval { load('') }
+  end
+
+  def test_spool_file_location_respects_log_file_path_setting
+    NewRelic::Control.instance['log_file_path'] = "./tmp"
+    NewRelic::DataSerialization.read_and_write_to_file do |_|
+      'a' * 30
+    end
+    assert(File.exists?('./tmp/newrelic_agent_store.db'),
+           "Spool file not created at user specified location")
+  end
+
+  def test_age_file_location_respects_log_file_path_setting
+    NewRelic::Control.instance['log_file_path'] = "./tmp"
+    NewRelic::DataSerialization.update_last_sent!
+    assert(File.exists?('./tmp/newrelic_agent_store.age'),
+           "Age file not created at user specified location")
   end
 end

data/test/new_relic/delayed_job_injection_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+module NewRelic
+  class DelayedJobInstrumentationTest < Test::Unit::TestCase
+    def test_skip_logging_if_no_logger_found
+      Object.const_set('Delayed', Module.new)
+      ::Delayed.const_set('Worker', Class.new)
+      
+      NewRelic::Agent.stubs(:logger).raises(NoMethodError,
+                                            'tempoarily not allowed')
+      NewRelic::Agent.stubs(:respond_to?).with(:logger).returns(false)
+      
+      assert DependencyDetection.detect!
+
+      Object.class_eval { remove_const('Delayed') }
+    end
+  end
+end

data/test/new_relic/transaction_analysis/segment_summary_test.rb

@@ -63,6 +63,20 @@ class NewRelic::TransactionAnalysis::SegmentSummaryTest < Test::Unit::TestCase
     assert_equal 0.5, @ss.total_time_percentage
   end
 
+  def test_nesting_total_time
+    segment = mock('segment')
+    segment.expects(:metric_name).twice.returns('Controller/foo')
+    segment.expects(:duration).returns(0.1)
+    segment.expects(:exclusive_duration).returns(0)
+    @ss << segment
+    segment.expects(:exclusive_duration).returns(0.1)
+    @ss.current_nest_count += 1
+    @ss << segment
+    assert_equal 0.1, @ss.total_time
+    assert_equal 0.1, @ss.exclusive_time
+    assert_equal 2, @ss.call_count
+  end
+
   def test_ui_name_default
     @ss.metric_name = 'Remainder'
     assert_equal 'Remainder', @ss.ui_name

data/test/new_relic/transaction_analysis_test.rb

@@ -28,7 +28,7 @@ class NewRelic::TransactionAnalysisTest < Test::Unit::TestCase
     other_segment.expects(:metric_name).twice.returns('Controller/foo')
     other_segment.expects(:duration).returns(0.1)
     other_segment.expects(:exclusive_duration).returns(0.1)
-    self.expects(:each_segment).multiple_yields(root_segment, other_segment)
+    self.expects(:each_segment_with_nest_tracking).multiple_yields(root_segment, other_segment)
     self.expects(:root_segment).twice.returns(root_segment)
     self.expects(:duration).returns(0.1)
     data = breakdown_data
@@ -56,7 +56,7 @@ class NewRelic::TransactionAnalysisTest < Test::Unit::TestCase
     yet_another.expects(:metric_name).twice.returns('Controller/bar')
     yet_another.expects(:duration).returns(0.2)
     yet_another.expects(:exclusive_duration).returns(0.2)
-    self.expects(:each_segment).multiple_yields(root_segment, other_segment, yet_another)
+    self.expects(:each_segment_with_nest_tracking).multiple_yields(root_segment, other_segment, yet_another)
     self.expects(:root_segment).times(3).returns(root_segment)
     self.expects(:duration).returns(0.1)
     data = breakdown_data(1)
@@ -76,7 +76,7 @@ class NewRelic::TransactionAnalysisTest < Test::Unit::TestCase
     other_segment.expects(:metric_name).twice.returns('Controller/foo')
     other_segment.expects(:duration).returns(0.1)
     other_segment.expects(:exclusive_duration).returns(0.1)
-    self.expects(:each_segment).multiple_yields(root_segment, other_segment)
+    self.expects(:each_segment_with_nest_tracking).multiple_yields(root_segment, other_segment)
     self.expects(:root_segment).twice.returns(root_segment)
     self.expects(:duration).returns(0.2)
     data = breakdown_data

data/test/new_relic/transaction_sample/segment_test.rb

@@ -313,6 +313,17 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     assert_equal(2, count)
   end
 
+  def test_each_segment_with_nest_tracking
+    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
+
+    summary = mock('summary')
+    summary.expects(:current_nest_count).twice.returns(0).then.returns(1)
+    summary.expects(:current_nest_count=).twice
+    s.each_segment_with_nest_tracking do |x|
+      summary
+    end
+  end
+
   def test_find_segment_default
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
     id_to_find = s.segment_id

data/test/test_helper.rb

@@ -101,7 +101,7 @@ end
 
 
 def compare_metrics(expected, actual)
-  actual.delete('GC/cumulative') # in case we are in REE
+  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
 

data/vendor/gems/dependency_detection-0.0.1.build/LICENSE

@@ -1,19 +1,5 @@
-Copyright (c) 2010-2011 Justin George
+Copyright (c) 2010-2011 New Relic, Inc.  All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+This code is, and has always been, copyright New Relic and licensed 
+under our license terms that can be found in master license file 
+located here: ../../../../LICENSE

metadata

@@ -1,22 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 62196441
+  prerelease: 6
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  - beta
+  - 1
+  version: 3.1.1.beta1
 platform: ruby
 authors: 
 - Bill Kayser
+- Jon Guymon
 - Justin George
+- Darin Swanson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 -07:00
+date: 2011-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,6 +152,7 @@ files:
 - lib/new_relic/control.rb
 - lib/new_relic/control/class_methods.rb
 - lib/new_relic/control/configuration.rb
+- lib/new_relic/control/frameworks.rb
 - lib/new_relic/control/frameworks/external.rb
 - lib/new_relic/control/frameworks/merb.rb
 - lib/new_relic/control/frameworks/rails.rb
@@ -161,7 +166,6 @@ files:
 - lib/new_relic/control/server_methods.rb
 - lib/new_relic/data_serialization.rb
 - lib/new_relic/delayed_job_injection.rb
-- lib/new_relic/histogram.rb
 - lib/new_relic/local_environment.rb
 - lib/new_relic/merbtasks.rb
 - lib/new_relic/metric_data.rb
@@ -170,10 +174,6 @@ files:
 - lib/new_relic/noticed_error.rb
 - lib/new_relic/rack/browser_monitoring.rb
 - lib/new_relic/rack/developer_mode.rb
-- lib/new_relic/rack/metric_app.rb
-- lib/new_relic/rack/mongrel_rpm.ru
-- lib/new_relic/rack/newrelic.yml
-- lib/new_relic/rack_app.rb
 - lib/new_relic/recipes.rb
 - lib/new_relic/stats.rb
 - lib/new_relic/timer_lib.rb
@@ -232,12 +232,15 @@ files:
 - test/new_relic/agent/transaction_sample_builder_test.rb
 - test/new_relic/agent/transaction_sampler_test.rb
 - test/new_relic/agent/worker_loop_test.rb
+- test/new_relic/agent_test.rb
 - test/new_relic/collection_helper_test.rb
 - test/new_relic/command/deployments_test.rb
 - test/new_relic/control/class_methods_test.rb
+- test/new_relic/control/configuration_test.rb
 - test/new_relic/control/logging_methods_test.rb
 - test/new_relic/control_test.rb
 - test/new_relic/data_serialization_test.rb
+- test/new_relic/delayed_job_injection_test.rb
 - test/new_relic/local_environment_test.rb
 - test/new_relic/metric_data_test.rb
 - test/new_relic/metric_spec_test.rb
@@ -288,11 +291,8 @@ files:
 - ui/views/newrelic/show_source.rhtml
 - ui/views/newrelic/threads.rhtml
 - vendor/gems/dependency_detection-0.0.1.build/LICENSE
-- vendor/gems/dependency_detection-0.0.1.build/README
 - vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb
 - vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection/version.rb
-- vendor/gems/metric_parser-0.1.0.pre1/LICENSE
-- vendor/gems/metric_parser-0.1.0.pre1/README
 - vendor/gems/metric_parser-0.1.0.pre1/lib/metric_parser.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser.rb
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/action_mailer.rb

data/lib/new_relic/histogram.rb

@@ -1,91 +0,0 @@
-# Histogram is used for organizing response times
-# into an 'Exponential Histogram'.  Feature based in part on DHH proposal:
-# http://37signals.com/svn/posts/1836-the-problem-with-averages
-#
-# Histogram builds a set of buckets of geometrically growing size, with the assumption that most
-# apps have long-tail response times, and therefore you need the most granularity at the lowest
-# r/t level.
-module NewRelic
-  class Histogram
-
-    # Used to stub out API methods when the agent is not enabled
-    module Shim
-      def process(response_time); end
-    end
-    # Stores statistics for response times falling in a particular range.
-    # A bucket has a min and max response time.  A response time event
-    # falls in a bucket if min <= r/t < max.  A bucket also
-    # has an associated metric for reporting data to New Relic.  The
-    # bucket range is encoded in the metic name
-    class Bucket
-
-      attr_reader :min, :max, :stats
-
-      def initialize(min, max = nil)
-        @min = min
-        @max = max
-      end
-
-      def stats
-        NewRelic::Agent.get_stats("Response Times/#{min_millis}/#{max_millis}")
-      end
-
-      # This has return value like <=> but does something more
-      # than simply compare.  If the value falls within range for
-      # the bucket, increment count and return 0; otherwise return
-      # a value < 0 if the value belongs in a bucket with a lower range
-      # you can guess what it returns if the value belongs in a bucket
-      # with a higher range. (Hint: it's not 0, and it's not less than zero.)
-      def process(value)
-        if value < min
-          return -1
-
-          # max == nil means unlimited max (last bucket)
-        elsif max && value >= max
-          return 1
-
-        else
-          stats.record_data_point(value)
-          return 0
-        end
-      end
-
-      def min_millis
-        (min * 1000).round
-      end
-
-      def max_millis
-        max.nil? ? nil : (max * 1000).round
-      end
-
-      def to_s
-        "#{min_millis} - #{max_millis}: #{stats.call_count}"
-      end
-    end
-
-    attr_reader :buckets
-
-    # Histogram uses apdex T / 10 as its minimum bucket size, and grows from there.
-    # 30 data points should be adequate resolution.
-    def initialize(first_bucket_max = 0.010, bucket_count = 30, multiplier = 1.3)
-      @buckets = []
-
-      min = 0
-      max = first_bucket_max
-
-      (bucket_count - 1).times do
-        @buckets << Bucket.new(min, max)
-        min = max
-        max *= multiplier
-      end
-      @buckets << Bucket.new(max)
-    end
-
-    def process(response_time)
-      buckets.each do |bucket|
-        found = bucket.process(response_time)
-        return if found == 0
-      end
-    end
-  end
-end

data/lib/new_relic/rack/metric_app.rb

@@ -1,65 +0,0 @@
-require 'fileutils'
-module NewRelic
-  module Rack
-    class MetricApp
-      def initialize(options)
-        if options[:install]
-          src = File.join(File.dirname(__FILE__), "newrelic.yml")
-          require 'new_relic/command'
-          begin
-            NewRelic::Command::Install.new(:quiet => true, :src_file => src).run
-            NewRelic::Agent.logger.info "A newrelic.yml template was copied to #{File.expand_path('.')}."
-            NewRelic::Agent.logger.info "Please add a license key to the file and restart #{$0}"
-            exit 0
-          rescue NewRelic::Command::CommandFailure => e
-            NewRelic::Agent.logger.error e.message
-            exit 1
-          end
-        end
-        options[:app_name] ||= 'EPM Monitor'
-        options[:disable_samplers] = true
-        NewRelic::Agent.manual_start options
-        NewRelic::Agent.logger.warn "This rack app is deprecated - it will be removed in the next version of the Ruby Agent"
-        unless NewRelic::Control.instance.license_key
-          raise "Please add a valid license key to newrelic.yml."
-        end
-      end
-      def call(env)
-        request = ::Rack::Request.new env
-        params = request.params
-        if !(params['uri'] || params['metric'])
-          [400, { 'Content-Type' => 'text/plain' },  "Missing 'uri' or 'metric' parameter: #{params.inspect}" ]
-        elsif !params['value']
-          [400, { 'Content-Type' => 'text/plain' },  "Missing 'value' parameter: #{params.inspect}" ]
-        else
-          NewRelic::Agent.record_transaction( params['value'].to_f, params )
-          ::Rack::Response.new(params.collect { |k, v| "#{k}=#{v} " }.join).finish
-        end
-      end
-    end
-    class Status
-      def call(env)
-        request = ::Rack::Request.new env
-        data_url = "http://#{env['HTTP_HOST']}/metrics/path?value=nnn"
-        body = StringIO.new
-        body.puts "<html><body>"
-        body.puts "<h1>New Relic Actively Monitoring #{NewRelic::Control.instance.app_names.join(' and ')}</h1>"
-        body.puts "<p>To submit a metric value, use <a href='#{data_url}'>#{data_url}</a></p>"
-        body.puts "<h2>Request Details</h2>"
-        body.puts "<dl>"
-        body.puts "<dt>ip<dd>#{request.ip}"
-        body.puts "<dt>host<dd>#{request.host}"
-        body.puts "<dt>path<dd>#{request.url}"
-        body.puts "<dt>query<dd>#{request.query_string}"
-        body.puts "<dt>params<dd>#{request.params.inspect}"
-        body.puts "</dl>"
-        body.puts "<h2>Complete ENV</h2>"
-        body.puts "<ul>"
-        body.puts env.to_a.map{|k,v| "<li>#{k} = #{v}</li>" }.join("\n")
-        body.puts "</ul></body></html>"
-        response = ::Rack::Response.new body.string
-        response.finish
-      end
-    end
-  end
-end