newrelic_rpm 2.8.8 → 2.8.9

data/lib/new_relic/agent/agent.rb

@@ -547,12 +547,15 @@ module NewRelic::Agent
     end
       
     def load_samplers
-      sampler_files = File.join(File.dirname(__FILE__), 'samplers', '*.rb')
-      Dir.glob(sampler_files) do |file|
+      sampler_files_root = File.join(File.dirname(__FILE__), 'samplers')
+      samplers = %w[memory.rb]
+      samplers += %w[cpu.rb mongrel.rb] unless RUBY_PLATFORM =~ /java/
+      for sampler in samplers do
         begin
-          require file
+          log.debug "Loading sampler #{sampler}"
+          require File.join(sampler_files_root, sampler)
         rescue => e
-          log.error "Error loading sampler '#{file}': #{e}"
+          log.error "Error loading sampler '#{sampler}': #{e}"
         end
       end
     end
@@ -666,7 +669,7 @@ module NewRelic::Agent
       uri = "/agent_listener/invoke_raw_method?method=#{method}&license_key=#{license_key}&protocol_version=#{PROTOCOL_VERSION}"
       uri += "&run_id=#{@agent_id}" if @agent_id
       
-      request = Net::HTTP::Post.new(uri, 'ACCEPT-ENCODING' => 'gzip')
+      request = Net::HTTP::Post.new(uri, 'ACCEPT-ENCODING' => 'gzip', 'HOST' => config.fetch('host', 'collector.newrelic.com'))
       request.content_type = "application/octet-stream"
       request.body = post_data
       

data/lib/new_relic/agent/samplers/memory.rb

@@ -16,10 +16,8 @@ module NewRelic::Agent
         @ps = "/usr/bin/ps -o rss -p"
       end
       if !@ps
-        raise "Unsupported platform for getting memory: #{platform}"
-      end
-      
-      if @ps        
+        NewRelic::Config.instance.log.warn "Unsupported platform for getting memory: #{platform}"
+      else
         @broken = false
         
         agent = NewRelic::Agent.instance        

data/lib/new_relic/config/rails.rb

@@ -29,12 +29,10 @@ class NewRelic::Config::Rails < NewRelic::Config
   def install_developer_mode(rails_config)
     controller_path = File.join(newrelic_root, 'ui', 'controllers')
     helper_path = File.join(newrelic_root, 'ui', 'helpers')
-    $LOAD_PATH << controller_path
-    $LOAD_PATH << helper_path
- 
+
     if defined? ActiveSupport::Dependencies
-      ActiveSupport::Dependencies.load_paths << controller_path
-      ActiveSupport::Dependencies.load_paths << helper_path
+      Dir["#{helper_path}/*.rb"].each { |f| require f }
+      Dir["#{controller_path}/*.rb"].each { |f| require f }
     elsif defined? Dependencies.load_paths
       Dependencies.load_paths << controller_path
       Dependencies.load_paths << helper_path

data/lib/new_relic/local_environment.rb

@@ -125,9 +125,9 @@ module NewRelic
       require 'optparse'
       # If nothing else is found, use the 3000 default
       default_port = 3000
-      ARGV.clone.options do |opts|
+      OptionParser.new do |opts|
         opts.on("-p", "--port=port", String) { | default_port | }
-        opts.parse!
+        opts.parse!(ARGV.clone)
       end
       default_port
     end

data/lib/new_relic/shim_agent.rb

@@ -58,7 +58,8 @@ module NewRelic
       
       def add_request_parameters(*args)
       end
-      
+      def add_custom_parameters(*args)
+      end
       def should_ignore_error
       end
     end  

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
   MAJOR = 2
   MINOR = 8
-  TINY  = 8
+  TINY  = 9
   STRING = [MAJOR, MINOR, TINY].join('.')
   def self.changes
     puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION::STRING}"
@@ -11,6 +11,13 @@ module NewRelic
   end
 
   CHANGELOG = <<EOF
+2009-04-17 version 2.8.9
+  * fix problem finding the newrelic controller in dev mode
+  * fix incompatibility with older versions of optparse
+  * fix potential jvm problem with jruby
+  * remove test:all task definition to avoid conflicts
+  * change error message about window sampler in windows not supported
+    to a warning message
 2009-03-27 version 2.8.8
   * fix error with jruby on windows
 2009-03-20 version 2.8.7

data/lib/tasks/agent_tests.rake

@@ -1,17 +1,13 @@
 # run unit tests for the NewRelic Agent
 if defined? Rake::TestTask
-
-namespace :test do
-  AGENT_HOME = File.expand_path(File.join(File.dirname(__FILE__), "..",".."))
-  Rake::TestTask.new(:agent) do |t|
-    t.libs << "#{AGENT_HOME}/test"
-    t.libs << "#{AGENT_HOME}/lib"
-    t.pattern = "#{AGENT_HOME}/test/**/tc_*.rb"
-    t.verbose = true
+  namespace :test do
+    AGENT_HOME = File.expand_path(File.join(File.dirname(__FILE__), "..",".."))
+    Rake::TestTask.new(:newrelic) do |t|
+      t.libs << "#{AGENT_HOME}/test"
+      t.libs << "#{AGENT_HOME}/lib"
+      t.pattern = "#{AGENT_HOME}/test/**/tc_*.rb"
+      t.verbose = true
+    end
+    Rake::Task['test:newrelic'].comment = "Run the unit tests for the Agent"
   end
-  Rake::Task['test:agent'].comment = "Run the unit tests for the Agent"
-
-  Rake::TestTask.new(:all => ["test", "test:agent"])
-  Rake::Task['test:all'].comment = "Run all tests including agent code"
-end
 end

data/newrelic.yml

@@ -47,7 +47,7 @@ common: &default_settings
   # If a proxy is used, the host setting is required.  Other settings are optional.  Default
   # port is 8080.
   #
-  # proxy_host: proxy.sample.com
+  # proxy_host: proxyhostname
   # proxy_port: 8080
   # proxy_user:
   # proxy_pass:

data/ui/controllers/newrelic_controller.rb

@@ -1,8 +1,6 @@
-##require 'new_relic/agent'
-require 'google_pie_chart'
-
 class NewrelicController < ActionController::Base
   include NewrelicHelper
+  helper NewrelicHelper
   
   # See http://wiki.rubyonrails.org/rails/pages/Safe+ERB:
   # We don't need to worry about checking taintedness

metadata

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