newrelic_rpm 2.8.11 → 2.9.2

data/lib/newrelic_rpm.rb

@@ -1,27 +1,40 @@
-# Initialization script for the gem.
-# Add 
+# == New Relic Initialization
+# 
+# When installed as a gem, you can activate the New Relic agent one of the following ways:
+#
+# For Rails, add:
 #    config.gem 'newrelic_rpm'
 # to your initialization sequence.
 #
-require 'new_relic/config'
+# For merb, do 
+#    dependency 'newrelic_rpm'
+# in the Merb config/init.rb
+#
+# For other frameworks, or to manage the agent manually, invoke NewRelic::Agent#manual_start
+# directly.
+#
+require 'new_relic/control'
 
 def log!(message)
   STDERR.puts "[NewRelic] #{message}"
 end
 
-# START THE AGENT
-# We install the shim agent unless the tracers are enabled, the plugin
-# env setting is not false, and the agent started okay.
-if !NewRelic::Config.instance.tracers_enabled?
-  require 'new_relic/shim_agent'
-else
-  # After verison 2.0 of Rails we can access the configuration directly.
-  # We need it to add dev mode routes after initialization finished. 
-  if defined? Rails.configuration
-    Rails.configuration.after_initialize do
-      NewRelic::Config.instance.start_plugin Rails.configuration
-    end
-  else
-    NewRelic::Config.instance.start_plugin
+# After verison 2.0 of Rails we can access the configuration directly.
+# We need it to add dev mode routes after initialization finished. 
+if defined? Rails.configuration
+  Rails.configuration.after_initialize do
+    NewRelic::Control.instance.init_plugin :config => Rails.configuration
   end
+elsif defined? Merb
+  module NewRelic
+    class MerbBootLoader < Merb::BootLoader
+      after Merb::BootLoader::ChooseAdapter
+
+      def self.run
+        NewRelic::Control.instance.init_plugin
+      end
+    end
+  end  
+else
+  NewRelic::Control.instance.init_plugin
 end

data/lib/tasks/{agent_tests.rake → tests.rake}

@@ -5,7 +5,7 @@ if defined? Rake::TestTask
     Rake::TestTask.new(:newrelic) do |t|
       t.libs << "#{AGENT_HOME}/test"
       t.libs << "#{AGENT_HOME}/lib"
-      t.pattern = "#{AGENT_HOME}/test/**/tc_*.rb"
+      t.pattern = "#{AGENT_HOME}/test/**/*_test.rb"
       t.verbose = true
     end
     Rake::Task['test:newrelic'].comment = "Run the unit tests for the Agent"

data/newrelic.yml

@@ -1,101 +1,153 @@
 #
-# This file configures the NewRelic RPM Agent, NewRelic RPM monitors Rails 
-# applications with deep visibility and low overhead.  For more information, 
-# visit www.newrelic.com.
+# This file configures the NewRelic RPM Agent, NewRelic RPM monitors
+# Rails applications with deep visibility and low overhead.  For more
+# information, visit www.newrelic.com.
 #
 # <%= generated_for_user %>
 #
 # here are the settings that are common to all environments
 common: &default_settings
   # ============================== LICENSE KEY ===============================
-  # You must specify the licence key associated with your New Relic account.
-  # This key binds your Agent's data to your account in the New Relic RPM service.
+
+  # You must specify the licence key associated with your New Relic
+  # account.  This key binds your Agent's data to your account in the
+  # New Relic RPM service.
   license_key: '<%= license_key %>'
   
+  # Agent Enabled
+  # Use this setting to force the agent to run or not run.
+  # Default is 'auto' which means the agent will install and run only
+  # if a valid dispatcher such as Mongrel is running.  This prevents
+  # it from running with Rake or the console.  Set to false to
+  # completely turn the agent off regardless of the other settings.
+  # Valid values are true, false and auto.
+  # agent_enabled: auto
+  
   # Application Name
-  # Set this to be the name of your application as you'd like it show up in RPM.
-  # RPM will then auto-map instances of your application into a RPM "application"
-  # on your home dashboard page. This setting does not prevent you from manually
+  # Set this to be the name of your application as you'd like it show
+  # up in RPM.  RPM will then auto-map instances of your application
+  # into a RPM "application" on your home dashboard page. If you want
+  # to map this instance into multiple apps, like "AJAX Requests" and
+  # "All UI" then specify a semicolon separated list of up to three
+  # distinct names.  This setting does not prevent you from manually
   # defining applications.
   app_name: My Application
 
