newrelic_rpm 3.5.3.24 → 3.5.3.25

data/lib/new_relic/agent/agent.rb

@@ -907,7 +907,9 @@ module NewRelic
         # metric cache so we can save the collector some work by
         # sending integers instead of strings
         def fill_metric_id_cache(pairs_of_specs_and_ids)
-          Array(pairs_of_specs_and_ids).each do |metric_spec, metric_id|
+          Array(pairs_of_specs_and_ids).each do |metric_spec_hash, metric_id|
+            metric_spec = MetricSpec.new(metric_spec_hash['name'],
+                                         metric_spec_hash['scope'])
             @metric_ids[metric_spec] = metric_id
           end
         end

data/lib/new_relic/metric_spec.rb

@@ -10,9 +10,13 @@ class NewRelic::MetricSpec
   # Need a "zero-arg" constructor so it can be instantiated from java (using
   # jruby) for sending responses to ruby agents from the java collector.
   #
-  def initialize(metric_name = '', metric_scope = '')
+  def initialize(metric_name = '', metric_scope = nil)
     self.name = (metric_name || '') && metric_name[LENGTH_RANGE]
-    self.scope = metric_scope && metric_scope[LENGTH_RANGE]
+    if metric_scope
+      self.scope = metric_scope && metric_scope[LENGTH_RANGE]
+    else
+      self.scope = ''
+    end
   end
   
   # truncates the name and scope to the MAX_LENGTH

data/newrelic_rpm.gemspec

@@ -1,12 +1,12 @@
 #-*- coding: utf-8 -*-
-# GITSHA: 48916edbed1d5be1a0c97ed151453682df8d81ce
+# GITSHA: 9908a46cb27fea14226e996d91fca5d800aab459
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.5.3.24"
+  s.version = "3.5.3.25"
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = [ "Jason Clark", "Sam Goldstein", "Jon Guymon" ]
-  s.date = "2012-12-04"
+  s.date = "2012-12-05"
   s.description = <<-EOS
 New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep

data/test/new_relic/agent/agent_test.rb

@@ -209,6 +209,17 @@ module NewRelic
         @agent.expects(:log).never
         @agent.notify_log_file_location
       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]]
+
+        @agent.send(:fill_metric_id_cache, response)
+        assert_equal 1328, @agent.metric_ids[MetricSpec.new('Database/SQL/other', 'Controller/blogs/index')]
+        assert_equal 10,   @agent.metric_ids[MetricSpec.new('WebFrontend/QueueTime')]
+        assert_equal 1017, @agent.metric_ids[MetricSpec.new('ActiveRecord/Blog/find')]
+      end
     end
   end
 end

data/test/new_relic/agent/rpm_agent_test.rb

@@ -86,12 +86,13 @@ class NewRelic::Agent::RpmAgentTest < Test::Unit::TestCase # ActiveSupport::Test
       # this test fails due to a rubinius bug
       return if NewRelic::LanguageSupport.using_engine?('rbx')
       @agent.service = NewRelic::FakeService.new
-      @agent.service.expects(:metric_data).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.service.expects(:metric_data).returns([ [{'name' => '/A/b/c'}, 1],
+                                                     [{'name' => '/A/b/c', 'scope' => '/X'}, 2],
+                                                     [{'name' => '/A/b/d'}, 3] ])
       @agent.send :harvest_and_send_timeslice_data
       assert_equal 3, @agent.metric_ids.size
-      assert_equal 3, @agent.metric_ids[NewRelic::MetricSpec.new("/A/b/d") ], @agent.metric_ids.inspect
+      assert_equal(3, @agent.metric_ids[NewRelic::MetricSpec.new('/A/b/d')],
+                   @agent.metric_ids.inspect)
     end
     should "set_record_sql" do
       @agent.set_record_sql(false)

data/test/new_relic/fake_collector.rb

@@ -15,7 +15,7 @@ module NewRelic
         'get_redirect_host'       => [200, {'return_value' => 'localhost'}],
         'connect'                 => [200, {'return_value' => {"agent_run_id" => agent_run_id}}],
         'get_agent_commands'      => [200, {'return_value' => []}],
-        'metric_data'             => [200, {'return_value' => {'Some/Metric/Spec' => 1}}],
+        'metric_data'             => [200, {'return_value' => [[{'name' => 'Some/Metric/Spec'}, 1]]}],
         'sql_trace_data'          => [200, {'return_value' => nil}],
         'transaction_sample_data' => [200, {'return_value' => nil}],
         'error_data'              => [200, {'return_value' => nil}],

data/test/new_relic/fake_service.rb

@@ -15,7 +15,7 @@ module NewRelic
         'get_redirect_host'       => 'localhost',
         'connect'                 => { 'agent_run_id' => agent_run_id },
         'get_agent_commands'      => [],
-        'metric_data'             => { 'Some/Metric/Spec' => 1 },
+        'metric_data'             => [[{ 'name' => 'Some/Metric/Spec' }, 1]],
         'sql_trace_data'          => nil,
         'transaction_sample_data' => nil,
         'error_data'              => nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.3.24
+  version: 3.5.3.25
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,