newrelic_rpm 3.5.2.17 → 3.5.3.24

data/test/new_relic/fake_service.rb

@@ -7,12 +7,14 @@ module NewRelic
     def initialize
       @agent_data = []
       @supported_methods = [ :connect, :metric_data, :transaction_sample_data,
-                             :error_data, :sql_trace_data, :shutdown ]
+                             :error_data, :sql_trace_data, :profile_data,
+                             :get_agent_commands, :shutdown ]
       @collector = NewRelic::Control::Server.new(:name => 'fakehost', :port => 0)
       @id_counter = 0
       @base_expectations = {
         'get_redirect_host'       => 'localhost',
         'connect'                 => { 'agent_run_id' => agent_run_id },
+        'get_agent_commands'      => [],
         'metric_data'             => { 'Some/Metric/Spec' => 1 },
         'sql_trace_data'          => nil,
         'transaction_sample_data' => nil,
@@ -31,6 +33,10 @@ module NewRelic
       @id_counter = 0
       @agent_data = []
     end
+
+    def stub_service(method, value)
+      @mock[method.to_s] = value
+    end
     
     def method_missing(method, *args)
       if @supported_methods.include?(method)

data/test/new_relic/metric_data_test.rb

@@ -14,50 +14,49 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
   def test_eql_basic
     spec = mock('metric_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')    
+    metric_id = mock('metric_id')
     md1 = NewRelic::MetricData.new(spec, stats, metric_id)
     md2 = NewRelic::MetricData.new(spec, stats, metric_id)
     assert(md1.eql?(md2), "The example metric data objects should be eql?: #{md1.inspect} #{md2.inspect}")
-    assert(md2.eql?(md1), "The example metric data objects should be eql?: #{md1.inspect} #{md2.inspect}")    
+    assert(md2.eql?(md1), "The example metric data objects should be eql?: #{md1.inspect} #{md2.inspect}")
   end
 
   def test_eql_unequal_specs
-    
     spec = mock('metric_spec')
     other_spec = mock('other_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')    
+    metric_id = mock('metric_id')
     md1 = NewRelic::MetricData.new(spec, stats, metric_id)
     md2 = NewRelic::MetricData.new(other_spec, stats, metric_id)
     assert(!md1.eql?(md2), "The example metric data objects should not be eql?: #{md1.inspect} #{md2.inspect}")
-    assert(!md2.eql?(md1), "The example metric data objects should not be eql?: #{md1.inspect} #{md2.inspect}")    
+    assert(!md2.eql?(md1), "The example metric data objects should not be eql?: #{md1.inspect} #{md2.inspect}")
   end
   def test_eql_unequal_stats
     spec = mock('metric_spec')
     stats = mock('stats')
     other_stats = mock('other_stats')
-    metric_id = mock('metric_id')    
+    metric_id = mock('metric_id')
     md1 = NewRelic::MetricData.new(spec, stats, metric_id)
     md2 = NewRelic::MetricData.new(spec, other_stats, metric_id)
     assert(!md1.eql?(md2), "The example metric data objects should not be eql?: #{md1.inspect} #{md2.inspect}")
-    assert(!md2.eql?(md1), "The example metric data objects should not be eql?: #{md1.inspect} #{md2.inspect}")    
+    assert(!md2.eql?(md1), "The example metric data objects should not be eql?: #{md1.inspect} #{md2.inspect}")
   end
 
   def test_eql_unequal_metric_ids_dont_matter
     spec = mock('metric_spec')
     stats = mock('stats')
     metric_id = mock('metric_id')
-    other_metric_id = mock('other_metric_id')    
+    other_metric_id = mock('other_metric_id')
     md1 = NewRelic::MetricData.new(spec, stats, metric_id)
     md2 = NewRelic::MetricData.new(spec, stats, other_metric_id)
     assert(md1.eql?(md2), "The example metric data objects should be eql? with different metric_ids: #{md1.inspect} #{md2.inspect}")
-    assert(md2.eql?(md1), "The example metric data objects should be eql? with different metric_ids: #{md1.inspect} #{md2.inspect}")    
+    assert(md2.eql?(md1), "The example metric data objects should be eql? with different metric_ids: #{md1.inspect} #{md2.inspect}")
   end
 
   def test_original_spec_basic
     spec = mock('metric_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')    
+    metric_id = mock('metric_id')
     md1 = NewRelic::MetricData.new(spec, stats, metric_id)
     original_spec = md1.instance_variable_get('@original_spec')
     assert_equal(nil, original_spec, "should start with a nil original spec, but was #{original_spec.inspect}")
@@ -66,26 +65,26 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
 
   def test_metric_spec_equal_should_not_set_original_spec_with_no_metric_spec
     stats = mock('stats')
-    metric_id = mock('metric_id')    
+    metric_id = mock('metric_id')
     md1 = NewRelic::MetricData.new(nil, stats, metric_id)
     original_spec = md1.instance_variable_get('@original_spec')
     assert_equal(nil, original_spec, "should start with a nil original spec, but was #{original_spec.inspect}")
-    
+
     new_spec = mock('new metric_spec')
     assert_equal(new_spec, md1.metric_spec=(new_spec), "should return the new spec")
 
     new_original_spec = md1.instance_variable_get('@original_spec')
     assert_equal(nil, new_original_spec, "should not set @original_spec  but was #{new_original_spec.inspect}")
   end
-  
+
   def test_metric_spec_equal_should_set_original_spec_with_existing_metric_spec
     spec = mock('metric_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')    
+    metric_id = mock('metric_id')
     md1 = NewRelic::MetricData.new(spec, stats, metric_id)
     original_spec = md1.instance_variable_get('@original_spec')
     assert_equal(nil, original_spec, "should start with a nil original spec, but was #{original_spec.inspect}")
-    
+
     new_spec = mock('new metric_spec')
     assert_equal(new_spec, md1.metric_spec=(new_spec), "should return the new spec")
 
@@ -96,7 +95,7 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
   def test_hash
     spec = mock('metric_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')    
+    metric_id = mock('metric_id')
     md1 = NewRelic::MetricData.new(spec, stats, metric_id)
     assert((spec.hash ^ stats.hash) == md1.hash, "expected #{spec.hash ^ stats.hash} to equal #{md1.hash}")
   end
@@ -122,4 +121,34 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
     md = NewRelic::MetricData.new(nil, NewRelic::MethodTraceStats.new, 12345)
     assert_equal('12345: [01/01/70 12:00AM UTC, 0.000s;  0 calls    0s]', md.to_s, "should include the metric id and not have a metric spec")
   end
+
+  def test_to_collector_array_with_spec
+    stats = NewRelic::MethodTraceStats.new
+    stats.record_data_point(1.0)
+    stats.record_data_point(2.0, 1.0)
+    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', 'scope'),
+                                  stats, nil)
+    expected = [ {'name' => 'Custom/test/method', 'scope' => 'scope'},
+                 [2, 3.0, 2.0, 1.0, 2.0, 5.0] ]
+    assert_equal expected, md.to_collector_array
+  end
+
+  def test_to_collector_array_with_spec_and_id
+    stats = NewRelic::MethodTraceStats.new
+    stats.record_data_point(1.0)
+    stats.record_data_point(2.0, 1.0)
+    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', 'scope'),
+                                  stats, 1234)
+    expected = [ 1234, [2, 3.0, 2.0, 1.0, 2.0, 5.0] ]
+    assert_equal expected, md.to_collector_array
+  end
+
+  def test_to_collector_array_with_id
+    stats = NewRelic::MethodTraceStats.new
+    stats.record_data_point(1.0)
+    stats.record_data_point(2.0, 1.0)
+    md = NewRelic::MetricData.new(nil, stats, 1234)
+    expected = [ 1234, [2, 3.0, 2.0, 1.0, 2.0, 5.0] ]
+    assert_equal expected, md.to_collector_array
+  end
 end

