newrelic_rpm 2.8.5 → 2.8.6

data/lib/new_relic/agent.rb

@@ -20,6 +20,8 @@ require 'new_relic/agent/error_collector'
 require 'set'
 require 'sync'
 require 'thread'
+require 'resolv'    
+
 
 module NewRelic::Agent
   

data/lib/new_relic/agent/collection_helper.rb

@@ -15,17 +15,8 @@ module NewRelic::Agent::CollectionHelper
           new_params[truncate(normalize_params(key),32)] = normalize_params(value)
         end
         new_params
-      when Enumerable
-      # We only want the first 20 values of any enumerable.  Invoking to_a.first(20) works but
-      # the to_a call might be expensive, so we'll just build it manually, even though it's
-      # more verbose.
-        new_values = []
-        count = 1
-        params.each do | item |
-          new_values << normalize_params(item)
-          break if (count += 1) > 20
-        end
-        new_values
+      when Array
+        params.first(20).map{|item| normalize_params(item)}
     else
       truncate(flatten(params))
     end

data/lib/new_relic/config.rb

@@ -97,7 +97,7 @@ module NewRelic
 
     def server
       @remote_server ||= 
-      NewRelic::Config::Server.new fetch('host', 'collector.newrelic.com'), fetch('port', use_ssl? ? 443 : 80).to_i  
+      NewRelic::Config::Server.new convert_to_ip_address(fetch('host', 'collector.newrelic.com')), fetch('port', use_ssl? ? 443 : 80).to_i  
     end
     
     def api_server
@@ -107,9 +107,10 @@ module NewRelic
     
     def proxy_server
       @proxy_server ||=
-      NewRelic::Config::ProxyServer.new fetch('proxy_host', nil), fetch('proxy_port', nil),
+      NewRelic::Config::ProxyServer.new convert_to_ip_address(fetch('proxy_host', nil)), fetch('proxy_port', nil),
       fetch('proxy_user', nil), fetch('proxy_pass', nil)
-    end      
+    end
+    
     
     # Return the Net::HTTP with proxy configuration given the NewRelic::Config::Server object.
     # Default is the collector but for api calls you need to pass api_server
@@ -176,6 +177,24 @@ module NewRelic
     end
     
     protected
+    
+    def convert_to_ip_address(host)
+      return nil unless host
+      if host.downcase == "localhost"
+        ip_address = host
+      else
+        begin
+          ip_address = Resolv.getaddress(host)
+        rescue => e
+          log.error "DNS Error: #{e}"
+          raise NewRelic::Agent::IgnoreSilentlyException.new
+        end
+      end
+      
+      log.info "Resolved #{host} to #{ip_address}"
+      ip_address
+    end
+    
     # Collect miscellaneous interesting info about the environment
     # Called when the agent is started
     def gather_info

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
   MAJOR = 2
   MINOR = 8
-  TINY  = 5
+  TINY  = 6
   STRING = [MAJOR, MINOR, TINY].join('.')
   def self.changes
     puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION::STRING}"
@@ -11,6 +11,10 @@ module NewRelic
   end
 
   CHANGELOG = <<EOF
+2009-03-16 version 2.8.6
+  * fix for capture_params when using file uploads in controller actions
+  * use Resolv::getaddress rather than allowing the default DNS to stall 
+    the VM
 2009-02-22 version 2.8.5
   * fix reference to CommandError which was breaking some cap scripts
   * fix incompatibility with Rails 2.0 in the server API

data/test/new_relic/agent/tc_collection_helper.rb

@@ -80,9 +80,17 @@ class NewRelic::Agent::CollectionHelperTests < Test::Unit::TestCase
     custom_params = { :one => {:hash => { :a => :b}, :myenum => e }}
     nh = normalize_params(custom_params)
     myenum = nh[:one][:myenum]
-    assert_equal ["1"], myenum
+    assert_match /MyEnumerable/, myenum
   end
   
+  def test_stringio
+    # make sure stringios aren't affected
+    s = StringIO.new "start" + ("foo bar bat " * 1000)
+    v = normalize_params({ :foo => s })
+    val = ""
+    s.each { | val | break } 
+    assert_match /^startfoo bar/, val
+  end
   
   def test_object
     assert_equal ["foo", '#<OpenStruct z="q">'], normalize_params(['foo', OpenStruct.new('z'=>'q')])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.8.5
+  version: 2.8.6
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-03-18 00:00:00 -07:00
 default_executable: newrelic_cmd
 dependencies: []