bin/newrelic_cmd lib/new_relic/commands/deployments.rb lib/new_relic/commands/new_relic_commands.rb @@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s| s.email = EMAIL s.homepage = HOMEPAGE s.require_path = 'lib' - s.files = %w(install.rb LICENSE README newrelic.yml Rakefile) + Dir.glob("{lib,recipes,test,ui}/**/*") + s.files = %w(install.rb LICENSE README newrelic.yml Rakefile) + Dir.glob("{lib,bin,recipes,test,ui}/**/*") end Rakefile @@ -660,15 +660,7 @@ module NewRelic::Agent # to go for higher compression instead, we could use Zlib::BEST_COMPRESSION and # pay a little more CPU. post_data = Zlib::Deflate.deflate(Marshal.dump(args), Zlib::BEST_SPEED) - - # Proxy returns regular HTTP if @proxy_host is nil (the default) - http = Net::HTTP::Proxy(config.proxy_server.host, config.proxy_server.port, - config.proxy_server.user, config.proxy_server.password).new(config.server.host, config.server.port) - if config.use_ssl? - http.use_ssl = true - http.verify_mode = OpenSSL::SSL::VERIFY_NONE - end - + http = config.http_connection http.read_timeout = @request_timeout # params = {:method => method, :license_key => license_key, :protocol_version => PROTOCOL_VERSION } lib/new_relic/agent/agent.rb @@ -1,7 +1,6 @@ require 'yaml' #require 'new_relic/version' require 'singleton' -require 'new_relic/agent' require 'erb' # Configuration supports the behavior of the agent which is dependent @@ -23,7 +22,6 @@ module NewRelic @instance ||= new_instance end - attr_reader :settings @settings = nil @@ -49,6 +47,15 @@ module NewRelic fetch(key) end #################################### + def env=(env_name) + @env = env_name + @settings = @yaml[env_name] + end + + def settings + @settings ||= @yaml[env] || {} + end + def []=(key, value) settings[key] = value end @@ -58,7 +65,7 @@ module NewRelic end def fetch(key, default=nil) - @settings[key].nil? ? default : @settings[key] + settings[key].nil? ? default : settings[key] end ################################### @@ -92,7 +99,7 @@ module NewRelic def api_server @api_server ||= - NewRelic::Config::Server.new fetch('api_host', 'rpm.newrelic.com'), fetch('api_port', use_ssl? ? 443 : 80).to_i + NewRelic::Config::Server.new fetch('api_host', 'rpm.newrelic.com'), fetch('api_port', fetch('port', use_ssl? ? 443 : 80)).to_i end def proxy_server @@ -101,8 +108,19 @@ module NewRelic fetch('proxy_user', nil), fetch('proxy_pass', nil) 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 + def http_connection(host = server) + # Proxy returns regular HTTP if @proxy_host is nil (the default) + http = Net::HTTP::Proxy(proxy_server.host, proxy_server.port, + proxy_server.user, proxy_server.password).new(host.host, host.port) + if use_ssl? + http.use_ssl = true + http.verify_mode = OpenSSL::SSL::VERIFY_NONE + end + http + end + def to_s puts self.inspect "Config[#{self.app}]" @@ -142,7 +160,7 @@ module NewRelic end def local_env - @env ||= NewRelic::LocalEnvironment.new + @local_env ||= NewRelic::LocalEnvironment.new end # send the given message to STDERR so that it shows @@ -151,7 +169,7 @@ module NewRelic # This will NOT print anything if the environment is unknown because this is # probably not an environment the agent will be running in. def log!(msg, level=:info) - return if @settings && !tracers_enabled? + return if settings && !tracers_enabled? to_stderr msg log.send level, msg if log end @@ -184,6 +202,7 @@ module NewRelic end def log_file_name(identifier="") + identifier ||= "" "newrelic_agent.#{identifier.gsub(/[^-\w.]/, '_')}.log" end @@ -223,7 +242,7 @@ module NewRelic else yaml = ERB.new(File.read(config_file)).result(binding) end - @settings = YAML.load(yaml)[env] || {} + @yaml = YAML.load(yaml) rescue ScriptError, StandardError => e puts e puts e.backtrace.join("\n") lib/new_relic/config.rb @@ -3,7 +3,7 @@ class NewRelic::Config::Merb < NewRelic::Config def app; :merb; end def env - ::Merb.env + @env ||= ::Merb.env end def root ::Merb.root lib/new_relic/config/merb.rb @@ -3,7 +3,7 @@ class NewRelic::Config::Rails < NewRelic::Config def app; :rails; end def env - RAILS_ENV + @env ||= RAILS_ENV end def root RAILS_ROOT lib/new_relic/config/rails.rb @@ -1,9 +1,22 @@ class NewRelic::Config::Ruby < NewRelic::Config def app; :ruby; end def env - ENV['RUBY_ENV'] || 'development' + @env ||= ENV['RUBY_ENV'] || ENV['RAILS_ENV'] || 'development' end def root Dir['.'] end + # Check a sequence of file locations for newrelic.yml + def config_file + files = [] + files << File.join(root,"config","newrelic.yml") + files << File.join(root,"newrelic.yml") + files << File.join(ENV["HOME"], ".newrelic", "newrelic.yml") + files << File.join(ENV["HOME"], "newrelic.yml") + files.each do | file | + return File.expand_path(file) if File.exists? file + end + return File.expand_path(files.first) + end + end \ No newline at end of file lib/new_relic/config/ruby.rb @@ -4,11 +4,11 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Bill Kayser"] - s.date = %q{2009-01-20} + s.date = %q{2009-01-21} s.description = %q{New Relic Ruby Performance Monitoring Agent} s.email = %q{bkayser@newrelic.com} s.extra_rdoc_files = ["README", "LICENSE"] - s.files = ["install.rb", "LICENSE", "README", "newrelic.yml", "Rakefile", "lib/new_relic", "lib/new_relic/agent", "lib/new_relic/agent/agent.rb", "lib/new_relic/agent/chained_call.rb", "lib/new_relic/agent/collection_helper.rb", "lib/new_relic/agent/error_collector.rb", "lib/new_relic/agent/instrumentation", "lib/new_relic/agent/instrumentation/active_record_instrumentation.rb", "lib/new_relic/agent/instrumentation/controller_instrumentation.rb", "lib/new_relic/agent/instrumentation/data_mapper.rb", "lib/new_relic/agent/instrumentation/dispatcher_instrumentation.rb", "lib/new_relic/agent/instrumentation/memcache.rb", "lib/new_relic/agent/instrumentation/merb", "lib/new_relic/agent/instrumentation/merb/controller.rb", "lib/new_relic/agent/instrumentation/merb/dispatcher.rb", "lib/new_relic/agent/instrumentation/merb/errors.rb", "lib/new_relic/agent/instrumentation/rails", "lib/new_relic/agent/instrumentation/rails/action_controller.rb", "lib/new_relic/agent/instrumentation/rails/action_web_service.rb", "lib/new_relic/agent/instrumentation/rails/dispatcher.rb", "lib/new_relic/agent/instrumentation/rails/errors.rb", "lib/new_relic/agent/instrumentation/rails/rails.rb", "lib/new_relic/agent/method_tracer.rb", "lib/new_relic/agent/patch_const_missing.rb", "lib/new_relic/agent/samplers", "lib/new_relic/agent/samplers/cpu.rb", "lib/new_relic/agent/samplers/memory.rb", "lib/new_relic/agent/samplers/mongrel.rb", "lib/new_relic/agent/stats_engine.rb", "lib/new_relic/agent/synchronize.rb", "lib/new_relic/agent/transaction_sampler.rb", "lib/new_relic/agent/worker_loop.rb", "lib/new_relic/agent.rb", "lib/new_relic/api", "lib/new_relic/api/deployments.rb", "lib/new_relic/config", "lib/new_relic/config/merb.rb", "lib/new_relic/config/rails.rb", "lib/new_relic/config/ruby.rb", "lib/new_relic/config.rb", "lib/new_relic/local_environment.rb", "lib/new_relic/merbtasks.rb", "lib/new_relic/metric_data.rb", "lib/new_relic/metric_spec.rb", "lib/new_relic/metrics.rb", "lib/new_relic/noticed_error.rb", "lib/new_relic/shim_agent.rb", "lib/new_relic/stats.rb", "lib/new_relic/transaction_analysis.rb", "lib/new_relic/transaction_sample.rb", "lib/new_relic/version.rb", "lib/new_relic_api.rb", "lib/newrelic_rpm.rb", "lib/tasks", "lib/tasks/agent_tests.rake", "lib/tasks/all.rb", "lib/tasks/install.rake", "recipes/newrelic.rb", "test/config", "test/config/newrelic.yml", "test/config/test_config.rb", "test/new_relic", "test/new_relic/agent", "test/new_relic/agent/mock_ar_connection.rb", "test/new_relic/agent/mock_scope_listener.rb", "test/new_relic/agent/model_fixture.rb", "test/new_relic/agent/tc_active_record.rb", "test/new_relic/agent/tc_agent.rb", "test/new_relic/agent/tc_collection_helper.rb", "test/new_relic/agent/tc_controller.rb", "test/new_relic/agent/tc_dispatcher_instrumentation.rb", "test/new_relic/agent/tc_error_collector.rb", "test/new_relic/agent/tc_method_tracer.rb", "test/new_relic/agent/tc_stats_engine.rb", "test/new_relic/agent/tc_synchronize.rb", "test/new_relic/agent/tc_transaction_sample.rb", "test/new_relic/agent/tc_transaction_sample_builder.rb", "test/new_relic/agent/tc_transaction_sampler.rb", "test/new_relic/agent/tc_worker_loop.rb", "test/new_relic/agent/testable_agent.rb", "test/new_relic/tc_config.rb", "test/new_relic/tc_deployments_api.rb", "test/new_relic/tc_environment.rb", "test/new_relic/tc_metric_spec.rb", "test/new_relic/tc_shim_agent.rb", "test/new_relic/tc_stats.rb", "test/test_helper.rb", "test/ui", "test/ui/tc_newrelic_helper.rb", "ui/controllers", "ui/controllers/newrelic_controller.rb", "ui/helpers", "ui/helpers/google_pie_chart.rb", "ui/helpers/newrelic_helper.rb", "ui/views", "ui/views/layouts", "ui/views/layouts/newrelic_default.rhtml", "ui/views/newrelic", "ui/views/newrelic/_explain_plans.rhtml", "ui/views/newrelic/_sample.rhtml", "ui/views/newrelic/_segment.rhtml", "ui/views/newrelic/_segment_row.rhtml", "ui/views/newrelic/_show_sample_detail.rhtml", "ui/views/newrelic/_show_sample_sql.rhtml", "ui/views/newrelic/_show_sample_summary.rhtml", "ui/views/newrelic/_sql_row.rhtml", "ui/views/newrelic/_stack_trace.rhtml", "ui/views/newrelic/_table.rhtml", "ui/views/newrelic/explain_sql.rhtml", "ui/views/newrelic/images", "ui/views/newrelic/images/arrow-close.png", "ui/views/newrelic/images/arrow-open.png", "ui/views/newrelic/images/blue_bar.gif", "ui/views/newrelic/images/gray_bar.gif", "ui/views/newrelic/index.rhtml", "ui/views/newrelic/javascript", "ui/views/newrelic/javascript/transaction_sample.js", "ui/views/newrelic/sample_not_found.rhtml", "ui/views/newrelic/show_sample.rhtml", "ui/views/newrelic/show_source.rhtml", "ui/views/newrelic/stylesheets", "ui/views/newrelic/stylesheets/style.css"] + s.files = ["install.rb", "LICENSE", "README", "newrelic.yml", "Rakefile", "lib/new_relic", "lib/new_relic/agent", "lib/new_relic/agent/agent.rb", "lib/new_relic/agent/chained_call.rb", "lib/new_relic/agent/collection_helper.rb", "lib/new_relic/agent/error_collector.rb", "lib/new_relic/agent/instrumentation", "lib/new_relic/agent/instrumentation/active_record_instrumentation.rb", "lib/new_relic/agent/instrumentation/controller_instrumentation.rb", "lib/new_relic/agent/instrumentation/data_mapper.rb", "lib/new_relic/agent/instrumentation/dispatcher_instrumentation.rb", "lib/new_relic/agent/instrumentation/memcache.rb", "lib/new_relic/agent/instrumentation/merb", "lib/new_relic/agent/instrumentation/merb/controller.rb", "lib/new_relic/agent/instrumentation/merb/dispatcher.rb", "lib/new_relic/agent/instrumentation/merb/errors.rb", "lib/new_relic/agent/instrumentation/rails", "lib/new_relic/agent/instrumentation/rails/action_controller.rb", "lib/new_relic/agent/instrumentation/rails/action_web_service.rb", "lib/new_relic/agent/instrumentation/rails/dispatcher.rb", "lib/new_relic/agent/instrumentation/rails/errors.rb", "lib/new_relic/agent/instrumentation/rails/rails.rb", "lib/new_relic/agent/method_tracer.rb", "lib/new_relic/agent/patch_const_missing.rb", "lib/new_relic/agent/samplers", "lib/new_relic/agent/samplers/cpu.rb", "lib/new_relic/agent/samplers/memory.rb", "lib/new_relic/agent/samplers/mongrel.rb", "lib/new_relic/agent/stats_engine.rb", "lib/new_relic/agent/synchronize.rb", "lib/new_relic/agent/transaction_sampler.rb", "lib/new_relic/agent/worker_loop.rb", "lib/new_relic/agent.rb", "lib/new_relic/api", "lib/new_relic/api/deployments.rb", "lib/new_relic/commands", "lib/new_relic/commands/deployments.rb", "lib/new_relic/commands/new_relic_commands.rb", "lib/new_relic/config", "lib/new_relic/config/merb.rb", "lib/new_relic/config/rails.rb", "lib/new_relic/config/ruby.rb", "lib/new_relic/config.rb", "lib/new_relic/local_environment.rb", "lib/new_relic/merbtasks.rb", "lib/new_relic/metric_data.rb", "lib/new_relic/metric_spec.rb", "lib/new_relic/metrics.rb", "lib/new_relic/noticed_error.rb", "lib/new_relic/shim_agent.rb", "lib/new_relic/stats.rb", "lib/new_relic/transaction_analysis.rb", "lib/new_relic/transaction_sample.rb", "lib/new_relic/version.rb", "lib/new_relic_api.rb", "lib/newrelic_rpm.rb", "lib/tasks", "lib/tasks/agent_tests.rake", "lib/tasks/all.rb", "lib/tasks/install.rake", "bin/newrelic_cmd", "recipes/newrelic.rb", "test/config", "test/config/newrelic.yml", "test/config/test_config.rb", "test/new_relic", "test/new_relic/agent", "test/new_relic/agent/mock_ar_connection.rb", "test/new_relic/agent/mock_scope_listener.rb", "test/new_relic/agent/model_fixture.rb", "test/new_relic/agent/tc_active_record.rb", "test/new_relic/agent/tc_agent.rb", "test/new_relic/agent/tc_collection_helper.rb", "test/new_relic/agent/tc_controller.rb", "test/new_relic/agent/tc_dispatcher_instrumentation.rb", "test/new_relic/agent/tc_error_collector.rb", "test/new_relic/agent/tc_method_tracer.rb", "test/new_relic/agent/tc_stats_engine.rb", "test/new_relic/agent/tc_synchronize.rb", "test/new_relic/agent/tc_transaction_sample.rb", "test/new_relic/agent/tc_transaction_sample_builder.rb", "test/new_relic/agent/tc_transaction_sampler.rb", "test/new_relic/agent/tc_worker_loop.rb", "test/new_relic/agent/testable_agent.rb", "test/new_relic/tc_config.rb", "test/new_relic/tc_deployments_api.rb", "test/new_relic/tc_environment.rb", "test/new_relic/tc_metric_spec.rb", "test/new_relic/tc_shim_agent.rb", "test/new_relic/tc_stats.rb", "test/test_helper.rb", "test/ui", "test/ui/tc_newrelic_helper.rb", "ui/controllers", "ui/controllers/newrelic_controller.rb", "ui/helpers", "ui/helpers/google_pie_chart.rb", "ui/helpers/newrelic_helper.rb", "ui/views", "ui/views/layouts", "ui/views/layouts/newrelic_default.rhtml", "ui/views/newrelic", "ui/views/newrelic/_explain_plans.rhtml", "ui/views/newrelic/_sample.rhtml", "ui/views/newrelic/_segment.rhtml", "ui/views/newrelic/_segment_row.rhtml", "ui/views/newrelic/_show_sample_detail.rhtml", "ui/views/newrelic/_show_sample_sql.rhtml", "ui/views/newrelic/_show_sample_summary.rhtml", "ui/views/newrelic/_sql_row.rhtml", "ui/views/newrelic/_stack_trace.rhtml", "ui/views/newrelic/_table.rhtml", "ui/views/newrelic/explain_sql.rhtml", "ui/views/newrelic/images", "ui/views/newrelic/images/arrow-close.png", "ui/views/newrelic/images/arrow-open.png", "ui/views/newrelic/images/blue_bar.gif", "ui/views/newrelic/images/gray_bar.gif", "ui/views/newrelic/index.rhtml", "ui/views/newrelic/javascript", "ui/views/newrelic/javascript/transaction_sample.js", "ui/views/newrelic/sample_not_found.rhtml", "ui/views/newrelic/show_sample.rhtml", "ui/views/newrelic/show_source.rhtml", "ui/views/newrelic/stylesheets", "ui/views/newrelic/stylesheets/style.css"] s.has_rdoc = true s.homepage = %q{http://www.newrelic.com} s.require_paths = ["lib"] newrelic_rpm.gemspec @@ -17,14 +17,17 @@ make_notify_task = lambda do log_command = source.log(from_revision) # Because new_relic_api could be plugins or the gem dir, we rely # on the lib path to find it. - script = [ 'load "new_relic_api.rb"' ] << + ## script = [ ' ] << + script = [ 'vendor/plugins/newrelic_rpm/bin/newrelic_cmd' ] << "deployments" << "-u" << ENV['USER'] << + "-e" << rails_env << "-r" << current_revision << - "-c" + "-c" + script = script.map { | arg | "'#{arg}'" }.join(" ") begin - run "cd #{current_release}; #{log_command} | script/runner -e #{rails_env} #{script}" do | io, stream_id, output | + run "cd #{current_release}; #{log_command} | ruby #{script}" do | io, stream_id, output | logger.trace(output) end rescue CommandError recipes/newrelic.rb @@ -1,9 +1,12 @@ -require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper')) -require 'new_relic_api' +#require File.expand_path(File.join(File.dirname(__FILE__),'/../test_helper')) +require File.expand_path(File.join(File.dirname(__FILE__),'../../lib/new_relic/commands/deployments')) +require 'rubygems' +require 'mocha' + class NewRelic::DeploymentsTests < Test::Unit::TestCase def setup - NewRelic::API::Deployments.class_eval do + NewRelic::Commands::Deployments.class_eval do attr_accessor :messages, :exit_status, :errors, :revision def err(message); @errors = @errors ? @errors + message : message; end def info(message); @messages = @messages ? @messages + message : message; end @@ -17,21 +20,34 @@ class NewRelic::DeploymentsTests < Test::Unit::TestCase puts @deployment.exit_status end def test_help - @deployment = NewRelic::API::Deployments.new "-?" + @deployment = NewRelic::Commands::Deployments.new "-?" assert_equal 0, @deployment.exit_status assert_match /^Usage/, @deployment.messages assert_nil @deployment.revision @deployment = nil end def test_run - @deployment = NewRelic::API::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description") + mock_the_connection + @mock_response.expects(:body).returns("<xml>deployment</xml>") + @deployment = NewRelic::Commands::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description") assert_nil @deployment.exit_status assert_nil @deployment.errors assert_equal '3838', @deployment.revision @deployment.run - assert_equal 1, @deployment.exit_status - assert_match /Unable to upload/, @deployment.errors + + # This should pass because it's a bogus deployment + #assert_equal 1, @deployment.exit_status + #assert_match /Unable to upload/, @deployment.errors + @deployment = nil end + private + def mock_the_connection + mock_connection = mock() + @mock_response = mock() + @mock_response.expects(:is_a?).with(Net::HTTPSuccess).returns(true) + mock_connection.expects(:request).returns(@mock_response) + NewRelic::Config.instance.stubs(:http_connection).returns(mock_connection) + end end test/new_relic/tc_deployments_api.rb a72e1f912863e90c1fdedb48398489008acc913f James Gochee Jim@james-gochees-macbook-pro.local http://github.com/mislav/newrelic_rpm/commit/6733ca65e648d6f4836f19382a11640443ceb886 6733ca65e648d6f4836f19382a11640443ceb886 2009-01-21T15:30:33-08:00 2009-01-21T15:30:33-08:00 sync agent beta 2.8.1-6142 5820727de613886997596b5fdbe7aaa25a0df64b James Gochee Jim@james-gochees-macbook-pro.local