data/test/new_relic/noticed_error_test.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+
+class NewRelic::Agent::NoticedErrorTest < Test::Unit::TestCase
+  def test_to_collector_array
+    time = Time.now
+    error = NewRelic::NoticedError.new('path', {'key' => 'val'},
+                                       Exception.new('test exception'), time)
+    expected = [
+      (time.to_f * 1000).round, 'path', 'test exception', 'Exception',
+      {'key' => 'val'}
+    ]
+    assert_equal expected, error.to_collector_array
+  end
+end

data/test/new_relic/transaction_sample/segment_test.rb

@@ -39,10 +39,29 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     s.to_s
   end
 
-  def test_to_json
-    t = Time.now
-    s = NewRelic::TransactionSample::Segment.new(t, 'Custom/test/metric', nil)
-    assert_equal({ :entry_timestamp => t, :exit_timestamp => nil, :metric_name => 'Custom/test/metric', :segment_id => s.object_id }.to_json, s.to_json)
+  def test_to_array
+    parent = NewRelic::TransactionSample::Segment.new(1, 'Custom/test/parent', 1)
+    parent.params[:test] = 'value'
+    child = NewRelic::TransactionSample::Segment.new(2, 'Custom/test/child', 2)
+    child.end_trace(3)
+    parent.add_called_segment(child)
+    parent.end_trace(4)
+    expected_array = [1000, 4000, 'Custom/test/parent', {:test => 'value'},
+                      [[2000, 3000, 'Custom/test/child', {}, []]]]
+    assert_equal(expected_array, parent.to_array)
+  end
+
+  if RUBY_VERSION >= '1.9.2'
+    def test_to_json
+      parent = NewRelic::TransactionSample::Segment.new(1, 'Custom/test/parent', 1)
+      parent.params[:test] = 'value'
+      child = NewRelic::TransactionSample::Segment.new(2, 'Custom/test/child', 2)
+      child.end_trace(3)
+      parent.add_called_segment(child)
+      parent.end_trace(4)
+      expected_string = "[1000,4000,\"Custom/test/parent\",{\"test\":\"value\"},[[2000,3000,\"Custom/test/child\",{},[]]]]"
+      assert_equal(expected_string, parent.to_json)
+    end
   end
 
   def test_path_string

