newrelic_rpm 3.5.7.59 → 3.5.8.64.beta

data/test/new_relic/control_test.rb

@@ -168,7 +168,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   def test_sql_tracer_disabled_when_tt_disabled_by_server
     with_config({:'slow_sql.enabled' => true,
                   :'transaction_tracer.enabled' => true,
-                  :monitor_mode => true}, 2) do
+                  :monitor_mode => true}, :level => 2) do
       NewRelic::Agent.instance.finish_setup('collect_traces' => false)
 
       assert(!NewRelic::Agent::Agent.instance.sql_sampler.enabled?,

data/test/new_relic/fake_collector.rb

@@ -4,7 +4,6 @@ require 'uri'
 require 'socket'
 require 'timeout'
 require 'ostruct'
-require File.join(File.dirname(__FILE__), 'fakes_sending_data')
 
 require 'json' if RUBY_VERSION >= '1.9'
 
@@ -12,8 +11,6 @@ module NewRelic
   class FakeCollector
     attr_accessor :agent_data, :mock
 
-    include FakesSendingData
-
     def initialize
       @id_counter = 0
       @base_expectations = {
@@ -53,16 +50,16 @@ module NewRelic
         end
         run_id = uri.query =~ /run_id=(\d+)/ ? $1 : nil
         req.body.rewind
-        
+
         body = if format == :json
           body = JSON.load(req.body.read)
         else
           body = Marshal.load(req.body.read)
         end
-        @agent_data << OpenStruct.new(:action       => method,
-                                      :body         => body,
-                                      :run_id       => run_id,
-                                      :format       => format)
+        @agent_data << AgentPost.create(:action       => method,
+                                        :body         => body,
+                                        :run_id       => run_id,
+                                        :format       => format)
       end
       res.finish
     end
@@ -151,6 +148,87 @@ module NewRelic
 
       return true
     end
+
+    def calls_for(method)
+      @agent_data.select {|d| d.action == method }
+    end
+
+    def reported_stats_for_metric(name, scope=nil)
+      calls_for('metric_data').map do |post|
+        post.body[3].find do |metric_record|
+          metric_record[0]['name'] == name &&
+            (!scope || metric_record[0]['scope'] == scope)
+        end
+      end.compact.map{|m| m[1]}
+    end
+
+    class AgentPost
+      attr_accessor :action, :body, :run_id, :format
+      def initialize(opts={})
+        @action = opts[:action]
+        @body   = opts[:body]
+        @run_id = opts[:run_id]
+        @format = opts[:format]
+      end
+
+      def self.create(opts={})
+        case opts[:action]
+        when 'connect'
+          ConnectPost.new(opts)
+        when 'metric_data'
+          AgentPost.new(opts)
+        when 'profile_data'
+          ProfileDataPost.new(opts)
+        when 'sql_trace_data'
+          SqlTraceDataPost.new(opts)
+        when 'transaction_sample_data'
+          TransactionSampleDataPost.new(opts)
+        else
+          new(opts)
+        end
+      end
+
+      def [](key)
+        @body[key]
+      end
+
+      def unblob(blob)
+        return unless blob
+        JSON.load(Zlib::Inflate.inflate(Base64.decode64(blob)))
+      end
+    end
+
+    class ConnectPost < AgentPost
+      def initialize(opts={})
+        super
+        @body = @body[0]
+      end
+    end
+
+    class ProfileDataPost < AgentPost
+      def initialize(opts={})
+        super
+        @body[1][0][4] = unblob(@body[1][0][4]) if @format == :json
+      end
+    end
+
+    class SqlTraceDataPost < AgentPost
+      def initialize(opts={})
+        super
+        @body[0][0][9] = unblob(@body[0][0][9]) if @format == :json
+      end
+    end
+
+    class TransactionSampleDataPost < AgentPost
+      def initialize(opts={})
+        super
+        @body[4] = unblob(@body[4]) if @format == :json
+      end
+
+      def metric_name
+        @body[1][0][2]
+      end
+    end
   end
 
   # might we need this?  I'll just leave it here for now
@@ -290,7 +368,7 @@ if $0 == __FILE__
     end
 
     def invoke(method, post={}, code=200)
-      uri = URI.parse("http://127.0.0.1:#{determine_port}/agent_listener/8/12345/#{method}")
+      uri = URI.parse("http://127.0.0.1:#{@collector.determine_port}/agent_listener/8/12345/#{method}")
       request = Net::HTTP::Post.new("#{uri.path}?#{uri.query}")
       if uri.query && uri.query.include?('marshal_format=json')
         request.body = JSON.dump(post)

data/test/new_relic/helper_test.rb

@@ -0,0 +1,24 @@
+#encoding: utf-8
+
+#require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require 'test/unit'
+require 'newrelic_rpm'
+
+class HelperTest < Test::Unit::TestCase
+
+  def test_json_serializer_method
+    obj = [
+      99, 'luftballons',
+      {
+        'Hast du etwas' => 'Zeit für mich',
+        'Dann singe ich' => {
+          'ein lied' => 'für dich'
+        }
+      }
+    ]
+    copy = NewRelic.json_load( NewRelic.json_dump(obj) )
+
+    assert( obj == copy )
+  end
+
+end

data/test/new_relic/metric_data_test.rb

@@ -101,29 +101,29 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
   end
 
   def test_to_json_no_metric_id
-    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::MethodTraceStats.new, nil)
+    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::Agent::Stats.new, nil)
     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::MethodTraceStats.new, 12345)
