newrelic_rpm 3.0.1 → 3.1.0.beta1

data/test/new_relic/transaction_sample/summary_segment_test.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
+require 'new_relic/transaction_sample/summary_segment'
+class NewRelic::TransactionSample::SummarySegmentTest < Test::Unit::TestCase
+  def test_summary_segment_creation
+    fake_segment = mock_segment
+    NewRelic::TransactionSample::SummarySegment.new(fake_segment)
+  end
+
+  def test_add_segments
+    fake_segment = mock_segment
+    ss = NewRelic::TransactionSample::SummarySegment.new(fake_segment)
+    other_fake_segment = mock_segment
+    # with the new summary segment
+    ss.expects(:add_called_segment).with(instance_of(NewRelic::TransactionSample::SummarySegment))
+    ss.add_segments([other_fake_segment])
+  end
+
+  private
+
+  @@seg_count = 0
+  def mock_segment
+    @@seg_count += 1
+    segment = mock('segment ' + @@seg_count.to_s)
+    segment.expects(:entry_timestamp).returns(Time.now)
+    segment.expects(:exit_timestamp).returns(Time.now)
+    segment.expects(:metric_name).returns('Custom/test/metric')
+    segment.expects(:called_segments).returns([])
+    segment
+  end
+end
+

data/test/new_relic/transaction_sample_test.rb

@@ -116,4 +116,55 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     end
   end
 
+  def test_path_string
+    s = @t.prepare_to_send(:explain_sql => 0.1)
+    fake_segment = mock('segment')
+    fake_segment.expects(:path_string).returns('a path string')
+    s.instance_eval do
+      @root_segment = fake_segment
+    end
+
+    assert_equal('a path string', s.path_string)
+  end
+
+  def test_params_equals
+    s = @t.prepare_to_send(:explain_sql => 0.1)
+    s.params = {:params => 'hash' }
+    assert_equal({:params => 'hash'}, s.params, "should have the specified hash, but instead was #{s.params}")
+  end
+
+  class Hat
+    # just here to mess with the to_s logic in transaction samples
+  end
+
+  def test_to_s_with_bad_object
+    s = @t.prepare_to_send(:explain_sql => 0.1)
+    s.params[:fake] = Hat.new
+    assert_raise(RuntimeError) do
+      s.to_s
+    end
+  end
+  
+  def test_to_s_includes_keys
+    s = @t.prepare_to_send(:explain_sql => 0.1)
+    s.params[:fake_key] = 'a fake param'
+    assert(s.to_s.include?('fake_key'), "should include 'fake_key' but instead was (#{s.to_s})")
+    assert(s.to_s.include?('a fake param'), "should include 'a fake param' but instead was (#{s.to_s})")
+  end
+
+  def test_find_segment
+    s = @t.prepare_to_send(:explain_sql => 0.1)
+    fake_segment = mock('segment')
+    fake_segment.expects(:find_segment).with(1).returns('a segment')
+    s.instance_eval do
+      @root_segment = fake_segment
+    end
+
+    assert_equal('a segment', s.find_segment(1))
+  end
+
+  def test_timestamp
+    s = @t.prepare_to_send(:explain_sql => 0.1)
+    assert(s.timestamp.instance_of?(Float), "s.timestamp should be a Float, but is #{s.timestamp.class.inspect}")
+  end
 end

data/test/test_helper.rb

@@ -100,21 +100,11 @@ def assert_calls_unscoped_metrics(*metrics)
 end
 
 
-def compare_metrics expected_list, actual_list
-  actual = Set.new actual_list
+def compare_metrics(expected, actual)
   actual.delete('GC/cumulative') # in case we are in REE
-  expected = Set.new expected_list
-  assert_equal expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.join(", ")}; missing: #{(expected - actual).to_a.join(", ")}"
+  assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
-=begin Enable this to see test names as they run
-Test::Unit::TestCase.class_eval do
-  def run_with_info *args, &block
-    puts "#{self.class.name.underscore}/#{@method_name}"
-    run_without_info *args, &block
-  end
-  alias_method_chain :run, :info
-end
-=end
+
 module TransactionSampleTestHelper
   def make_sql_transaction(*sql)
     sampler = NewRelic::Agent::TransactionSampler.new
