newrelic_rpm 3.15.1.316 → 3.15.2.317

data/test/new_relic/agent/new_relic_service_test.rb

@@ -267,7 +267,6 @@ class NewRelicServiceTest < Minitest::Test
     @http_handle.respond_to(:metric_data, dummy_rsp)
     stats_hash = NewRelic::Agent::StatsHash.new
     stats_hash.harvested_at = Time.now
-    @service.expects(:fill_metric_id_cache).with(dummy_rsp)
     response = @service.metric_data(stats_hash)
 
     assert_equal 4, @http_handle.last_request_payload.size
@@ -276,7 +275,6 @@ class NewRelicServiceTest < Minitest::Test
 
   def test_metric_data_sends_harvest_timestamps
     @http_handle.respond_to(:metric_data, 'foo')
-    @service.stubs(:fill_metric_id_cache)
 
     t0 = freeze_time
     stats_hash = NewRelic::Agent::StatsHash.new
@@ -297,36 +295,6 @@ class NewRelicServiceTest < Minitest::Test
     assert_in_delta(t0.to_f, last_harvest_timestamp, 0.0001)
   end
 
-  def test_fill_metric_id_cache_from_collect_response
-    response = [[{"scope"=>"Controller/blogs/index", "name"=>"Database/SQL/other"}, 1328],
-                [{"scope"=>"", "name"=>"WebFrontend/QueueTime"}, 10],
-                [{"scope"=>"", "name"=>"ActiveRecord/Blog/find"}, 1017]]
-
-    @service.send(:fill_metric_id_cache, response)
-
-    cache = @service.metric_id_cache
-    assert_equal 1328, cache[NewRelic::MetricSpec.new('Database/SQL/other', 'Controller/blogs/index')]
-    assert_equal 10,   cache[NewRelic::MetricSpec.new('WebFrontend/QueueTime')]
-    assert_equal 1017, cache[NewRelic::MetricSpec.new('ActiveRecord/Blog/find')]
-  end
-
-  def test_caches_metric_ids_for_future_use
-    dummy_rsp = [[{ 'name' => 'a', 'scope' => '' }, 42]]
-    @http_handle.respond_to(:metric_data, dummy_rsp)
-
-    hash = build_stats_hash('a' => 1)
-
-    @service.metric_data(hash)
-
-    hash = build_stats_hash('a' => 1)
-    stats = hash[NewRelic::MetricSpec.new('a')]
-
-    results = @service.build_metric_data_array(hash)
-    assert_nil(results.first.metric_spec)
-    assert_equal(stats, results.first.stats)
-    assert_equal(42, results.first.metric_id)
-  end
-
   def test_metric_data_harvest_time_based_on_stats_hash_creation
     t0 = freeze_time
     dummy_rsp = 'met rick date uhh'
@@ -427,7 +395,6 @@ class NewRelicServiceTest < Minitest::Test
 
     @service.connect
     @http_handle.respond_to(:metric_data, 0)
-    @service.stubs(:fill_metric_id_cache)
     stats_hash = NewRelic::Agent::StatsHash.new
     stats_hash.harvested_at = Time.now
     @service.metric_data(stats_hash)
@@ -680,25 +647,6 @@ class NewRelicServiceTest < Minitest::Test
     assert_equal(hash[spec2], metric_data_2.stats)
   end
 
-  def test_build_metric_data_array_uses_metric_id_cache_if_possible
-    hash = NewRelic::Agent::StatsHash.new
-
-    spec1 = NewRelic::MetricSpec.new('foo')
-    spec2 = NewRelic::MetricSpec.new('bar')
-    hash.record(spec1, 1)
-    hash.record(spec2, 1)
-
-    @service.stubs(:metric_id_cache).returns({ spec1 => 42 })
-    metric_data_array = @service.build_metric_data_array(hash)
-
-    assert_equal(2, metric_data_array.size)
-
-    metric_data1 = metric_data_array.find { |md| md.metric_id == 42 }
-    metric_data2 = metric_data_array.find { |md| md.metric_spec == spec2 }
-    assert_nil(metric_data1.metric_spec)
-    assert_nil(metric_data2.metric_id)
-  end
-
   def test_build_metric_data_array_omits_empty_stats
     hash = NewRelic::Agent::StatsHash.new
 
@@ -804,12 +752,6 @@ class NewRelicServiceTest < Minitest::Test
     ])
   end
 
-  def test_force_restart_clears_metric_cache
-    @service.metric_id_cache[1] = "boo"
-    @service.force_restart
-    assert_empty @service.metric_id_cache
-  end
-
   def test_force_restart_closes_shared_connections
     @service.establish_shared_connection
     @service.force_restart