-  # the 'enabled' setting is used to turn on the NewRelic Agent.  When false,
-  # your application is not instrumented and the Agent does not start up or
-  # collect any data; it is a complete shut-off.
-  #
-  # when turned on, the agent collects performance data by inserting lightweight
-  # tracers on key methods inside the rails framework and asynchronously aggregating
-  # and reporting this performance data to the NewRelic RPM service at NewRelic.com.
-  # below.
+  # When 'enabled' is turned on, the agent collects performance data
+  # by inserting lightweight tracers on key methods inside the rails
+  # framework and asynchronously aggregating and reporting this
+  # performance data to the NewRelic RPM service at newrelic.com.
   enabled: false
 
-  # The newrelic agent generates its own log file to keep its logging information
-  # separate from that of your application.  Specify its log level here.
+  # The newrelic agent generates its own log file to keep its logging
+  # information separate from that of your application.  Specify its
+  # log level here.
   log_level: info
   
-  # The newrelic agent communicates with the RPM service via http by default.
-  # If you want to communicate via https to increase security, then turn on
-  # SSL by setting this value to true.  Note, this will result in increased
-  # CPU overhead to perform the encryption involved in SSL communication, but this
-  # work is done asynchronously to the threads that process your application code, so
-  # it should not impact response times.
+  # The newrelic agent communicates with the RPM service via http by
+  # default.  If you want to communicate via https to increase
+  # security, then turn on SSL by setting this value to true.  Note,
+  # this will result in increased CPU overhead to perform the
+  # encryption involved in SSL communication, but this work is done
+  # asynchronously to the threads that process your application code,
+  # so it should not impact response times.
   ssl: false
+
+  # EXPERIMENTAL: enable verification of the SSL certificate sent by
+  # the server. This setting has no effect unless SSL is enabled
+  # above. This may block your application. Only enable it if the data
+  # you send us needs end-to-end verified certificates.
+  #
+  # This means we cannot cache the DNS lookup, so each request to the
+  # RPM service will perform a lookup. It also means that we cannot
+  # use a non-blocking lookup, so in a worst case, if you have DNS
+  # problems, your app may block indefinitely.
+  # verify_certificate: true
   
+  # Set your application's Apdex threshold value with the 'apdex_t'
+  # setting, in seconds. The apdex_t value determines the buckets used
+  # to compute your overall Apdex score. 
+  # Requests that take less than apdex_t seconds to process will be
+  # classified as Satisfying transactions; more than apdex_t seconds
+  # as Tolerating transactions; and more than four times the apdex_t
+  # value as Frustrating transactions. 
+  # For more about the Apdex standard, see
+  # http://support.newrelic.com/faqs/general/apdex
+
+  apdex_t: 0.5
+    
 
   # Proxy settings for connecting to the RPM server.
   #
-  # If a proxy is used, the host setting is required.  Other settings are optional.  Default
-  # port is 8080.
+  # If a proxy is used, the host setting is required.  Other settings
+  # are optional.  Default port is 8080.
   #
-  # proxy_host: proxyhostname
+  # proxy_host: hostname
   # proxy_port: 8080
   # proxy_user:
   # proxy_pass:
 
   
-  # Tells transaction tracer and error collector (when enabled) whether or not to capture HTTP params. 
-  # When true, the RoR filter_parameters mechanism is used so that sensitive parameters are not recorded
+  # Tells transaction tracer and error collector (when enabled)
+  # whether or not to capture HTTP params.  When true, the RoR
+  # filter_parameter_logging mechanism is used so that sensitive
+  # parameters are not recorded
   capture_params: false
 
 
   # Transaction tracer captures deep information about slow
-  # transactions and sends this to the RPM service once a minute. Included in the
-  # transaction is the exact call sequence of the transactions including any SQL statements
-  # issued.
+  # transactions and sends this to the RPM service once a
+  # minute. Included in the transaction is the exact call sequence of
+  # the transactions including any SQL statements issued.
   transaction_tracer:
   
