newrelic_rpm 3.5.6.48.beta → 3.5.6.55

data/test/new_relic/transaction_sample/segment_test.rb

@@ -51,6 +51,13 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     assert_equal(expected_array, parent.to_array)
   end
 
+  def test_to_array_with_bad_values
+    segment = NewRelic::TransactionSample::Segment.new(nil, nil, nil)
+    segment.end_trace(Rational(10, 1))
+    expected = [0, 10_000.0, "<unknown>", {}, []]
+    assert_equal(expected, segment.to_array)
+  end
+
   if RUBY_VERSION >= '1.9.2'
     def test_to_json
       parent = NewRelic::TransactionSample::Segment.new(1, 'Custom/test/parent', 1)

data/test/new_relic/transaction_sample_test.rb

@@ -12,6 +12,12 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
 
     NewRelic::Agent::Database.stubs(:get_connection).returns @connection_stub
     @t = make_sql_transaction(::SQL_STATEMENT, ::SQL_STATEMENT)
+
+    if NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported?
+      @marshaller = NewRelic::Agent::NewRelicService::JsonMarshaller.new
+    else
+      @marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
+    end
   end
 
   def teardown
@@ -189,6 +195,13 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     assert_equal expected_array, @t.to_array
   end
 
+
+  def test_to_array_with_bad_values
+    transaction = NewRelic::TransactionSample.new(nil)
+    expected = [0.0, {}, nil, [0, 0, "ROOT", {}, []]]
+    assert_equal expected, transaction.to_array
+  end
+
   if RUBY_VERSION >= '1.9.2'
     def test_to_json
       expected_string = JSON.dump([@t.start_time.to_f,
@@ -200,20 +213,35 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   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.default_encoder)
+    assert_equal expected_array, @t.to_collector_array(@marshaller.default_encoder)
+  end
+
+  def test_to_collector_array_with_bad_values
+    transaction = NewRelic::TransactionSample.new(nil)
+    transaction.root_segment.end_trace(Rational(10, 1))
+
+    expected = [
+      0, 10_000,
+      nil, nil,
+      trace_tree(transaction),
+      transaction.guid,
+      nil, false]
+
+    assert_equal expected, transaction.to_collector_array(@marshaller.default_encoder)
+  end
+
+  def trace_tree(transaction=@t)
+    if NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported?
+      trace_tree = compress(transaction.to_json)
+    else
+      trace_tree = transaction.to_array
+    end
   end
 
   def compress(string)

data/test/test_contexts.rb

@@ -7,7 +7,7 @@ module TestContexts
       setup do
         @log_data = StringIO.new
         @log = Logger.new(@log_data)
-        NewRelic::Agent::Agent.instance.service = NewRelic::FakeService.new
+        NewRelic::Agent::Agent.instance.service = default_service
         NewRelic::Agent.manual_start :log => @log
         @agent = NewRelic::Agent.instance
         @agent.metric_ids.clear

data/test/test_helper.rb

@@ -44,7 +44,6 @@ end
 
 require 'test/unit'
 require 'shoulda'
-require 'test_contexts'
 require 'mocha'
 
 begin # 1.8.6
@@ -53,7 +52,27 @@ begin # 1.8.6
 rescue LoadError
 end
 
-require 'new_relic/fake_service'
+def default_service(stubbed_method_overrides = {})
+  service = stub
+  stubbed_method_defaults = {
+    :connect => {},
+    :shutdown => nil,
+    :agent_id= => nil,
+    :agent_id => nil,
+    :collector => stub_everything,
+    :request_timeout= =>  nil,
+    :metric_data => nil,
+    :error_data => nil,
+    :transaction_sample_data => nil,
+    :get_agent_commands => []
+  }
+
+  service.stubs(stubbed_method_defaults.merge(stubbed_method_overrides))
+
+  # When session gets called yield to the given block.
+  service.stubs(:session).yields
+  service
+end
 
 class Test::Unit::TestCase
   include Mocha::API

data/ui/helpers/google_pie_chart.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 
 # A wrapper around the google charts service.
 class GooglePieChart

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.6.48.beta
-  prerelease: 9
+  version: 3.5.6.55
+  prerelease: 
 platform: ruby
 authors:
 - Jason Clark
@@ -12,8 +12,36 @@ authors:
 - Ben Weintraub
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURPRENDQWlDZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJDTVJFd0R3WURWUVFEREFoelpX
+  TjEKY21sMGVURVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NHNWxkM0psYkdsak1S
+  TXdFUVlLQ1pJbWlaUHlMR1FCR1JZRApZMjl0TUI0WERURXpNREl4TWpFNU1E
+  Y3dOMW9YRFRFME1ESXhNakU1TURjd04xb3dRakVSTUE4R0ExVUVBd3dJCmMy
+  VmpkWEpwZEhreEdEQVdCZ29Ka2lhSmsvSXNaQUVaRmdodVpYZHlaV3hwWXpF
+  VE1CRUdDZ21TSm9tVDhpeGsKQVJrV0EyTnZiVENDQVNJd0RRWUpLb1pJaHZj
+  TkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFKeVlSdmxrMVhVbwo4SmhXUWNF
+  L3Y2Um1wSy8vSmJlS3ZUS25tV1ZVS3o1b1REU09nL0xLRWh6Q2hwSkpWU09N
+  SkhDeGQ0T294a0lOCnBqUUY1VTJhZjFtNU9OZU4xajRwNE11amJ3TmVxeHNK
+  bWl4R0xLL0JaOXhUbmJwWUFhNnhDUk4xVWZFY3UzTzkKampMSFgzYzYzZ2hs
+  ZHdSQm4vYzJaRDZhbk10RGVxM0M1TUxpeWNGczloN0pYT2EzY1RUSExaa25r
+  WUlvSE1LTgpFRnJpNXpsa3M1MGxiZWFWdkZSbTRJTXJZV1JzRXd6TFpXYU1P
+  eTY4QlZaZTBVbEJCS1NNbnpKZldrYmRSUmNtCnhxdTd2aXU0aHJyQ0dqVW1k
+  SEtubDZ0ZjdCWTd3cVF5S2pqK081RGhheUttS1J1UWNFWDhRVm5zTStheXFp
+  VlUKRXRNaXdOU2NVbnNDQXdFQUFhTTVNRGN3Q1FZRFZSMFRCQUl3QURBZEJn
+  TlZIUTRFRmdRVU9hdWFNc1UwRWxwNgpoaVVpc2o0bDYzWnVuU1V3Q3dZRFZS
+  MFBCQVFEQWdTd01BMEdDU3FHU0liM0RRRUJCUVVBQTRJQkFRQXV3ckhoCmpP
+  aklmQVFvRWJHYWtpd0hUZUltcW1DMUVqQkVXYjErVStyQzJPY3NTUTMrMlEw
+  bUdxMnUzbEFwaEFlTGE2aTUKV1hiNU9kUXFaWTJhSTdOZ014Ukc5OC8rVGNJ
+  bEFUOHREUjBlNi8rUUJsQnVEWFAzWUk1TnVocDVVNExFdmdocgpqRVBhRW8w
+  QUZQYzFKcFNPL3pLbWt0VStlOVZSQUUrcTU1Z0x0aFA4ZmUwdVp2dEdVbjBL
+  Z0RiWEp5T3VHbEhGCko5M045MzdPY3lBMnJEOGdSMXFrcjMvMC93ZTFkd0xa
+  bkw2a040cDhuR3pQZ1haZ09Ic21UZFlaMnJ5WW93dGIKS2M5K3YrUXhuYlpZ
+  cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
+  VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
+  LS0tLS0K
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -58,6 +86,7 @@ files:
 - cert/site.pem
 - config.dot
 - config/database.yml
+- gem-public_cert.pem
 - init.rb
 - install.rb
 - lib/conditional_vendored_dependency_detection.rb
@@ -130,6 +159,7 @@ files:
 - lib/new_relic/agent/transaction_sample_builder.rb
 - lib/new_relic/agent/transaction_sampler.rb
 - lib/new_relic/agent/worker_loop.rb
+- lib/new_relic/coerce.rb
 - lib/new_relic/collection_helper.rb
 - lib/new_relic/command.rb
 - lib/new_relic/commands/deployments.rb
@@ -213,6 +243,7 @@ files:
 - test/multiverse/suites/agent_only/pipe_manager_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
 - test/multiverse/suites/agent_only/start_up_test.rb
 - test/multiverse/suites/agent_only/test_trace_method_with_punctuation.rb
 - test/multiverse/suites/agent_only/test_trace_transaction_with_punctuation.rb
@@ -244,6 +275,7 @@ files:
 - test/multiverse/suites/resque/resque_setup.rb
 - test/multiverse/suites/sinatra/Envfile
 - test/multiverse/suites/sinatra/config/newrelic.yml
+- test/multiverse/suites/sinatra/sinatra_error_tracing_test.rb
 - test/multiverse/suites/sinatra/sinatra_metric_explosion_test.rb
 - test/multiverse/suites/sinatra/sinatra_routes_test.rb
 - test/multiverse/suites/sinatra/sinatra_test.rb
@@ -316,6 +348,7 @@ files:
 - test/new_relic/agent/transaction_sampler_test.rb
 - test/new_relic/agent/worker_loop_test.rb
 - test/new_relic/agent_test.rb
+- test/new_relic/coerce_test.rb
 - test/new_relic/collection_helper_test.rb
 - test/new_relic/command/deployments_test.rb
 - test/new_relic/control/class_methods_test.rb
@@ -324,7 +357,6 @@ files:
 - test/new_relic/delayed_job_injection_test.rb
 - test/new_relic/dispatcher_test.rb
 - test/new_relic/fake_collector.rb
-- test/new_relic/fake_service.rb
 - test/new_relic/fakes_sending_data.rb
 - test/new_relic/framework_test.rb
 - test/new_relic/load_test.rb
@@ -439,11 +471,37 @@ files:
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
 post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.5.6 ##\n\n
-  \ * Fix two Resque-related issues\n\n    Fixes a possible hang on exit of an instrumented
-  Resque master process\n    (https://github.com/defunkt/resque/issues/578), as well
-  as a file descriptor\n    leak that could occur during startup of the Resque master
-  process.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full
-  list of\nchanges.\n"
+  \ * Use HTTPS by default\n\n    The agent now defaults to using SSL when it communicates
+  with New Relic's\n    servers.  By defaults already configured, New Relic does not
+  transmit any\n    sensitive information (e.g. SQL parameters are masked), but SSL
+  adds \n    another layer of security.  Upgrading customers may need to remove the\n
+  \   \"ssl: false\" directive from their newrelic.yml to enable ssl.  Customers on\n
+  \   Jruby may need to install the jruby-openssl gem to take advantage of this\n
+  \   feature.\n\n  * Fix two Resque-related issues\n\n    Fixes a possible hang on
+  exit of an instrumented Resque master process\n    (https://github.com/defunkt/resque/issues/578),
+  as well as a file descriptor\n    leak that could occur during startup of the Resque
+  master process.\n\n  * Fix for error graph over 100%\n\n    Some errors were double
+  counted toward the overall error total. This\n    resulted in graphs with error
+  percentages over 100%. This duplication did\n    not impact the specific error traces
+  captured, only the total metric.\n\n  * Notice gracefully handled errors in Sinatra\n\n
+  \   When show_exceptions was set to false in Sinatra, errors weren't caught\n    by
+  New Relic's error collector. Now handled errors also have the chance\n    to get
+  reported back.\n\n  * Ruby 2.0 compatibility fixes\n\n    Ruby 2.0 no longer finds
+  protected methods by default, but will with a flag.\n    http://tenderlovemaking.com/2012/09/07/protected-methods-and-ruby-2-0.html\n\n
+  \   Thanks Ravil Bayramgalin and Charlie Somerville for the fixes.\n\n  * Auto-detect
+  Trinidad as dispatcher\n\n    Code already existing for detecting Trinidad as a
+  dispatcher, but was only\n    accessible via an ENV variable. This now auto-detects
+  on startup. Thanks\n    Robert Rasmussen for catching that.\n\n  * Coercion of types
+  in collector communication\n\n    Certain metrics can be recorded with a Ruby Rational
+  type, which JSON\n    serializes as a string rather than a floating point value.
+  We now treat\n    coerce each outgoing value, and log issues before sending the
+  data.\n\n  * Developer mode fix for chart error\n\n    Added require to fix a NameError
+  in developer mode for summary page. Thanks\n    to Ryan B. Harvey.\n\n  * Don't
+  touch deprecated RAILS_ROOT if on Rails 3\n\n    Under some odd startup conditions,
+  we would look for the RAILS_ROOT constant\n    after failing to find the ::Rails.root
+  in a Rails 3 app, causing deprecation\n    warnings. Thanks for Adrian Irving-Beer
+  for the fix.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG for a
+  full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers
 - --inline-source

data/test/new_relic/fake_service.rb

@@ -1,53 +0,0 @@
-require 'ostruct'
-require File.join(File.dirname(__FILE__), 'fakes_sending_data')
-
-module NewRelic
-  class FakeService
-    attr_accessor :request_timeout, :agent_id, :agent_data, :collector, :mock
-
-    include FakesSendingData
-
-    def initialize
-      @agent_data = []
-      @supported_methods = [ :connect, :metric_data, :transaction_sample_data,
-                             :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'             => [[{ 'name' => 'Some/Metric/Spec' }, 1]],
-        'sql_trace_data'          => nil,
-        'transaction_sample_data' => nil,
-        'error_data'              => nil,
-        'shutdown'                => nil,
-      }
-      reset
-    end
-
-    def agent_run_id
-      @id_counter += 1
-    end
-
-    def reset
-      @mock = @base_expectations.dup
-      @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)
-        @agent_data << OpenStruct.new(:action => method, :params => args)
-        @mock[method.to_s]
-      else
-        super
-      end
-    end  
-  end
-end