data/test/new_relic/transaction_sample_test.rb

@@ -180,4 +180,43 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     end
     assert_equal 6, transaction.count_segments
   end
+
+  def test_to_array
+    expected_array = [@t.start_time.to_f,
+                      @t.params[:request_params],
+                      @t.params[:custom_params],
+                      @t.root_segment.to_array]
+    assert_equal expected_array, @t.to_array
+  end
+
+  if RUBY_VERSION >= '1.9.2'
+    def test_to_json
+      expected_string = JSON.dump([@t.start_time.to_f,
+                                   @t.params[:request_params],
+                                   @t.params[:custom_params],
+                                   @t.root_segment.to_array])
+      assert_equal expected_string, @t.to_json
+    end
+  end
+
+  def test_to_collector_array
+    if NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported?
+      marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new
+      trace_tree = compress(@t.to_json)
+    else
+      marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
+      trace_tree = @t.to_array
+    end
+    expected_array = [(@t.start_time.to_f * 1000).round,
+                      (@t.duration * 1000).round,
+                      @t.params[:path], @t.params[:uri],
+                      trace_tree,
+                      @t.guid, nil, !!@t.force_persist]
+
+    assert_equal expected_array, @t.to_collector_array(marshaller)
+  end
+
+  def compress(string)
+    Base64.encode64(Zlib::Deflate.deflate(string, Zlib::DEFAULT_COMPRESSION))
+  end
 end

data/ui/views/layouts/newrelic_default.rhtml

