newrelic_rpm 2.13.5.beta4 → 2.13.6.beta1

data/test/new_relic/agent/rpm_agent_test.rb

@@ -1,7 +1,7 @@
 ENV['SKIP_RAILS'] = 'true'
 require File.expand_path('../../../test_helper', __FILE__) 
 
-class RpmAgentTest < Test::Unit::TestCase # ActiveSupport::TestCase
+class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::TestCase
   extend TestContexts
   
   attr_reader :agent
@@ -48,6 +48,7 @@ class RpmAgentTest < Test::Unit::TestCase # ActiveSupport::TestCase
       assert !@agent.started?
       @agent.start
       assert @agent.started?
+      NewRelic::Agent.shutdown
     end
     
     should "manual_start" do
@@ -55,17 +56,20 @@ class RpmAgentTest < Test::Unit::TestCase # ActiveSupport::TestCase
       NewRelic::Agent.instance.expects(:start_worker_thread).once
       NewRelic::Agent.instance.instance_variable_set '@started', nil
       NewRelic::Agent.manual_start :monitor_mode => true, :license_key => ('x' * 40)
+      NewRelic::Agent.shutdown      
     end
     
     should "post_fork_handler" do
       NewRelic::Agent.manual_start :monitor_mode => true, :license_key => ('x' * 40)
       NewRelic::Agent.after_fork    
-      NewRelic::Agent.after_fork    
+      NewRelic::Agent.after_fork
+      NewRelic::Agent.shutdown
     end
     should "manual_overrides" do
       NewRelic::Agent.manual_start :app_name => "testjobs", :dispatcher_instance_id => "mailer"
       assert_equal "testjobs", NewRelic::Control.instance.app_names[0]
       assert_equal "mailer", NewRelic::Control.instance.dispatcher_instance_id
+      NewRelic::Agent.shutdown
     end
     
     should "restart" do
@@ -73,11 +77,12 @@ class RpmAgentTest < Test::Unit::TestCase # ActiveSupport::TestCase
       NewRelic::Agent.manual_start :app_name => "testjobs", :dispatcher_instance_id => "mailer"
       assert_equal "testjobs", NewRelic::Control.instance.app_names[0]
       assert_equal "mailer", NewRelic::Control.instance.dispatcher_instance_id
+      NewRelic::Agent.shutdown
     end
     
     should "send_timeslice_data" do
       # this test fails due to a rubinius bug
-      return if (RUBY_VERSION =~ /rubinius/i)
+      return if (RUBY_DESCRIPTION =~ /rubinius/i)
       @agent.expects(:invoke_remote).returns({NewRelic::MetricSpec.new("/A/b/c") => 1, NewRelic::MetricSpec.new("/A/b/c", "/X") => 2, NewRelic::MetricSpec.new("/A/b/d") => 3 }.to_a)
       @agent.send :harvest_and_send_timeslice_data
       assert_equal 3, @agent.metric_ids.size

data/test/new_relic/{agent/collection_helper_test.rb → collection_helper_test.rb}

@@ -1,13 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper')) 
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper')) 
 require 'ostruct'
 require 'active_record_fixtures' if defined?(::ActiveRecord)
 
 require 'new_relic/collection_helper'
-class NewRelic::Agent::CollectionHelperTest < Test::Unit::TestCase
+class NewRelic::CollectionHelperTest < Test::Unit::TestCase
   
   def setup
+    NewRelic::Agent.manual_start    
     super
-    NewRelic::Agent.manual_start
   end
   def teardown
     super
@@ -114,7 +114,7 @@ class NewRelic::Agent::CollectionHelperTest < Test::Unit::TestCase
       flunk "should throw"
     rescue => e
       #puts e
-      #puts e.backtrace.join("\n")
+      #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")

data/test/new_relic/{deployments_api_test.rb → command/deployments_test.rb}