+    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
 
   def test_to_s_with_metric_spec
-    md = NewRelic::MetricData.new(NewRelic::MetricSpec.new('Custom/test/method', ''), NewRelic::MethodTraceStats.new, 12345)
-    assert_equal('Custom/test/method(): [01/01/70 12:00AM UTC, 0.000s;  0 calls    0s]', md.to_s, "should not include the metric id and should include the 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]', 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::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")
+    md = NewRelic::MetricData.new(nil, NewRelic::Agent::Stats.new, 12345)
+    assert_equal('12345: [ 0 calls 0.0000s]', 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 = 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'),
@@ -134,7 +134,7 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
   end
 
   def test_to_collector_array_with_spec_and_id
-    stats = NewRelic::MethodTraceStats.new
+    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'),
@@ -144,7 +144,7 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
   end
 
   def test_to_collector_array_with_id
-    stats = NewRelic::MethodTraceStats.new
+    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)
@@ -154,7 +154,7 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
 
   # Rationals in metric data? -- https://support.newrelic.com/tickets/28053
   def test_to_collector_array_with_rationals
-    stats = NewRelic::MethodTraceStats.new
+    stats = NewRelic::Agent::Stats.new
     stats.call_count = Rational(1, 1)
     stats.total_call_time = Rational(2, 1)
     stats.total_exclusive_time = Rational(3, 1)
@@ -168,7 +168,7 @@ class NewRelic::MetricDataTest < Test::Unit::TestCase
   end
 
   def test_to_collector_array_with_bad_values
-    stats = NewRelic::MethodTraceStats.new
+    stats = NewRelic::Agent::Stats.new
     stats.call_count = nil
     stats.total_call_time = "junk"
     stats.total_exclusive_time = Object.new

data/test/new_relic/metric_spec_test.rb

@@ -46,7 +46,7 @@ class NewRelic::MetricSpecTest < Test::Unit::TestCase
 
     compare_spec(spec, import)
 
-    stats = NewRelic::MethodTraceStats.new
+    stats = NewRelic::Agent::Stats.new
 
     import = ::ActiveSupport::JSON.decode(stats.to_json)
 

data/test/script/ci.sh

@@ -29,7 +29,7 @@ set -e
 if [ "x$RUBY" == "x" ]; then
   echo '$RUBY is undefined'
   echo 'defaulting to 1.9.3'
-  export RUBY=1.9.3-p286
+  export RUBY=1.9.3-p374
 fi
 if [ "x$BRANCH" == "x" ]; then
   echo '$BRANCH is undefined'

data/test/test_contexts.rb

@@ -10,7 +10,6 @@ module TestContexts
         NewRelic::Agent::Agent.instance.service = default_service
         NewRelic::Agent.manual_start :log => @log
         @agent = NewRelic::Agent.instance
-        @agent.metric_ids.clear
         @agent.transaction_sampler.send :clear_builder
         @agent.transaction_sampler.reset!
         @agent.stats_engine.clear_stats

