newrelic_rpm 3.5.5.38 → 3.5.5.39.beta

data/lib/new_relic/rack/error_collector.rb

@@ -7,12 +7,22 @@ module NewRelic::Rack
     def call(env)
       @app.call(env)
     rescue Exception => exception
+      NewRelic::Agent.logger.debug "collecting %p: %s" % [ exception.class, exception.message ]
       request = Rack::Request.new(env)
+
       if !should_ignore_error?(exception, request)
+        params = begin
+          request.params
+        rescue => err
+          warning = "failed to capture request parameters: %p: %s" % [ err.class, err.message ]
+          NewRelic::Agent.logger.warn(warning)
+          {'error' => warning}
+        end
+
         NewRelic::Agent.instance.error_collector.notice_error(exception,
                                                               :uri => request.path,
                                                           :referer => request.referer,
-                                                   :request_params => request.params)
+                                                   :request_params => params)
       end
       raise exception
     end

data/newrelic_rpm.gemspec

@@ -1,12 +1,12 @@
 #-*- coding: utf-8 -*-
-# GITSHA: 03e4718f60b77bac6dcf7bb2db823f01af2f2aa4
+# GITSHA: e6ee26a548aeb52344bdcdc6365a6ae46508c106
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.5.5.38"
+  s.version = "3.5.5.39.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 = "2013-01-07"
+  s.date = "2013-01-11"
   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/rack/error_collector_test.rb

@@ -66,6 +66,22 @@ module NewRelic::Rack
       assert(NewRelic::Agent.instance.error_collector.errors.empty?,
              'noticed an error that should have been ignored')
     end
+
+    def test_handles_parameter_parsing_exceptions
+      bad_request = stub(:env => {}, :path => '/', :referer => '')
+      bad_request.stubs(:params).raises(TypeError, "can't convert nil into Hash")
+      Rack::Request.stubs(:new).returns(bad_request)
+
+      assert_raise RuntimeError do
+        get '/'
+      end
+
+      assert_equal('unhandled error',
+                   NewRelic::Agent.instance.error_collector.errors[0].message)
+      assert_match(/failed to capture request parameters/i,
+                   NewRelic::Agent.instance.error_collector.errors[0].params[:request_params]['error'])
+    end
+
   end
 end
 

metadata

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