newrelic_rpm 3.5.4.34 → 3.5.4.35.beta

data/lib/new_relic/noticed_error.rb

@@ -17,6 +17,14 @@ class NewRelic::NoticedError
       @message = (exception || '<no message>').to_s
     end
 
+    unless @message.is_a?(String)
+      # In pre-1.9.3, Exception.new({}).to_s.class != String
+      # That is, Exception#to_s may not return a String instance if one wasn't
+      # passed in upon creation of the Exception. So, try to generate a useful
+      # String representation of the exception message, falling back to failsafe
+      @message = String(@message.inspect) rescue '<unknown message type>'
+    end
+
     # clamp long messages to 4k so that we don't send a lot of
     # overhead across the wire
     @message = @message[0..4095] if @message.length > 4096

data/newrelic_rpm.gemspec

@@ -1,12 +1,12 @@
 #-*- coding: utf-8 -*-
-# GITSHA: 84fb65c30ecef808f04df97e35487d8a613f76d7
+# GITSHA: c59a6d0650909d58a54124624aef46f555b68ead
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.5.4.34"
+  s.version = "3.5.4.35.beta"
   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", "Ben Weintraub" ]
-  s.date = "2012-12-24"
+  s.date = "2013-01-03"
   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/noticed_error_test.rb

@@ -1,14 +1,24 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 
 class NewRelic::Agent::NoticedErrorTest < Test::Unit::TestCase
+  def setup
+    @path = 'foo/bar/baz'
+    @params = { 'key' => 'val' }
+    @time = Time.now
+  end
+
   def test_to_collector_array
-    time = Time.now
-    error = NewRelic::NoticedError.new('path', {'key' => 'val'},
-                                       Exception.new('test exception'), time)
+    e = Exception.new('test exception')
+    error = NewRelic::NoticedError.new(@path, @params, e, @time)
     expected = [
-      (time.to_f * 1000).round, 'path', 'test exception', 'Exception',
-      {'key' => 'val'}
+      (@time.to_f * 1000).round, @path, 'test exception', 'Exception', @params
     ]
     assert_equal expected, error.to_collector_array
   end
+
+  def test_handles_non_string_exception_messages
+    e = Exception.new({ :non => :string })
+    error = NewRelic::NoticedError.new(@path, @params, e, @time)
+    assert_equal(String, error.message.class)
+  end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.4.34
-  prerelease: 
+  version: 3.5.4.35.beta
+  prerelease: 9
 platform: ruby
 authors:
 - Jason Clark
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,