newrelic_rpm 3.4.1 → 3.4.2.beta1

data/test/new_relic/local_environment_test.rb

@@ -36,14 +36,12 @@ class NewRelic::LocalEnvironmentTest < Test::Unit::TestCase
     assert_equal :passenger, e.environment
     assert_nil e.dispatcher_instance_id, "dispatcher instance id should be nil: #{e.dispatcher_instance_id}"
 
-    NewRelic::Control.instance.instance_eval do
-      @settings['app_name'] = 'myapp'
+    with_config(:app_name => 'myapp') do
+      e = NewRelic::LocalEnvironment.new
+      assert_equal :passenger, e.environment
+      assert_nil e.dispatcher_instance_id
     end
 
-    e = NewRelic::LocalEnvironment.new
-    assert_equal :passenger, e.environment
-    assert_nil e.dispatcher_instance_id
-
     ::Passenger.class_eval { remove_const :AbstractServer }
   end
   

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -132,11 +132,11 @@ EOL
   def test_guid_is_set_in_footer_when_token_is_set
     guid = 'abcdefgfedcba'
     NewRelic::TransactionSample.any_instance.stubs(:generate_guid).returns(guid)
-    NewRelic::Control.instance.stubs(:apdex_t).returns(0.0001)
     set_cookie "NRAGENT=tk=token"
-    get '/'
-
-    assert(last_response.body.include?(guid), last_response.body)
+    with_config(:apdex_t => 0.0001) do
+      get '/'
+      assert(last_response.body.include?(guid), last_response.body)
+    end
   end
 end
 else

data/test/new_relic/rack/developer_mode_test.rb

@@ -14,32 +14,38 @@ class DeveloperModeTest < Test::Unit::TestCase
     mock_app = lambda { |env| [500, {}, "Don't touch me!"] }
     NewRelic::Rack::DeveloperMode.new(mock_app)
   end
-  
+
   def setup
+    @test_config = { 'developer_mode' => true }
+    NewRelic::Agent.config.apply_config(@test_config)
     @sampler = NewRelic::Agent::TransactionSampler.new
     run_sample_trace_on(@sampler, '/here')
     run_sample_trace_on(@sampler, '/there')
     run_sample_trace_on(@sampler, '/somewhere')
     NewRelic::Agent.instance.stubs(:transaction_sampler).returns(@sampler)
   end
-  
+
+  def teardown
+    NewRelic::Agent.config.remove_config(@test_config)
+  end
+
   def test_index_displays_all_samples
     get '/newrelic'
-    
+
     assert last_response.ok?
     assert last_response.body.include?('/here')
     assert last_response.body.include?('/there')
-    assert last_response.body.include?('/somewhere')    
+    assert last_response.body.include?('/somewhere')
   end
 
   def test_show_sample_summary_displays_sample_details
     get "/newrelic/show_sample_summary?id=#{@sampler.samples[0].sample_id}"
-    
+
     assert last_response.ok?
     assert last_response.body.include?('/here')
     assert last_response.body.include?('SandwichesController')
-    assert last_response.body.include?('index')    
-  end  
+    assert last_response.body.include?('index')
+  end
 
   def test_explain_sql_displays_query_plan
     sample = @sampler.samples[0]

data/test/new_relic/transaction_sample_test.rb

@@ -5,6 +5,8 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   ::SQL_STATEMENT = "SELECT * from sandwiches"
 
   def setup
+    @test_config = { 'developer_mode' => true }
+    NewRelic::Agent.config.apply_config(@test_config)
     @connection_stub = Mocha::Mockery.instance.named_mock('connection')
     @connection_stub.stubs(:execute).returns([['QUERY RESULT']])
 
@@ -12,6 +14,10 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     @t = make_sql_transaction(::SQL_STATEMENT, ::SQL_STATEMENT)
   end
 
+  def teardown
+    NewRelic::Agent.config.remove_config(@test_config)
+  end
+
   def test_be_recorded
     assert_not_nil @t
   end
@@ -78,7 +84,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
 
   def test_have_explains
     s = @t.prepare_to_send(:record_sql => :obfuscated, :explain_sql => 0.00000001)
-    
+
     s.each_segment do |segment|
       if segment.params[:explain_plan]
         explanation = segment.params[:explain_plan]
@@ -138,7 +144,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
       s.to_s
     end
   end
-  
+
   def test_to_s_includes_keys
     s = @t.prepare_to_send(:explain_sql => 0.1)
     s.params[:fake_key] = 'a fake param'

data/test/script/build_test_gem.sh

@@ -1,10 +1,15 @@
 #!/bin/bash
 
 # print commands in this script as they're invoked