-    # Transaction tracer is enabled by default. Set this to false to turn it off. This feature
-    # is only available at the Silver and above product levels.
+    # Transaction tracer is enabled by default. Set this to false to
+    # turn it off. This feature is only available at the Silver and
+    # above product levels.
     enabled: true
-  
+    
+    # Threshold in seconds for when to collect a transaction
+    # trace. When the response time of a controller action exceeds
+    # this threshold, a transaction trace will be recorded and sent to
+    # RPM. Valid values are any float value, or (default) "apdex_f",
+    # which will use the threshold for an dissatisfying Apdex
+    # controller action - four times the Apdex T value.
+    transaction_threshold: apdex_f
  
-    # When transaction tracer is on, SQL statements can optionally be recorded. The recorder
-    # has three modes, "off" which sends no SQL, "raw" which sends the SQL statement in its 
-    # original form, and "obfuscated", which strips out numeric and string literals
+    # When transaction tracer is on, SQL statements can optionally be
+    # recorded. The recorder has three modes, "off" which sends no
+    # SQL, "raw" which sends the SQL statement in its original form,
+    # and "obfuscated", which strips out numeric and string literals
     record_sql: obfuscated
     
-    # Threshold in seconds for when to collect stack trace for a SQL call. In other words, 
-    # when SQL statements exceed this threshold, then capture and send to RPM the current
-    # stack trace. This is helpful for pinpointing where long SQL calls originate from  
+    # Threshold in seconds for when to collect stack trace for a SQL
+    # call. In other words, when SQL statements exceed this threshold,
+    # then capture and send to RPM the current stack trace. This is
+    # helpful for pinpointing where long SQL calls originate from
     stack_trace_threshold: 0.500
   
-  # Error collector captures information about uncaught exceptions and sends them to RPM for
-  # viewing
+  # Error collector captures information about uncaught exceptions and
+  # sends them to RPM for viewing
   error_collector:
     
-    # Error collector is enabled by default. Set this to false to turn it off. This feature
-    # is only available at the Silver and above product levels
+    # Error collector is enabled by default. Set this to false to turn
+    # it off. This feature is only available at the Silver and above
+    # product levels
     enabled: true
     
-    # Tells error collector whether or not to capture a source snippet around the place of the
-    # error when errors are View related.
+    # Tells error collector whether or not to capture a source snippet
+    # around the place of the error when errors are View related.
     capture_source: true    
     
-    # To stop specific errors from reporting to RPM, set this property to comma separated 
-    # values
+    # To stop specific errors from reporting to RPM, set this property
+    # to comma separated values
     #
     #ignore_errors: ActionController::RoutingError, ...
 
+  # (Advanced) Uncomment this to ensure the cpu and memory samplers
+  # won't run.  Useful when you are using the agent to monitor an
+  # external resource
+  # disable_samplers: true
 
 # override default settings based on your application's environment
 
@@ -104,33 +156,34 @@ common: &default_settings
 
 development:
   <<: *default_settings
-  # turn off communication to RPM service in development mode.
-  # NOTE: for initial evaluation purposes, you may want to temporarily turn
+  # turn off communication to RPM service in development mode.  NOTE:
+  # for initial evaluation purposes, you may want to temporarily turn
   # the agent on in development mode.
   enabled: false
 
-  # When running in Developer Mode, the New Relic Agent will present 
-  # performance information on the last 100 transactions you have 
-  # executed since starting the mongrel.  to view this data, go to 
+  # When running in Developer Mode, the New Relic Agent will present
+  # performance information on the last 100 transactions you have
+  # executed since starting the mongrel.  to view this data, go to
   # http://localhost:3000/newrelic
   developer: true
 
 test:
   <<: *default_settings
-  # it almost never makes sense to turn on the agent when running unit, functional or
-  # integration tests or the like.
+  # it almost never makes sense to turn on the agent when running
+  # unit, functional or integration tests or the like.
   enabled: false
 
-# Turn on the agent in production for 24x7 monitoring.  NewRelic testing shows
-# an average performance impact of < 5 ms per transaction, you you can leave this on
-# all the time without incurring any user-visible performance degredation.
+# Turn on the agent in production for 24x7 monitoring.  NewRelic
+# testing shows an average performance impact of < 5 ms per
+# transaction, you you can leave this on all the time without
+# incurring any user-visible performance degredation.
 production:
   <<: *default_settings
   enabled: true
 