data/test/new_relic/metric_data_test.rb

@@ -8,19 +8,16 @@ class NewRelic::MetricDataTest < Minitest::Test
   def test_initialize_basic
     spec = mock('metric_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')
-    md = NewRelic::MetricData.new(spec, stats, metric_id)
+    md = NewRelic::MetricData.new(spec, stats)
     assert_equal spec, md.metric_spec
     assert_equal stats, md.stats
-    assert_equal metric_id, md.metric_id
   end
 
   def test_eql_basic
     spec = mock('metric_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')
-    md1 = NewRelic::MetricData.new(spec, stats, metric_id)
-    md2 = NewRelic::MetricData.new(spec, stats, metric_id)
+    md1 = NewRelic::MetricData.new(spec, stats)
+    md2 = NewRelic::MetricData.new(spec, stats)
     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}")
   end
@@ -29,39 +26,26 @@ class NewRelic::MetricDataTest < Minitest::Test
     spec = mock('metric_spec')
     other_spec = mock('other_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')
-    md1 = NewRelic::MetricData.new(spec, stats, metric_id)
-    md2 = NewRelic::MetricData.new(other_spec, stats, metric_id)
+    md1 = NewRelic::MetricData.new(spec, stats)
+    md2 = NewRelic::MetricData.new(other_spec, stats)
     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}")
   end
+
   def test_eql_unequal_stats
     spec = mock('metric_spec')
     stats = mock('stats')
     other_stats = mock('other_stats')
-    metric_id = mock('metric_id')
-    md1 = NewRelic::MetricData.new(spec, stats, metric_id)
-    md2 = NewRelic::MetricData.new(spec, other_stats, metric_id)
+    md1 = NewRelic::MetricData.new(spec, stats)
+    md2 = NewRelic::MetricData.new(spec, other_stats)
     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}")
   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')
-    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}")
-  end
-
   def test_original_spec_basic
     spec = mock('metric_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')
-    md1 = NewRelic::MetricData.new(spec, stats, metric_id)
+    md1 = NewRelic::MetricData.new(spec, stats)
     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}")
     assert_equal(spec, md1.metric_spec, "should return the metric spec for original spec when original spec is nil, but was #{md1.original_spec}")
@@ -69,8 +53,7 @@ class NewRelic::MetricDataTest < Minitest::Test
 
   def test_metric_spec_equal_should_not_set_original_spec_with_no_metric_spec
     stats = mock('stats')
-    metric_id = mock('metric_id')
-    md1 = NewRelic::MetricData.new(nil, stats, metric_id)
+    md1 = NewRelic::MetricData.new(nil, stats)
     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}")
 
@@ -78,14 +61,13 @@ class NewRelic::MetricDataTest < Minitest::Test
     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}")
+    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')
-    md1 = NewRelic::MetricData.new(spec, stats, metric_id)
+    md1 = NewRelic::MetricData.new(spec, stats)
     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}")
 
@@ -99,67 +81,36 @@ class NewRelic::MetricDataTest < Minitest::Test
   def test_hash
     spec = mock('metric_spec')
     stats = mock('stats')
-    metric_id = mock('metric_id')
-    md1 = NewRelic::MetricData.new(spec, stats, metric_id)
+    md1 = NewRelic::MetricData.new(spec, stats)
     assert((spec.hash ^ stats.hash) == md1.hash, "expected #{spec.hash ^ stats.hash} to equal #{md1.hash}")
   end
 
   if {}.respond_to?(:to_json)
-  def test_to_json_no_metric_id
-    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new, nil)
+  def test_to_json
+    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new)
     json = md.to_json
     assert(json.include?('"Custom/test/method"'), "should include the metric spec in the json")
-    assert(json.include?('"metric_id":null}'), "should have a null metric_id")
   end
 
-  def test_to_json_with_metric_id
-    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new, 12345)
-    assert_equal('{"metric_spec":null,"stats":{"total_exclusive_time":0.0,"min_call_time":0.0,"call_count":0,"sum_of_squares":0.0,"total_call_time":0.0,"max_call_time":0.0},"metric_id":12345}', md.to_json, "should not include the metric spec and should have a metric_id")
-  end
   else
     puts "Skipping tests in #{__FILE__} because Hash#to_json not available"
   end
 
   def test_to_s_with_metric_spec