data/test/test_helper.rb

@@ -140,15 +140,33 @@ def assert_calls_unscoped_metrics(*metrics)
   assert_not_equal first_metrics, last_metrics, "should have changed these metrics"
 end
 
+unless defined?( assert_includes )
+  def assert_includes( collection, member, msg=nil )
+    msg = build_message( msg, "Expected ? to include ?", collection, member )
+    assert_block( msg ) { collection.include?(member) }
+  end
+end
+
+unless defined?( assert_not_includes )
+  def assert_not_includes( collection, member, msg=nil )
+    msg = build_message( msg, "Expected ? not to include ?", collection, member )
+    assert_block( msg ) { !collection.include?(member) }
+  end
+end
 
 def compare_metrics(expected, actual)
   actual.delete_if {|a| a.include?('GC/cumulative') } # in case we are in REE
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
 
-def with_config(config_hash, level=0)
-  config = NewRelic::Agent::Configuration::DottedHash.new(config_hash)
-  NewRelic::Agent.config.apply_config(config, level)
+def with_config(config_hash, opts={})
+  opts = { :level => 0, :do_not_cast => false }.merge(opts)
+  if opts[:do_not_cast]
+    config = config_hash
+  else
+    config = NewRelic::Agent::Configuration::DottedHash.new(config_hash)
+  end
+  NewRelic::Agent.config.apply_config(config, opts[:level])
   begin
     yield
   ensure

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.7.59
-  prerelease: 
+  version: 3.5.8.64.beta
+  prerelease: 9
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -106,7 +106,8 @@ files:
 - lib/new_relic/agent/configuration/mask_defaults.rb
 - lib/new_relic/agent/configuration/server_source.rb
 - lib/new_relic/agent/configuration/yaml_source.rb
-- lib/new_relic/agent/cross_process_monitoring.rb
+- lib/new_relic/agent/cross_app_monitor.rb
+- lib/new_relic/agent/cross_app_tracing.rb
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/event_listener.rb
@@ -141,6 +142,7 @@ files:
 - lib/new_relic/agent/new_relic_service.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
+- lib/new_relic/agent/rules_engine.rb
 - lib/new_relic/agent/sampler.rb
 - lib/new_relic/agent/samplers/cpu_sampler.rb
 - lib/new_relic/agent/samplers/delayed_job_sampler.rb
@@ -148,10 +150,12 @@ files:
 - lib/new_relic/agent/samplers/object_sampler.rb
 - lib/new_relic/agent/shim_agent.rb
 - lib/new_relic/agent/sql_sampler.rb
+- lib/new_relic/agent/stats.rb
 - lib/new_relic/agent/stats_engine.rb
 - lib/new_relic/agent/stats_engine/gc_profiler.rb
 - lib/new_relic/agent/stats_engine/metric_stats.rb
 - lib/new_relic/agent/stats_engine/samplers.rb
+- lib/new_relic/agent/stats_engine/stats_hash.rb
 - lib/new_relic/agent/stats_engine/transactions.rb
 - lib/new_relic/agent/thread.rb
 - lib/new_relic/agent/thread_profiler.rb
@@ -188,13 +192,13 @@ files:
 - lib/new_relic/metric_spec.rb
 - lib/new_relic/metrics.rb
 - lib/new_relic/noticed_error.rb
+- lib/new_relic/okjson.rb
 - lib/new_relic/rack.rb
 - lib/new_relic/rack/agent_hooks.rb
 - lib/new_relic/rack/browser_monitoring.rb
 - lib/new_relic/rack/developer_mode.rb
 - lib/new_relic/rack/error_collector.rb
 - lib/new_relic/recipes.rb
-- 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
@@ -234,13 +238,15 @@ files:
 - test/multiverse/suites/agent_only/Envfile
 - test/multiverse/suites/agent_only/audit_log_test.rb
 - test/multiverse/suites/agent_only/config/newrelic.yml
-- test/multiverse/suites/agent_only/cross_process_test.rb
+- test/multiverse/suites/agent_only/cross_application_tracing_test.rb
 - test/multiverse/suites/agent_only/http_response_code_test.rb