-# many applications have a staging environment which behaves identically to production.
-# Support for that environment is provided here.  By default, the staging environment has
-# the agent turned on.
+# many applications have a staging environment which behaves
+# identically to production.  Support for that environment is provided
+# here.  By default, the staging environment has the agent turned on.
 staging:
   <<: *default_settings
   enabled: true

data/newrelic_rpm.gemspec

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{newrelic_rpm}
+  s.version = "2.9.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bill Kayser"]
+  s.date = %q{2009-06-23}
+  s.description = %q{New Relic Ruby Performance Monitoring Agent}
+  s.email = %q{bkayser@newrelic.com}
+  s.executables = ["mongrel_rpm", "newrelic_cmd"]
+  s.extra_rdoc_files = ["bin/mongrel_rpm", "bin/newrelic_cmd", "CHANGELOG", "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/active_merchant.rb", "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/error_instrumentation.rb", "lib/new_relic/agent/instrumentation/memcache.rb", "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/passenger_instrumentation.rb", "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/method_tracer.rb", "lib/new_relic/agent/patch_const_missing.rb", "lib/new_relic/agent/sampler.rb", "lib/new_relic/agent/samplers/cpu_sampler.rb", "lib/new_relic/agent/samplers/memory_sampler.rb", "lib/new_relic/agent/samplers/mongrel_sampler.rb", "lib/new_relic/agent/shim_agent.rb", "lib/new_relic/agent/stats_engine.rb", "lib/new_relic/agent/transaction_sampler.rb", "lib/new_relic/agent/worker_loop.rb", "lib/new_relic/agent.rb", "lib/new_relic/commands/deployments.rb", "lib/new_relic/commands/new_relic_commands.rb", "lib/new_relic/control/merb.rb", "lib/new_relic/control/rails.rb", "lib/new_relic/control/ruby.rb", "lib/new_relic/control.rb", "lib/new_relic/local_environment.rb", "lib/new_relic/merbtasks.rb", "lib/new_relic/metric_data.rb", "lib/new_relic/metric_parser/action_mailer.rb", "lib/new_relic/metric_parser/active_merchant.rb", "lib/new_relic/metric_parser/active_record.rb", "lib/new_relic/metric_parser/controller.rb", "lib/new_relic/metric_parser/controller_cpu.rb", "lib/new_relic/metric_parser/database.rb", "lib/new_relic/metric_parser/errors.rb", "lib/new_relic/metric_parser/mem_cache.rb", "lib/new_relic/metric_parser/view.rb", "lib/new_relic/metric_parser/web_service.rb", "lib/new_relic/metric_parser.rb", "lib/new_relic/metric_spec.rb", "lib/new_relic/metrics.rb", "lib/new_relic/noticed_error.rb", "lib/new_relic/rack/metric_app.rb", "lib/new_relic/rack/newrelic.ru", "lib/new_relic/rack/newrelic.yml", "lib/new_relic/rack.rb", "lib/new_relic/recipes.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/all.rb", "lib/tasks/install.rake", "lib/tasks/tests.rake", "LICENSE", "README.md"]
+  s.files = ["bin/mongrel_rpm", "bin/newrelic_cmd", "cert/cacert.pem", "CHANGELOG", "init.rb", "install.rb", "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/active_merchant.rb", "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/error_instrumentation.rb", "lib/new_relic/agent/instrumentation/memcache.rb", "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/passenger_instrumentation.rb", "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/method_tracer.rb", "lib/new_relic/agent/patch_const_missing.rb", "lib/new_relic/agent/sampler.rb", "lib/new_relic/agent/samplers/cpu_sampler.rb", "lib/new_relic/agent/samplers/memory_sampler.rb", "lib/new_relic/agent/samplers/mongrel_sampler.rb", "lib/new_relic/agent/shim_agent.rb", "lib/new_relic/agent/stats_engine.rb", "lib/new_relic/agent/transaction_sampler.rb", "lib/new_relic/agent/worker_loop.rb", "lib/new_relic/agent.rb", "lib/new_relic/commands/deployments.rb", "lib/new_relic/commands/new_relic_commands.rb", "lib/new_relic/control/merb.rb", "lib/new_relic/control/rails.rb", "lib/new_relic/control/ruby.rb", "lib/new_relic/control.rb", "lib/new_relic/local_environment.rb", "lib/new_relic/merbtasks.rb", "lib/new_relic/metric_data.rb", "lib/new_relic/metric_parser/action_mailer.rb", "lib/new_relic/metric_parser/active_merchant.rb", "lib/new_relic/metric_parser/active_record.rb", "lib/new_relic/metric_parser/controller.rb", "lib/new_relic/metric_parser/controller_cpu.rb", "lib/new_relic/metric_parser/database.rb", "lib/new_relic/metric_parser/errors.rb", "lib/new_relic/metric_parser/mem_cache.rb", "lib/new_relic/metric_parser/view.rb", "lib/new_relic/metric_parser/web_service.rb", "lib/new_relic/metric_parser.rb", "lib/new_relic/metric_spec.rb", "lib/new_relic/metrics.rb", "lib/new_relic/noticed_error.rb", "lib/new_relic/rack/metric_app.rb", "lib/new_relic/rack/newrelic.ru", "lib/new_relic/rack/newrelic.yml", "lib/new_relic/rack.rb", "lib/new_relic/recipes.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/all.rb", "lib/tasks/install.rake", "lib/tasks/tests.rake", "LICENSE", "Manifest", "newrelic.yml", "Rakefile", "README.md", "recipes/newrelic.rb", "test/active_record_fixtures.rb", "test/config/newrelic.yml", "test/config/test_control.rb", "test/new_relic/agent/active_record_instrumentation_test.rb", "test/new_relic/agent/agent_test.rb", "test/new_relic/agent/agent_test_controller.rb", "test/new_relic/agent/classloader_patch_test.rb", "test/new_relic/agent/collection_helper_test.rb", "test/new_relic/agent/controller_test.rb", "test/new_relic/agent/dispatcher_instrumentation_test.rb", "test/new_relic/agent/error_collector_test.rb", "test/new_relic/agent/method_tracer_test.rb", "test/new_relic/agent/metric_data_test.rb", "test/new_relic/agent/mock_ar_connection.rb", "test/new_relic/agent/mock_scope_listener.rb", "test/new_relic/agent/stats_engine_test.rb", "test/new_relic/agent/testable_agent.rb", "test/new_relic/agent/transaction_sample_builder_test.rb", "test/new_relic/agent/transaction_sample_test.rb", "test/new_relic/agent/transaction_sampler_test.rb", "test/new_relic/agent/worker_loop_test.rb", "test/new_relic/control_test.rb", "test/new_relic/deployments_api_test.rb", "test/new_relic/environment_test.rb", "test/new_relic/metric_parser_test.rb", "test/new_relic/metric_spec_test.rb", "test/new_relic/samplers_test.rb", "test/new_relic/shim_agent_test.rb", "test/new_relic/stats_test.rb", "test/new_relic/version_number_test.rb", "test/test_helper.rb", "test/ui/newrelic_controller_test.rb", "test/ui/newrelic_helper_test.rb", "ui/controllers/newrelic_controller.rb", "ui/helpers/google_pie_chart.rb", "ui/helpers/newrelic_helper.rb", "ui/views/layouts/newrelic_default.rhtml", "ui/views/newrelic/_explain_plans.rhtml", "ui/views/newrelic/_sample.rhtml", "ui/views/newrelic/_segment.rhtml", "ui/views/newrelic/_segment_limit_message.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/arrow-close.png", "ui/views/newrelic/images/arrow-open.png", "ui/views/newrelic/images/blue_bar.gif", "ui/views/newrelic/images/file_icon.png", "ui/views/newrelic/images/gray_bar.gif", "ui/views/newrelic/images/new_relic_rpm_desktop.gif", "ui/views/newrelic/index.rhtml", "ui/views/newrelic/javascript/prototype-scriptaculous.js", "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/style.css", "ui/views/newrelic/threads.rhtml", "newrelic_rpm.gemspec"]
+  s.has_rdoc = true
+  s.homepage = %q{http://www.newrelic.com}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Newrelic_rpm", "--main", "README.md"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{newrelic}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{New Relic Ruby Performance Monitoring Agent}
+  s.test_files = ["test/config/test_control.rb", "test/new_relic/agent/active_record_instrumentation_test.rb", "test/new_relic/agent/agent_test.rb", "test/new_relic/agent/classloader_patch_test.rb", "test/new_relic/agent/collection_helper_test.rb", "test/new_relic/agent/controller_test.rb", "test/new_relic/agent/dispatcher_instrumentation_test.rb", "test/new_relic/agent/error_collector_test.rb", "test/new_relic/agent/method_tracer_test.rb", "test/new_relic/agent/metric_data_test.rb", "test/new_relic/agent/stats_engine_test.rb", "test/new_relic/agent/transaction_sample_builder_test.rb", "test/new_relic/agent/transaction_sample_test.rb", "test/new_relic/agent/transaction_sampler_test.rb", "test/new_relic/agent/worker_loop_test.rb", "test/new_relic/control_test.rb", "test/new_relic/deployments_api_test.rb", "test/new_relic/environment_test.rb", "test/new_relic/metric_parser_test.rb", "test/new_relic/metric_spec_test.rb", "test/new_relic/samplers_test.rb", "test/new_relic/shim_agent_test.rb", "test/new_relic/stats_test.rb", "test/new_relic/version_number_test.rb", "test/test_helper.rb", "test/ui/newrelic_controller_test.rb", "test/ui/newrelic_helper_test.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/test/active_record_fixtures.rb

@@ -0,0 +1,55 @@
+# Some test models
+# These will get created and dropped during the active record tests
+# Be sure and call setup and teardown
+module ActiveRecordFixtures
+  extend self
+  def setup
+    ActiveRecordFixtures::Order.setup
+    ActiveRecordFixtures::Shipment.setup
+  end
+  def teardown
+    ActiveRecordFixtures::Shipment.teardown
+    ActiveRecordFixtures::Order.teardown
+  end
+  class Order < ActiveRecord::Base
+    self.table_name = 'newrelic_test_orders'
+    has_and_belongs_to_many :shipments, :class_name => 'ActiveRecordFixtures::Shipment'
+    def self.setup
+      connection.create_table self.table_name, :force => true do |t|
+        t.column :name, :string
+      end
+    end
+    def self.add_delay
+      # Introduce a 500 ms delay into db operations on Orders
+      def connection.log_info *args
+        sleep 0.5
+        super *args
+      end
+    end
+    def self.teardown
+      connection.drop_table table_name
+      def connection.log_info *args
+        super *args
+      end
+    end
+  end
+  
+  class Shipment < ActiveRecord::Base
+    self.table_name = 'newrelic_test_shipment'
+    has_and_belongs_to_many :orders, :class_name => 'ActiveRecordFixtures::Order'
+    def self.setup
+      connection.create_table self.table_name, :force => true do |t|
+        t.column :order_id, :integer 
+      end
+      connection.create_table 'orders_shipments', :force => true do |t|
+        t.column :order_id, :integer 
+        t.column :shipment_id, :integer 
+      end
+    end
+    
+    def self.teardown
+      connection.drop_table 'orders_shipments'
+      connection.drop_table self.table_name
+    end
+  end    
+end

data/test/config/newrelic.yml

@@ -1,7 +1,11 @@
 # This is the config file loaded when running unit tests locally.
+common: &default_settings
+  transaction_tracer:
+    enabled: true
+    record_sql: raw
 
 test:
-  erb_value: <%= 'hey'*3 %>
+  <<: *default_settings
   host: localhost
   port: 3000
   log_level: debug
@@ -9,14 +13,28 @@ test:
   enabled: false
   developer: true
   monitor_daemons: false
+  disable_samplers: true
   api_host: 127.0.0.1
   api_port: 443
   message: '<%= generated_for_user %>'
   license_key: '<%= license_key %>'
+  agent_enabled: auto
+  apdex_t: 1.1
+
+  # Some fixtures for newrelic.yml parsing tests
+  erb_value: <%= 'hey'*3 %>
+  tval: true
+  tstring: 'true'
+  fval: false
+  yval: yes
+  sval: sure
+    
+  # checks for loading classes on the background thread
+  check_bg_loading: true
+
   transaction_tracer:
-    enabled: true
     record_sql: raw
-    transaction_threshold: 0.500
+    transaction_threshold: Apdex_f # case insensitive
     explain_threshold: 0.1
     explain_enabled: true
     stack_trace_threshold: 0.1