-set -x
+#set -x
 # fail if any command fails
 set -e
 
+. "$HOME/.rvm/scripts/rvm"
+
+#rvm 1.9.3
+
+
 if [ "x$BUILD_NUMBER" == "x" ]; then
   echo '$BUILD_NUMBER is undefined'
   echo 'setting $BUILD_NUMBER to alpha'
@@ -12,7 +17,7 @@ if [ "x$BUILD_NUMBER" == "x" ]; then
 fi
 
 SHA1=`git log --pretty=format:'%h' -n 1`
-echo "building gem for commit $SHA"
+echo "building gem for commit $SHA1"
 
 if [[ `gem list jeweler | grep [j]eweler | wc -l` -eq 1 ]]; then
   echo "detected jeweler. skipping install"
@@ -28,7 +33,8 @@ mkdir gems
 
 # FIXME: don't include the $SHA1 since some of our builds systems are confused
 # by this.
-BUILD_ID=$BUILD_NUMBER #.$SHA1
+#BUILD_ID="$SHA1.$BUILD_NUMBER" #.$SHA1
+BUILD_ID="$BUILD_NUMBER" #.$SHA1
 
 # rewrite the version file, setting the patch identifier to include the
 # BUILD_ID

data/test/script/ci.sh

@@ -29,12 +29,22 @@ set -e
 if [ "x$RUBY" == "x" ]; then
   echo '$RUBY is undefined'
   echo 'defaulting to 1.9.3'
-  RUBY=1.9.3
+  export RUBY=1.9.3
 fi
 if [ "x$BRANCH" == "x" ]; then
   echo '$BRANCH is undefined'
   echo 'defaulting to rails31'
-  BRANCH=rails31
+  export BRANCH=rails31
+fi
+
+if [ "x$JOB_NAME" == "x" ]; then
+  echo '$JOB_NAME is undefined'
+  echo 'defaulting to clrun'
+  export PROJECT_NAME=clrun
+else
+  CLEANSED_NAME=`echo $JOB_NAME  | sed "s/label//" | sed "s/Portland//" | sed "s/BRANCH//" | sed "s/RUBY//" | sed "s/[=\/,\._]//g" | sed "s/ReleaseCandidate/RC/"`
+  echo "setting PROJECT_NAME to $CLEANSED_NAME"
+  export PROJECT_NAME="$CLEANSED_NAME"
 fi
 
 . "$HOME/.rvm/scripts/rvm"
@@ -73,7 +83,7 @@ mysql: &mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
   username: root
   host: localhost
-  database: <%= [ 'rails_blog', ENV['BRANCH'], ENV['RUBY'] ].compact.join('_') %>
+  database: <%= [ 'rails_blog', ENV['BRANCH'], ENV['RUBY'], ENV['PROJECT_NAME'] ].compact.join('_') %>
 
 # Shared properties for postgres.  This won't work with our schema but
 # Does work with agent tests

data/test/test_helper.rb

@@ -14,7 +14,7 @@ require 'rubygems'
 
 begin
   require 'config/environment'
-  # require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
+#   require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
   begin
     require 'test_help'
   rescue LoadError
@@ -24,7 +24,7 @@ begin
 rescue LoadError
   # To run the tests against a standalone agent build, you need to
   # add a rails app to the load path.  It can be 2.* to 3.*.  It should
-  # referenc newrelic_rpm in the Gemfile with a :path option pointing 
+  # referenc newrelic_rpm in the Gemfile with a :path option pointing
   # to this work directory.
   guess = File.expand_path("../../../rpm", __FILE__)
   if $LOAD_PATH.include? guess
@@ -118,6 +118,13 @@ def compare_metrics(expected, actual)
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
 
+def with_config(config_hash, level=0)
+  config = NewRelic::Agent::Configuration::DottedHash.new(config_hash)
+  NewRelic::Agent.config.apply_config(config, level)
+  yield
+  NewRelic::Agent.config.remove_config(config)
+end
+
 module TransactionSampleTestHelper
   def make_sql_transaction(*sql)
     sampler = NewRelic::Agent::TransactionSampler.new

data/ui/helpers/developer_mode_helper.rb

@@ -70,7 +70,7 @@ module NewRelic::DeveloperModeHelper
     rescue
       # catch all other exceptions.  We're going to create an invalid link below, but that's okay.
     end
-    if using_textmate?
+    if NewRelic::Agent.config[:textmate]
       "txmt://open?url=file://#{file}&line=#{line}"
     else
       "show_source?file=#{file}&line=#{line}&anchor=selected_line"
@@ -105,7 +105,7 @@ module NewRelic::DeveloperModeHelper
 
   # write a link to the source for a trace
   def link_to_source(trace)