@@ -2,6 +2,7 @@
     xml:lang="en" lang="en">
 <head>
 <script type="text/javascript" src="/newrelic/file/javascript/jquery-1.4.2.js"></script>
+<meta charset="utf-8" />
 <title>New Relic Developer Mode</title>
 	<link href="/newrelic/file/stylesheets/style.css" 
 				media="screen" rel="stylesheet" type="text/css" />

data/ui/views/newrelic/threads.rhtml

@@ -8,22 +8,18 @@
 		<th class="left">Status</th>
 		<th class="left">Group</th>
 		<th class="left">Priority</th>
-		<th class="left">Locals</th>
 	</thead>
 <%
   main = Thread.main
   threads = Thread.list - [ main ]
   nr_threads = []
-  threads.delete_if { | thread | nr_threads << thread if thread.key? 'newrelic_label' }
+  threads.delete_if { | thread | nr_threads << thread if thread.key?(:newrelic_label) }
   ([ main ] + threads).each_with_index do | thread, i | %>
 <tr class="odd_row">
   <td valign="top"><%= h(thread == main ? 'main' : thread.to_s) %></td>
   <td valign="top"><%= h(thread.status || 'terminated with exception') %></td>
   <td valign="top"><%= h(thread.group || 'none') %></td>
   <td valign="top"><%= h thread.priority %></td>
-  <td class="locals">
-  	<%= thread.keys.map{|k| h k}.join("</br>") %>
-  </td>
 </tr>
           <% end %>
 <% if nr_threads.size > 0 %>
@@ -34,18 +30,14 @@
 		<th class="left">Status</th>
 		<th class="left">Group</th>
 		<th class="left">Priority</th>
-		<th class="left">Locals</th>
 	</thead>
 
 <% nr_threads.each_with_index do | thread, i | %>
 <tr class="odd_row">
-  <td valign="top"><%= h thread['newrelic_label'] %></td>
+  <td valign="top"><%= h thread[:newrelic_label] %></td>
   <td valign="top"><%= h(thread.status || 'terminated with exception') %></td>
   <td valign="top"><%= h(thread.group || 'none') %></td>
   <td valign="top"><%= h thread.priority %></td>
-  <td class="locals">
-  	<%= (thread.keys - ['newrelic_label']).map{|k| h k}.join("</br>") %>
-  </td>
 </tr>
 <% end %>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.2.17
+  version: 3.5.3.24
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -117,6 +117,8 @@ files:
 - lib/new_relic/agent/stats_engine/metric_stats.rb
 - lib/new_relic/agent/stats_engine/samplers.rb
 - lib/new_relic/agent/stats_engine/transactions.rb
+- lib/new_relic/agent/thread.rb
+- lib/new_relic/agent/thread_profiler.rb
 - lib/new_relic/agent/transaction_info.rb
 - lib/new_relic/agent/transaction_sample_builder.rb
 - lib/new_relic/agent/transaction_sampler.rb
@@ -176,6 +178,86 @@ files:
 - test/config/test_control.rb
 - test/fixtures/proc_cpuinfo.txt
 - 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