-    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new, 12345)
-    assert_equal('Custom/test/method(): [ 0 calls 0.0000s / 0.0000s ex]', md.to_s, "should not include the metric id and should include the metric spec")
-  end
-
-  def test_to_s_without_metric_spec
-    md = NewRelic::MetricData.new(nil, NewRelic::Agent::Stats.new, 12345)
-    assert_equal('12345: [ 0 calls 0.0000s / 0.0000s ex]', md.to_s, "should include the metric id and not have a metric spec")
+    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new)
+    assert_equal('Custom/test/method(): [ 0 calls 0.0000s / 0.0000s ex]', md.to_s, "should include the metric spec")
   end
 
   def test_to_collector_array_with_spec
     stats = NewRelic::Agent::Stats.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)
+    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', 'scope'), stats)
     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::Agent::Stats.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::Agent::Stats.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
-
   # Rationals in metric data? -- https://support.newrelic.com/tickets/28053
   def test_to_collector_array_with_rationals
     stats = NewRelic::Agent::Stats.new
@@ -170,8 +121,9 @@ class NewRelic::MetricDataTest < Minitest::Test
     stats.max_call_time = Rational(5, 1)
     stats.sum_of_squares = Rational(6, 1)
 
-    md = NewRelic::MetricData.new(nil, stats, 1234)
-    expected = [1234, [1, 2.0, 3.0, 4.0, 5.0, 6.0]]
+    spec = NewRelic::MetricSpec.new('foo')
+    md = NewRelic::MetricData.new(spec, stats)
+    expected = [{"name"=>"foo", "scope"=>""}, [1, 2.0, 3.0, 4.0, 5.0, 6.0]]
     assert_equal expected, md.to_collector_array
   end
 
@@ -184,8 +136,9 @@ class NewRelic::MetricDataTest < Minitest::Test
     stats.max_call_time = {}
     stats.sum_of_squares = Exception.new("Boo")
 
-    md = NewRelic::MetricData.new(nil, stats, 1234)
-    expected = [1234, [0, 0, 0, 0, 0, 0]]
+    spec = NewRelic::MetricSpec.new('foo')
+    md = NewRelic::MetricData.new(spec, stats)
+    expected = [{"name"=>"foo", "scope"=>""}, [0, 0, 0, 0, 0, 0]]
     assert_equal expected, md.to_collector_array
   end
 end

data/test/new_relic/metric_spec_test.rb

@@ -57,7 +57,7 @@ class NewRelic::MetricSpecTest < Minitest::Test
 
       compare_stat(stats, import)
 
-      metric_data = NewRelic::MetricData.new(spec, stats, 10)
+      metric_data = NewRelic::MetricData.new(spec, stats)
 
       import = ::ActiveSupport::JSON.decode(metric_data.to_json)
 
@@ -137,9 +137,8 @@ class NewRelic::MetricSpecTest < Minitest::Test
   end
 
   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
+    assert_equal 2, import.length
+    compare_spec(metric_data.metric_spec, import['metric_spec'])
     compare_stat(metric_data.stats, import['stats'])
   end
 end

data/test/new_relic/rack/developer_mode_test.rb

@@ -54,9 +54,12 @@ class DeveloperModeTest < Minitest::Test
   def test_explain_sql_displays_query_plan
     sample = @sampler.dev_mode_sample_buffer.samples[0]
     sql_segment = app.send(:sql_segments, sample)[0]
-    explain_results = NewRelic::Agent::Database.process_resultset(dummy_mysql_explain_result, 'mysql')
-
+    explain_results = [["Id", "Select Type", "Table", "Type", "Possible Keys", "Key", "Key Length",
+                        "Ref", "Rows", "Extra"],
+                       [["1", "SIMPLE", "sandwiches", "range", "PRIMARY", "PRIMARY", "4", "", "1",
+                         "Using index"]]]
     NewRelic::Agent::Transaction::TraceNode.any_instance.expects(:explain_sql).returns(explain_results)
+
     get "/newrelic/explain_sql?id=#{sample.sample_id}&segment=#{sql_segment.object_id}"
 
     assert last_response.ok?

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.15.1.316
+  version: 3.15.2.317
 platform: ruby
 authors:
 - Tim Krajcar
 - Matthew Wear
 - Katherine Wu
 - Karl Sandwich
+- Caito Scherr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -253,6 +254,7 @@ files:
 - lib/new_relic/agent/cross_app_tracing.rb
 - lib/new_relic/agent/custom_event_aggregator.rb
 - lib/new_relic/agent/database.rb
+- lib/new_relic/agent/database/explain_plan_helpers.rb
 - lib/new_relic/agent/database/obfuscation_helpers.rb
 - lib/new_relic/agent/database/obfuscator.rb
 - lib/new_relic/agent/database/postgres_explain_obfuscator.rb