-    image_url = 'file/images/' + (using_textmate? ? "textmate.png" : "file_icon.png")
+    image_url = 'file/images/' + (NewRelic::Agent.config[:textmate] ? "textmate.png" : "file_icon.png")
 
     link_to "<img src=#{image_url} alt=\"View Source\" title=\"View Source\"/>", url_for_source(application_caller(trace))
   end
@@ -239,11 +239,6 @@ module NewRelic::DeveloperModeHelper
     end
   end
 
-  def using_textmate?
-    NewRelic::Control.instance.use_textmate?
-  end
-
-
   def render_segment_details(segment, depth=0)
     @detail_segment_count ||= 0
     @detail_segment_count += 1

metadata

@@ -1,24 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  hash: -3470574200
+  prerelease: 6
   segments: 
   - 3
   - 4
+  - 2
+  - beta
   - 1
-  version: 3.4.1
+  version: 3.4.2.beta1
 platform: ruby
 authors: 
 - Bill Kayser
 - Jon Guymon
 - Justin George
 - Darin Swanson
+- Rob Saul
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -72,9 +75,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
+- newrelic
 - mongrel_rpm
 - newrelic_cmd
-- newrelic
 extensions: []
 
 extra_rdoc_files: 
@@ -86,6 +89,7 @@ files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
+- ReleaseNotes.md
 - bin/mongrel_rpm
 - bin/newrelic
 - bin/newrelic_cmd
@@ -101,6 +105,12 @@ files:
 - lib/new_relic/agent/browser_monitoring.rb
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
+- lib/new_relic/agent/configuration.rb
+- lib/new_relic/agent/configuration/defaults.rb
+- lib/new_relic/agent/configuration/environment_source.rb
+- lib/new_relic/agent/configuration/manager.rb
+- lib/new_relic/agent/configuration/server_source.rb
+- lib/new_relic/agent/configuration/yaml_source.rb
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/instrumentation.rb
@@ -155,7 +165,6 @@ files:
 - lib/new_relic/commands/install.rb
 - lib/new_relic/control.rb
 - lib/new_relic/control/class_methods.rb
-- lib/new_relic/control/configuration.rb
 - lib/new_relic/control/frameworks.rb
 - lib/new_relic/control/frameworks/external.rb
 - lib/new_relic/control/frameworks/merb.rb
@@ -212,6 +221,10 @@ files:
 - test/new_relic/agent/beacon_configuration_test.rb
 - test/new_relic/agent/browser_monitoring_test.rb
 - test/new_relic/agent/busy_calculator_test.rb
+- test/new_relic/agent/configuration/environment_source_test.rb
+- test/new_relic/agent/configuration/manager_test.rb
+- test/new_relic/agent/configuration/server_source_test.rb
+- test/new_relic/agent/configuration/yaml_source_test.rb
 - test/new_relic/agent/database_test.rb
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
@@ -248,7 +261,7 @@ files:
 - test/new_relic/collection_helper_test.rb
 - test/new_relic/command/deployments_test.rb
 - test/new_relic/control/class_methods_test.rb
-- test/new_relic/control/configuration_test.rb
+- test/new_relic/control/frameworks/rails_test.rb
 - test/new_relic/control/logging_methods_test.rb
 - test/new_relic/control_test.rb
 - test/new_relic/delayed_job_injection_test.rb
@@ -401,12 +414,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/new_relic/control/configuration.rb