@@ -126,7 +116,7 @@ module TransactionSampleTestHelper
 
     sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "test"}, 0 ) }
 
-    sleep 1.0
+    sleep 0.02
     yield if block_given?
     sampler.notice_pop_scope "a"
     sampler.notice_scope_empty

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 62196433
+  prerelease: 6
   segments: 
   - 3
+  - 1
   - 0
+  - beta
   - 1
-  version: 3.0.1
+  version: 3.1.0.beta1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -07:00
+date: 2011-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +103,7 @@ files:
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
 - lib/new_relic/agent/error_collector.rb
+- lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
 - lib/new_relic/agent/instrumentation/authlogic.rb
@@ -111,6 +114,7 @@ files:
 - lib/new_relic/agent/instrumentation/merb/controller.rb
 - lib/new_relic/agent/instrumentation/merb/errors.rb
 - lib/new_relic/agent/instrumentation/metric_frame.rb
+- lib/new_relic/agent/instrumentation/metric_frame/pop.rb
 - lib/new_relic/agent/instrumentation/net.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
 - lib/new_relic/agent/instrumentation/queue_time.rb
@@ -157,6 +161,7 @@ files:
 - lib/new_relic/control/logging_methods.rb
 - lib/new_relic/control/profiling.rb
 - 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
@@ -175,7 +180,12 @@ files:
 - lib/new_relic/stats.rb
 - lib/new_relic/timer_lib.rb
 - lib/new_relic/transaction_analysis.rb
+- lib/new_relic/transaction_analysis/segment_summary.rb
 - lib/new_relic/transaction_sample.rb
+- lib/new_relic/transaction_sample/composite_segment.rb
+- lib/new_relic/transaction_sample/fake_segment.rb
+- lib/new_relic/transaction_sample/segment.rb
+- lib/new_relic/transaction_sample/summary_segment.rb
 - lib/new_relic/url_rule.rb
 - lib/new_relic/version.rb
 - lib/newrelic_rpm.rb
@@ -203,9 +213,11 @@ files:
 - test/new_relic/agent/instrumentation/active_record_instrumentation_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
 - 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/rack_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
@@ -213,19 +225,32 @@ files:
 - test/new_relic/agent/method_tracer_test.rb
 - test/new_relic/agent/mock_scope_listener.rb
 - test/new_relic/agent/rpm_agent_test.rb
+- test/new_relic/agent/sampler_test.rb
+- test/new_relic/agent/shim_agent_test.rb
+- test/new_relic/agent/stats_engine/metric_stats/harvest_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/stats_engine_test.rb
 - 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/collection_helper_test.rb
 - test/new_relic/command/deployments_test.rb
+- test/new_relic/control/class_methods_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/local_environment_test.rb
+- test/new_relic/metric_data_test.rb
 - test/new_relic/metric_spec_test.rb
 - test/new_relic/rack/episodes_test.rb
 - test/new_relic/stats_test.rb
+- test/new_relic/transaction_analysis/segment_summary_test.rb
+- test/new_relic/transaction_analysis_test.rb
+- test/new_relic/transaction_sample/composite_segment_test.rb
+- test/new_relic/transaction_sample/fake_segment_test.rb
+- test/new_relic/transaction_sample/segment_test.rb
+- test/new_relic/transaction_sample/summary_segment_test.rb
 - test/new_relic/transaction_sample_subtest_test.rb
 - test/new_relic/transaction_sample_test.rb
 - test/new_relic/version_number_test.rb
@@ -334,7 +359,7 @@ post_install_message: |+
   
   Please see http://support.newrelic.com/faqs/docs/ruby-agent-release-notes
   for a complete description of the features and enhancements available
-  in version 3.0 of the Ruby Agent.
+  in version 3.1 of the Ruby Agent.
   
   For details on this specific release, refer to the CHANGELOG file.
   
@@ -369,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Performance Monitoring Agent