@@ -1,9 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
-require File.expand_path(File.join(File.dirname(__FILE__),'/../../lib/new_relic/command'))
-require 'rubygems'
-require 'mocha'
+require File.expand_path(File.join(File.dirname(__FILE__),'/../../test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'/../../../lib/new_relic/command'))
 
-class NewRelic::DeploymentsTest < Test::Unit::TestCase
+class NewRelic::Command::DeploymentsTest < Test::Unit::TestCase
   
   def setup
     NewRelic::Command::Deployments.class_eval do

data/test/new_relic/control_test.rb

@@ -1,13 +1,13 @@
-ENV['SKIP_RAILS'] = 'true'
 require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper'))
-
 class NewRelic::ControlTest < Test::Unit::TestCase
   
   attr_reader :c
   
   def setup
-    NewRelic::Agent.manual_start
+    
+    NewRelic::Agent.manual_start(:dispatcher_instance_id => 'test')
     @c =  NewRelic::Control.instance
+    raise 'oh geez, wrong class' unless NewRelic::Control.instance.is_a?(::NewRelic::Control::Frameworks::Test)
   end
   def shutdown
     NewRelic::Agent.shutdown

data/test/new_relic/{environment_test.rb → local_environment_test.rb}

@@ -1,8 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
-require "test/unit"
-require "mocha"
-##require 'new_relic/local_environment'
-class EnvironmentTest < Test::Unit::TestCase # ActiveSupport::TestCase
+class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
   
   def teardown
     # To remove mock server instances from ObjectSpace
@@ -72,4 +69,4 @@ class EnvironmentTest < Test::Unit::TestCase # ActiveSupport::TestCase
     ARGV.pop
   end
   
-end
+end

data/test/new_relic/metric_spec_test.rb

@@ -1,18 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
-##require "new_relic/stats"
-class NewRelic::MetricSpecTest < Test::Unit::TestCase
-  
-  def test_simple
-    stats = NewRelic::MethodTraceStats.new 
-    validate stats, 0, 0, 0, 0
-    
-    assert_equal stats.call_count,0
-    stats.trace_call 10
-    stats.trace_call 20
-    stats.trace_call 30
-    
-    validate stats, 3, (10+20+30), 10, 30
-  end
+class NewRelic::MetricSpecTest < Test::Unit::TestCase  
   
   def test_equal
     spec1 = NewRelic::MetricSpec.new('Controller')
@@ -50,128 +37,51 @@ class NewRelic::MetricSpecTest < Test::Unit::TestCase
     assert_equal [s2, s1].sort, [s2, s1] # unchanged due to no sort criteria
     assert_equal [s1, s2].sort, [s1, s2] # unchanged due to no sort criteria  
   end
-  
-  def test_merge
-    s1 = NewRelic::MethodTraceStats.new
-    s2 = NewRelic::MethodTraceStats.new
+
+  # test to make sure the MetricSpec class can serialize to json
+  def test_json
+    spec = NewRelic::MetricSpec.new("controller", "metric#find")
     
-    s1.trace_call 10
-    s2.trace_call 20
-    s2.freeze
+    import = ::ActiveSupport::JSON.decode(spec.to_json)
     
-    validate s2, 1, 20, 20, 20
-    s3 = s1.merge s2
-    validate s3, 2, (10+20), 10, 20
-    validate s1, 1, 10, 10, 10
-    validate s2, 1, 20, 20, 20
+    compare_spec(spec, import)
     
-    s1.merge! s2
-    validate s1, 2, (10+20), 10, 20
-    validate s2, 1, 20, 20, 20
-  end
-  
-  def test_merge_with_exclusive
-    s1 = NewRelic::MethodTraceStats.new
+    stats = NewRelic::MethodTraceStats.new
     
-    s2 = NewRelic::MethodTraceStats.new
+    import = ::ActiveSupport::JSON.decode(stats.to_json)
     
-    s1.trace_call 10, 5
-    s2.trace_call 20, 10
-    s2.freeze
+    compare_stat(stats, import)
     
-    validate s2, 1, 20, 20, 20, 10
-    s3 = s1.merge s2
-    validate s3, 2, (10+20), 10, 20, (10+5)
-    validate s1, 1, 10, 10, 10, 5
-    validate s2, 1, 20, 20, 20, 10
+    metric_data = NewRelic::MetricData.new(spec, stats, 10)
     
-    s1.merge! s2
-    validate s1, 2, (10+20), 10, 20, (5+10)
-    validate s2, 1, 20, 20, 20, 10
-  end
-  
-  def test_merge_array
-    s1 = NewRelic::MethodTraceStats.new
-    merges = []
-    merges << (NewRelic::MethodTraceStats.new.trace_call 1)
-    merges << (NewRelic::MethodTraceStats.new.trace_call 1)
-    merges << (NewRelic::MethodTraceStats.new.trace_call 1)
+    import = ::ActiveSupport::JSON.decode(metric_data.to_json)
     
-    s1.merge! merges
-    validate s1, 3, 3, 1, 1
+    compare_metric_data(metric_data, import)
   end
   
-  def test_freeze
-    s1 = NewRelic::MethodTraceStats.new
-    
-    s1.trace_call 10
-    s1.freeze
-    
-    begin
-      # the following should throw an exception because s1 is frozen
-      s1.trace_call 20
-      assert false
-    rescue StandardError
-      assert s1.frozen?
-      validate s1, 1, 10, 10, 10
-    end
-  end
   
-  def test_std_dev
-    s = NewRelic::MethodTraceStats.new
-    
-    s.trace_call 10
-    s.trace_call 10
-    s.trace_call 10
-    s.trace_call 10
-    s.trace_call 10
-    s.trace_call 10
-    assert s.standard_deviation == 0
-    
-    s = NewRelic::MethodTraceStats.new
-    s.trace_call 4
-    s.trace_call 7
-    s.trace_call 13
-    s.trace_call 16
-    s.trace_call 8
-    s.trace_call 4
-    assert_equal(s.sum_of_squares, 4**2 + 7**2 + 13**2 + 16**2 + 8**2 + 4**2)
-    
-    s.trace_call 9
-    s.trace_call 3
-    s.trace_call 1000
-    s.trace_call 4
-    
-    # calculated stdev (population, not sample) from a spreadsheet.
-    assert_in_delta(s.standard_deviation, 297.76, 0.01)
+  private 
+  
+  def compare_spec(spec, import)
+    assert_equal 2, import.length
+    assert_equal spec.name, import['name']
+    assert_equal spec.scope, import['scope']
   end
   
-  def test_std_dev_merge
-    s1 = NewRelic::MethodTraceStats.new
-    s1.trace_call 4
-    s1.trace_call 7
-    
-    s2 = NewRelic::MethodTraceStats.new
-    s2.trace_call 13
-    s2.trace_call 16
-    
-    s3 = s1.merge(s2)
-    
-    assert_equal(s1.sum_of_squares, 4*4 + 7*7)
-    assert_in_delta(s1.standard_deviation, 1.5, 0.01)
-    
-    assert_in_delta(s2.standard_deviation, 1.5, 0.01)
-    assert_equal(s3.sum_of_squares, 4*4 + 7*7 + 13*13 + 16*16, "check sum of squares")
-    assert_in_delta(s3.standard_deviation, 4.743, 0.01)
+  def compare_stat(stats, import)
+    assert_equal 6, import.length
+    assert_equal stats.total_call_time, import['total_call_time']
+    assert_equal stats.max_call_time, import['max_call_time']
+    assert_equal stats.min_call_time, import['min_call_time']
+    assert_equal stats.sum_of_squares, import['sum_of_squares']
+    assert_equal stats.call_count, import['call_count']
+    assert_equal stats.total_exclusive_time, import['total_exclusive_time']
   end
   
-  private
-  def validate (stats, count, total, min, max, exclusive = nil)
-    assert_equal stats.call_count, count
-    assert_equal stats.total_call_time, total
-    assert_equal stats.average_call_time, (count > 0 ? total / count : 0)
-    assert_equal stats.min_call_time, min
-    assert_equal stats.max_call_time, max
-    assert_equal stats.total_exclusive_time, exclusive if exclusive
+  def compare_metric_data(metric_data, import)
+    assert_equal 3, import.length
+    assert_equal metric_data.metric_id, import['metric_id']
+    compare_spec(metric_data.metric_spec, import['metric_spec']) unless metric_data.metric_id
+    compare_stat(metric_data.stats, import['stats'])
   end
 end

data/test/new_relic/stats_test.rb

@@ -13,7 +13,6 @@ end; end
 
 
 class NewRelic::StatsTest < Test::Unit::TestCase
-  
   def test_sum_attributes
     first  = NewRelic::TestObjectForStats.new
     second = mock('other object')

data/test/new_relic/{agent/transaction_sample_test.rb → transaction_sample_test.rb}

@@ -1,5 +1,4 @@
-ENV['SKIP_RAILS'] = 'true'
-require File.expand_path('../../../test_helper.rb', __FILE__) 
+require File.expand_path('../../test_helper.rb', __FILE__) 
 
 class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   include TransactionSampleTestHelper

data/test/test_helper.rb

@@ -24,6 +24,7 @@ rescue LoadError
   puts "Unable to load Rails for New Relic tests"
   raise
 end
+require 'newrelic_rpm'
 
 require 'test/unit'
 require 'shoulda'

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

@@ -0,0 +1,19 @@
+Copyright (c) 2010-2011 Justin George
+
+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.

data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb

@@ -0,0 +1,57 @@
+require 'dependency_detection/version'
+module DependencyDetection
+  
+  module_function
+  @@items = []
+  def defer(&block)
+    item = Dependent.new
+    item.instance_eval(&block)
+    @@items << item
+  end
+  
+  def detect!
+    @@items.each do |item|
+      if item.dependencies_satisfied?
+        item.execute
+      end
+    end
+  end
+  
+  class Dependent
+    attr_reader :executed
+    def executed!
+      @executed = true
+    end
+
+    attr_reader :dependencies
+
+    def initialize
+      @dependencies = []
+      @executes = []
+    end
+    
+    def dependencies_satisfied?
+      !executed and check_dependencies
+    end
+
+    def execute
+      @executes.each do |x|
+        x.call
+      end
+    ensure
+      executed!
+    end
+
+    def check_dependencies
+      dependencies && dependencies.all? { |d| d.call }
+    end
+
+    def depends_on
+      @dependencies << Proc.new
+    end
+
+    def executes
+      @executes << Proc.new
+    end
+  end
+end

data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection/version.rb

@@ -0,0 +1,3 @@
+module DependencyDetection
+  VERSION='0.0.1.build'
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 62196243
+  hash: 62196225
   prerelease: 7
   segments: 
   - 2
   - 13
-  - 5
+  - 6
   - beta
-  - 4
-  version: 2.13.5.beta4
+  - 1
+  version: 2.13.6.beta1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -08:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,9 +73,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- mongrel_rpm
-- newrelic
 - newrelic_cmd
+- newrelic
+- mongrel_rpm
 extensions: []
 
 extra_rdoc_files: 
@@ -92,6 +92,7 @@ files:
 - bin/newrelic_cmd
 - cert/cacert.pem
 - install.rb
+- lib/conditional_vendored_dependency_detection.rb
 - lib/conditional_vendored_metric_parser.rb
 - lib/new_relic/agent.rb
 - lib/new_relic/agent/agent.rb
@@ -182,44 +183,41 @@ files:
 - test/active_record_fixtures.rb
 - test/config/newrelic.yml
 - test/config/test_control.rb
-- test/new_relic/agent/active_record_instrumentation_test.rb
-- test/new_relic/agent/add_method_tracer_test.rb
-- test/new_relic/agent/agent_connect_test.rb
-- test/new_relic/agent/agent_controller_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/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_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/busy_calculator_test.rb
-- test/new_relic/agent/collection_helper_test.rb
-- test/new_relic/agent/error_collector_notice_error_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/metric_frame_test.rb
+- test/new_relic/agent/instrumentation/net_instrumentation_test.rb
+- test/new_relic/agent/instrumentation/queue_time_test.rb
+- test/new_relic/agent/instrumentation/task_instrumentation_test.rb
 - test/new_relic/agent/memcache_instrumentation_test.rb
+- test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb
+- test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb
 - test/new_relic/agent/method_tracer_test.rb
-- test/new_relic/agent/method_tracer_trace_execution_scoped_test.rb
-- test/new_relic/agent/metric_data_test.rb
-- test/new_relic/agent/metric_frame_test.rb
 - test/new_relic/agent/mock_scope_listener.rb
-- test/new_relic/agent/net_instrumentation_test.rb
-- test/new_relic/agent/queue_time_test.rb
 - test/new_relic/agent/rpm_agent_test.rb
 - test/new_relic/agent/stats_engine/metric_stats_test.rb
 - test/new_relic/agent/stats_engine/samplers_test.rb
 - test/new_relic/agent/stats_engine/stats_engine_test.rb
-- test/new_relic/agent/task_instrumentation_test.rb
-- test/new_relic/agent/testable_agent.rb
 - test/new_relic/agent/transaction_sample_builder_test.rb
-- test/new_relic/agent/transaction_sample_subtest_test.rb
-- test/new_relic/agent/transaction_sample_test.rb
 - test/new_relic/agent/transaction_sampler_test.rb
 - test/new_relic/agent/worker_loop_test.rb
+- test/new_relic/collection_helper_test.rb
+- test/new_relic/command/deployments_test.rb
 - test/new_relic/control_test.rb
-- test/new_relic/deployments_api_test.rb
-- test/new_relic/environment_test.rb
+- test/new_relic/local_environment_test.rb
 - test/new_relic/metric_spec_test.rb
 - test/new_relic/rack/episodes_test.rb
-- test/new_relic/shim_agent_test.rb
 - test/new_relic/stats_test.rb
+- test/new_relic/transaction_sample_subtest_test.rb
+- test/new_relic/transaction_sample_test.rb
 - test/new_relic/version_number_test.rb
 - test/test_contexts.rb
 - test/test_helper.rb
@@ -254,6 +252,10 @@ files:
 - ui/views/newrelic/show_sample.rhtml
 - 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