@@ -1,206 +0,0 @@
-module NewRelic
-  class Control
-    # used to contain methods to look up settings from the
-    # configuration located in newrelic.yml
-    module Configuration
-      def settings
-        unless @settings
-          @settings = (@yaml && merge_defaults(@yaml[env])) || {}
-          # At the time we bind the settings, we also need to run this little piece
-          # of magic which allows someone to augment the id with the app name, necessary
-          if self['multi_homed'] && app_names.size > 0
-            if @local_env.dispatcher_instance_id
-              @local_env.dispatcher_instance_id << ":#{app_names.first}"
-            else
-              @local_env.dispatcher_instance_id = app_names.first
-            end
-          end
-
-        end
-        @settings
-      end
-
-      def merge_defaults(settings_hash)
-        s = {
-          'host' => 'collector.newrelic.com',
-          'ssl' => false,
-          'log_level' => 'info',
-          'apdex_t' => 0.5
-        }
-        s.merge! settings_hash if settings_hash
-        # monitor_daemons replaced with agent_enabled
-        s['agent_enabled'] = s.delete('monitor_daemons') if s['agent_enabled'].nil? && s.include?('monitor_daemons')
-        s
-      end
-
-      # Merge the given options into the config options.
-      # They might be a nested hash
-      def merge_options(options, hash=self)
-        options.each do |key, val|
-          case
-          when key == :config then next
-          when val.is_a?(Hash)
-            merge_options(val, hash[key.to_s] ||= {})
-          when val.nil?
-            hash.delete(key.to_s)
-          else
-            hash[key.to_s] = val
-          end
-        end
-      end
-
-      def merge_server_side_config(data)
-        remove_server_controlled_configs
-        config = Hash.new
-        data.each_pair do |key, value|
-          if key.include?('.')
-            key = key.split('.')
-            config[key.first] ||= Hash.new
-            config[key.first][key[1]] = value
-          else
-            config[key] = value
-          end
-        end
-        merge_options(config)
-      end
-
-      def remove_server_controlled_configs
-        settings.delete('transaction_tracer')
-        settings.delete('slow_sql')
-        settings.delete('error_collector')
-        settings.delete('capture_params')
-      end
-
-      def [](key)
-        fetch(key)
-      end
-
-      def []=(key, value)
-        settings[key] = value
-      end
-
-      def fetch(key, default=nil)
-        settings.fetch(key, default)
-      end
-
-      def apdex_t
-        # Always initialized with a default
-        @apdex_t_float ||= fetch('apdex_t').to_f
-      end
-
-      def license_key
-        env_setting = ENV['NEW_RELIC_LICENSE_KEY'] || ENV['NEWRELIC_LICENSE_KEY']
-        fetch('license_key', env_setting)
-      end
-      
-      def capture_params
-        fetch('capture_params')
-      end
-      
-      # True if we are sending data to the server, monitoring production
-      def monitor_mode?
-        fetch('monitor_mode', fetch('enabled'))
-      end
-
-      # True if we are capturing data and displaying in /newrelic
-      def developer_mode?
-        fetch('developer_mode', fetch('developer'))
-      end
-      
-      # whether we should install the
-      # NewRelic::Rack::BrowserMonitoring middleware automatically on
-      # Rails applications
-      def browser_monitoring_auto_instrument?
-        fetch('browser_monitoring', {}).fetch('auto_instrument', true)
-      end
-
-      def multi_threaded?
-        fetch('multi_threaded')
-      end
-
-      def disable_serialization?
-        fetch('disable_serialization', true)
-      end
-      def disable_serialization=(b)
-        self['disable_serialization'] = b
-      end
-      
-      # True if we should view files in textmate
-      def use_textmate?
-        fetch('textmate')
-      end
-      
-      # defaults to 2MiB
-      def post_size_limit
-        fetch('post_size_limit', 2 * 1024 * 1024)
-      end
-
-      # Configuration option of the same name to indicate that we should connect
-      # to New Relic synchronously on startup.  This means when the agent is loaded it
-      # won't return without trying to set up the server connection at least once
-      # which can make startup take longer.  Defaults to false.
-      def sync_startup
-        fetch('sync_startup', false)
-      end
-
-      # Configuration option of the same name to indicate that we should flush
-      # data to the server on exiting.  Defaults to true.
-      def send_data_on_exit
-        fetch('send_data_on_exit', true)
-      end
-
-      def dispatcher_instance_id
-        self['dispatcher_instance_id'] || @local_env.dispatcher_instance_id
-      end
-
-      def dispatcher
-        (self['dispatcher'] && self['dispatcher'].to_sym) || @local_env.dispatcher
-      end
-      def app_names
-        case self['app_name']
-        when Array then self['app_name']
-        when String then self['app_name'].split(';')
-        else [ env ]
-        end
-      end
-      def validate_seed
-        self['validate_seed'] || ENV['NR_VALIDATE_SEED']
-      end
-      def validate_token
-        self['validate_token'] || ENV['NR_VALIDATE_TOKEN']
-      end
-      
-      def use_ssl?
-        @use_ssl = fetch('ssl', false) unless @use_ssl
-        @use_ssl
-      end
-      
-      def log_file_path
-        fetch('log_file_path', 'log/')
-      end
-      
-      # only verify certificates if you're very sure you want this
-      # level of security, it includes possibly app-crashing dns
-      # lookups every connection to the server
-      def verify_certificate?
-        unless @verify_certificate
-          unless use_ssl?
-            @verify_certificate = false
-          else
-            @verify_certificate = fetch('verify_certificate', false)
-          end
-        end
-        @verify_certificate
-      end
-
-      def disable_backtrace_cleanup?
-        fetch('disable_backtrace_cleanup')
-      end
-
-      def has_slow_sql_config?
-        self['slow_sql'] && self['slow_sql'].has_key?('enabled')
-      end
-    end
-    include Configuration
-  end
-end