+- test/multiverse/lib/multiverse/output_collector.rb
+- test/multiverse/lib/multiverse/runner.rb
+- test/multiverse/lib/multiverse/suite.rb
+- test/multiverse/script/run_one
+- test/multiverse/script/runner
+- test/multiverse/suites/active_record/Envfile
+- test/multiverse/suites/active_record/ar_method_aliasing.rb
+- 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/config/newrelic.yml
+- test/multiverse/suites/agent_only/http_response_code_test.rb
+- test/multiverse/suites/agent_only/marshaling_test.rb
+- test/multiverse/suites/agent_only/method_visibility_test.rb
+- test/multiverse/suites/agent_only/pipe_manager_test.rb
+- test/multiverse/suites/agent_only/service_timeout_test.rb
+- 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/datamapper/Envfile
+- test/multiverse/suites/datamapper/config/newrelic.yml
+- test/multiverse/suites/datamapper/encoding_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
+- test/multiverse/suites/no_load/Envfile
+- test/multiverse/suites/no_load/config/newrelic.yml
+- test/multiverse/suites/no_load/start_up_test.rb
+- test/multiverse/suites/rails_3_error_tracing/Envfile
+- test/multiverse/suites/rails_3_error_tracing/config/newrelic.yml
+- test/multiverse/suites/rails_3_error_tracing/error_tracing_test.rb
+- test/multiverse/suites/rails_3_gc/Envfile
+- test/multiverse/suites/rails_3_gc/config/newrelic.yml
+- test/multiverse/suites/rails_3_gc/instrumentation_test.rb
+- test/multiverse/suites/rails_3_queue_time/Envfile
+- test/multiverse/suites/rails_3_queue_time/config/newrelic.yml
+- test/multiverse/suites/rails_3_queue_time/queue_time_test.rb
+- test/multiverse/suites/rails_3_views/.gitignore
+- test/multiverse/suites/rails_3_views/Envfile
+- test/multiverse/suites/rails_3_views/app/views/foos/_foo.html.haml
+- test/multiverse/suites/rails_3_views/app/views/test/_a_partial.html.erb
+- test/multiverse/suites/rails_3_views/app/views/test/_mid_partial.html.erb
+- test/multiverse/suites/rails_3_views/app/views/test/_top_partial.html.erb
+- test/multiverse/suites/rails_3_views/app/views/test/deep_partial.html.erb
+- test/multiverse/suites/rails_3_views/app/views/test/haml_view.html.haml
+- test/multiverse/suites/rails_3_views/app/views/test/index.html.erb
+- test/multiverse/suites/rails_3_views/config/newrelic.yml
+- test/multiverse/suites/rails_3_views/view_instrumentation_test.rb
+- test/multiverse/suites/resque/Envfile
+- test/multiverse/suites/resque/config/newrelic.yml
+- test/multiverse/suites/resque/dump.rdb
+- 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
+- test/multiverse/suites/sinatra/config/newrelic.yml
+- test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb
+- test/multiverse/suites/sinatra/sinatra_routes_test.rb
+- test/multiverse/test/multiverse_test.rb
+- test/multiverse/test/suite_examples/one/a/Envfile
+- test/multiverse/test/suite_examples/one/a/a_test.rb
+- test/multiverse/test/suite_examples/one/a/config/newrelic.yml
+- test/multiverse/test/suite_examples/one/b/Envfile
+- test/multiverse/test/suite_examples/one/b/b_test.rb
+- test/multiverse/test/suite_examples/one/b/config/newrelic.yml
+- test/multiverse/test/suite_examples/three/a/Envfile
+- test/multiverse/test/suite_examples/three/a/fail_test.rb
+- test/multiverse/test/suite_examples/three/b/Envfile
+- test/multiverse/test/suite_examples/three/b/win_test.rb
+- test/multiverse/test/suite_examples/two/a/Envfile
+- test/multiverse/test/suite_examples/two/a/fail_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
@@ -218,6 +300,9 @@ files:
 - 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_test.rb
+- test/new_relic/agent/thread_profiler_test.rb
+- test/new_relic/agent/thread_test.rb
+- test/new_relic/agent/threaded_test.rb
 - test/new_relic/agent/transaction_info_test.rb
 - test/new_relic/agent/transaction_sample_builder_test.rb
 - test/new_relic/agent/transaction_sampler_test.rb
@@ -237,6 +322,7 @@ files:
 - test/new_relic/metric_data_test.rb
 - test/new_relic/metric_parser/metric_parser_test.rb
 - test/new_relic/metric_spec_test.rb
+- test/new_relic/noticed_error_test.rb
 - test/new_relic/rack/all_test.rb
 - test/new_relic/rack/browser_monitoring_test.rb
 - test/new_relic/rack/developer_mode_helper_test.rb