+- test/multiverse/suites/agent_only/key_transactions_test.rb
 - test/multiverse/suites/agent_only/logging_test.rb
 - test/multiverse/suites/agent_only/marshaling_test.rb
 - test/multiverse/suites/agent_only/method_visibility_test.rb
 - test/multiverse/suites/agent_only/no_dns_resolv.rb
 - test/multiverse/suites/agent_only/pipe_manager_test.rb
+- test/multiverse/suites/agent_only/rename_rule_test.rb
 - test/multiverse/suites/agent_only/rum_instrumentation_test.rb
 - test/multiverse/suites/agent_only/service_timeout_test.rb
 - test/multiverse/suites/agent_only/ssl_test.rb
@@ -308,7 +314,7 @@ files:
 - test/new_relic/agent/configuration/manager_test.rb
 - test/new_relic/agent/configuration/server_source_test.rb
 - test/new_relic/agent/configuration/yaml_source_test.rb
-- test/new_relic/agent/cross_process_monitoring_test.rb
+- test/new_relic/agent/cross_app_monitor_test.rb
 - test/new_relic/agent/database_test.rb
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
@@ -333,13 +339,16 @@ files:
 - test/new_relic/agent/pipe_channel_manager_test.rb
 - test/new_relic/agent/pipe_service_test.rb
 - test/new_relic/agent/rpm_agent_test.rb
+- test/new_relic/agent/rules_engine_test.rb
 - test/new_relic/agent/sampler_test.rb
 - test/new_relic/agent/shim_agent_test.rb
 - test/new_relic/agent/sql_sampler_test.rb
-- test/new_relic/agent/stats_engine/metric_stats/harvest_test.rb
+- test/new_relic/agent/stats_engine/gc_profiler_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_test.rb
+- test/new_relic/agent/stats_hash_test.rb
+- test/new_relic/agent/stats_test.rb
 - test/new_relic/agent/thread_profiler_test.rb
 - test/new_relic/agent/thread_test.rb
 - test/new_relic/agent/threaded_test.rb
@@ -357,8 +366,8 @@ files:
 - test/new_relic/delayed_job_injection_test.rb
 - test/new_relic/dispatcher_test.rb
 - test/new_relic/fake_collector.rb
-- test/new_relic/fakes_sending_data.rb
 - test/new_relic/framework_test.rb
+- test/new_relic/helper_test.rb
 - test/new_relic/load_test.rb
 - test/new_relic/local_environment_test.rb
 - test/new_relic/metric_data_test.rb
@@ -371,7 +380,6 @@ files:
 - test/new_relic/rack/developer_mode_helper_test.rb
 - test/new_relic/rack/developer_mode_test.rb
 - test/new_relic/rack/error_collector_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
@@ -470,12 +478,20 @@ files:
 - lib/new_relic/build.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.5.7 ##\n\n
-  \ * Resolved some issues with tracking of frontend queue time, particularly\n    when
-  the agent is running on an app hosted on Heroku.  The agent will now\n    more reliably
-  parse the headers described in\n    https://newrelic.com/docs/features/tracking-front-end-time
-  and will\n    automatically detect whether the times provided are in seconds,\n
-  \   milliseconds or microseconds.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
+post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.5.8 ##\n\n
+  \ * Key Transactions\n\n    The Ruby agent now supports Key Transactions! Check
+  out more details on the\n    feature at https://newrelic.com/docs/site/key-transactions\n\n
+  \ * Ruby 2.0\n\n    The Ruby agent is compatible with Ruby 2.0.0 which was just
+  released.\n\n  * Improved Sinatra instrumentation\n\n    Several cases around the
+  use of conditions and pass in Sinatra are now\n    better supported by the Ruby
+  agent. Thanks Konstantin for the help!\n\n  * Outbound HTTP headers\n\n    Adds
+  a 'X-NewRelic-ID' header to outbound Net::HTTP requests. This change\n    helps
+  improve the correlation of performance between services in a service-\n    oriented
+  architecture for a forthcoming feature. In the meantime, to disable\n    the header,
+  set this in your newrelic.yml:\n\n      cross_application_tracer:\n        enabled:
+  false\n\n  * Automatically detect Resque dispatcher\n\n    The agent does better
+  auto-detection for the Resque worker process.\n    This should reduce the need to
+  set NEW_RELIC_DISPATCHER=resque directly.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers