Permalink
Browse files

Get New Relic working again

  • Loading branch information...
1 parent 7ba23ed commit ec05e3df6a9b0c52a9e0cbbfa5a08baec71a217c Jose Fernandez committed May 14, 2012
Showing with 59 additions and 22,293 deletions.
  1. +2 −1 .gitignore
  2. +1 −0 Gemfile
  3. +2 −0 Gemfile.lock
  4. +9 −11 config.ru
  5. +45 −46 {vendor/plugins/newrelic_rpm → config}/newrelic.yml
  6. +0 −7 vendor/plugins/newrelic_rpm/.gitignore
  7. +0 −17 vendor/plugins/newrelic_rpm/.project
  8. +0 −411 vendor/plugins/newrelic_rpm/CHANGELOG
  9. +0 −37 vendor/plugins/newrelic_rpm/LICENSE
  10. +0 −138 vendor/plugins/newrelic_rpm/README.md
  11. +0 −87 vendor/plugins/newrelic_rpm/Rakefile
  12. +0 −33 vendor/plugins/newrelic_rpm/bin/mongrel_rpm
  13. +0 −4 vendor/plugins/newrelic_rpm/bin/newrelic_cmd
  14. +0 −34 vendor/plugins/newrelic_rpm/cert/cacert.pem
  15. +0 −35 vendor/plugins/newrelic_rpm/init.rb
  16. +0 −46 vendor/plugins/newrelic_rpm/install.rb
  17. +0 −364 vendor/plugins/newrelic_rpm/lib/new_relic/agent.rb
  18. +0 −649 vendor/plugins/newrelic_rpm/lib/new_relic/agent/agent.rb
  19. +0 −91 vendor/plugins/newrelic_rpm/lib/new_relic/agent/busy_calculator.rb
  20. +0 −13 vendor/plugins/newrelic_rpm/lib/new_relic/agent/chained_call.rb
  21. +0 −128 vendor/plugins/newrelic_rpm/lib/new_relic/agent/error_collector.rb
  22. +0 −18 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/active_merchant.rb
  23. +0 −92 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/active_record_instrumentation.rb
  24. +0 −8 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/authlogic.rb
  25. +0 −402 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/controller_instrumentation.rb
  26. +0 −90 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/data_mapper.rb
  27. +0 −22 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
  28. +0 −29 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/memcache.rb
  29. +0 −26 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/merb/controller.rb
  30. +0 −9 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/merb/errors.rb
  31. +0 −296 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/metric_frame.rb
  32. +0 −17 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/net.rb
  33. +0 −20 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
  34. +0 −112 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rack.rb
  35. +0 −59 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/action_controller.rb
  36. +0 −27 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/action_web_service.rb
  37. +0 −24 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/errors.rb
  38. +0 −45 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails3/action_controller.rb
  39. +0 −21 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails3/errors.rb
  40. +0 −46 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/sinatra.rb
  41. +0 −10 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb
  42. +0 −350 vendor/plugins/newrelic_rpm/lib/new_relic/agent/method_tracer.rb
  43. +0 −46 vendor/plugins/newrelic_rpm/lib/new_relic/agent/sampler.rb
  44. +0 −54 vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/cpu_sampler.rb
  45. +0 −37 vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb
  46. +0 −142 vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/memory_sampler.rb
  47. +0 −24 vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/object_sampler.rb
  48. +0 −21 vendor/plugins/newrelic_rpm/lib/new_relic/agent/shim_agent.rb
  49. +0 −24 vendor/plugins/newrelic_rpm/lib/new_relic/agent/stats_engine.rb
  50. +0 −118 vendor/plugins/newrelic_rpm/lib/new_relic/agent/stats_engine/metric_stats.rb
  51. +0 −80 vendor/plugins/newrelic_rpm/lib/new_relic/agent/stats_engine/samplers.rb
  52. +0 −149 vendor/plugins/newrelic_rpm/lib/new_relic/agent/stats_engine/transactions.rb
  53. +0 −315 vendor/plugins/newrelic_rpm/lib/new_relic/agent/transaction_sampler.rb
  54. +0 −80 vendor/plugins/newrelic_rpm/lib/new_relic/agent/worker_loop.rb
  55. +0 −68 vendor/plugins/newrelic_rpm/lib/new_relic/collection_helper.rb
  56. +0 −145 vendor/plugins/newrelic_rpm/lib/new_relic/commands/deployments.rb
  57. +0 −30 vendor/plugins/newrelic_rpm/lib/new_relic/commands/new_relic_commands.rb
  58. +0 −517 vendor/plugins/newrelic_rpm/lib/new_relic/control.rb
  59. +0 −13 vendor/plugins/newrelic_rpm/lib/new_relic/control/external.rb
  60. +0 −24 vendor/plugins/newrelic_rpm/lib/new_relic/control/merb.rb
  61. +0 −151 vendor/plugins/newrelic_rpm/lib/new_relic/control/rails.rb
  62. +0 −75 vendor/plugins/newrelic_rpm/lib/new_relic/control/rails3.rb
  63. +0 −36 vendor/plugins/newrelic_rpm/lib/new_relic/control/ruby.rb
  64. +0 −18 vendor/plugins/newrelic_rpm/lib/new_relic/control/sinatra.rb
  65. +0 −25 vendor/plugins/newrelic_rpm/lib/new_relic/delayed_job_injection.rb
  66. +0 −89 vendor/plugins/newrelic_rpm/lib/new_relic/histogram.rb
  67. +0 −332 vendor/plugins/newrelic_rpm/lib/new_relic/local_environment.rb
  68. +0 −6 vendor/plugins/newrelic_rpm/lib/new_relic/merbtasks.rb
  69. +0 −42 vendor/plugins/newrelic_rpm/lib/new_relic/metric_data.rb
  70. +0 −125 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser.rb
  71. +0 −9 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/action_mailer.rb
  72. +0 −26 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/active_merchant.rb
  73. +0 −25 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/active_record.rb
  74. +0 −54 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/controller.rb
  75. +0 −38 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/controller_cpu.rb
  76. +0 −6 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/errors.rb
  77. +0 −50 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/external.rb
  78. +0 −50 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/mem_cache.rb
  79. +0 −15 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/other_transaction.rb
  80. +0 −61 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/view.rb
  81. +0 −14 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/web_frontend.rb
  82. +0 −9 vendor/plugins/newrelic_rpm/lib/new_relic/metric_parser/web_service.rb
  83. +0 −67 vendor/plugins/newrelic_rpm/lib/new_relic/metric_spec.rb
  84. +0 −9 vendor/plugins/newrelic_rpm/lib/new_relic/metrics.rb
  85. +0 −24 vendor/plugins/newrelic_rpm/lib/new_relic/noticed_error.rb
  86. +0 −58 vendor/plugins/newrelic_rpm/lib/new_relic/rack/metric_app.rb
  87. +0 −25 vendor/plugins/newrelic_rpm/lib/new_relic/rack/mongrel_rpm.ru
  88. +0 −26 vendor/plugins/newrelic_rpm/lib/new_relic/rack/newrelic.yml
  89. +0 −5 vendor/plugins/newrelic_rpm/lib/new_relic/rack_app.rb
  90. +0 −82 vendor/plugins/newrelic_rpm/lib/new_relic/recipes.rb
  91. +0 −376 vendor/plugins/newrelic_rpm/lib/new_relic/stats.rb
  92. +0 −124 vendor/plugins/newrelic_rpm/lib/new_relic/transaction_analysis.rb
  93. +0 −654 vendor/plugins/newrelic_rpm/lib/new_relic/transaction_sample.rb
  94. +0 −55 vendor/plugins/newrelic_rpm/lib/new_relic/version.rb
  95. +0 −276 vendor/plugins/newrelic_rpm/lib/new_relic_api.rb
  96. +0 −40 vendor/plugins/newrelic_rpm/lib/newrelic_rpm.rb
  97. +0 −4 vendor/plugins/newrelic_rpm/lib/tasks/all.rb
  98. +0 −7 vendor/plugins/newrelic_rpm/lib/tasks/install.rake
  99. +0 −15 vendor/plugins/newrelic_rpm/lib/tasks/tests.rake
  100. +0 −6 vendor/plugins/newrelic_rpm/recipes/newrelic.rb
  101. +0 −55 vendor/plugins/newrelic_rpm/test/active_record_fixtures.rb
  102. +0 −43 vendor/plugins/newrelic_rpm/test/config/newrelic.yml
  103. +0 −38 vendor/plugins/newrelic_rpm/test/config/test_control.rb
  104. +0 −287 vendor/plugins/newrelic_rpm/test/new_relic/agent/active_record_instrumentation_test.rb
  105. +0 −274 vendor/plugins/newrelic_rpm/test/new_relic/agent/agent_controller_test.rb
  106. +0 −78 vendor/plugins/newrelic_rpm/test/new_relic/agent/agent_test_controller.rb
  107. +0 −79 vendor/plugins/newrelic_rpm/test/new_relic/agent/busy_calculator_test.rb
  108. +0 −125 vendor/plugins/newrelic_rpm/test/new_relic/agent/collection_helper_test.rb
  109. +0 −171 vendor/plugins/newrelic_rpm/test/new_relic/agent/error_collector_test.rb
  110. +0 −103 vendor/plugins/newrelic_rpm/test/new_relic/agent/memcache_instrumentation_test.rb
  111. +0 −340 vendor/plugins/newrelic_rpm/test/new_relic/agent/method_tracer_test.rb
  112. +0 −56 vendor/plugins/newrelic_rpm/test/new_relic/agent/metric_data_test.rb
  113. +0 −51 vendor/plugins/newrelic_rpm/test/new_relic/agent/metric_frame_test.rb
  114. +0 −40 vendor/plugins/newrelic_rpm/test/new_relic/agent/mock_ar_connection.rb
  115. +0 −23 vendor/plugins/newrelic_rpm/test/new_relic/agent/mock_scope_listener.rb
  116. +0 −77 vendor/plugins/newrelic_rpm/test/new_relic/agent/net_instrumentation_test.rb
  117. +0 −138 vendor/plugins/newrelic_rpm/test/new_relic/agent/rpm_agent_test.rb
  118. +0 −79 vendor/plugins/newrelic_rpm/test/new_relic/agent/stats_engine/metric_stats_test.rb
  119. +0 −72 vendor/plugins/newrelic_rpm/test/new_relic/agent/stats_engine/samplers_test.rb
  120. +0 −184 vendor/plugins/newrelic_rpm/test/new_relic/agent/stats_engine/stats_engine_test.rb
  121. +0 −193 vendor/plugins/newrelic_rpm/test/new_relic/agent/task_instrumentation_test.rb
  122. +0 −13 vendor/plugins/newrelic_rpm/test/new_relic/agent/testable_agent.rb
  123. +0 −195 vendor/plugins/newrelic_rpm/test/new_relic/agent/transaction_sample_builder_test.rb
  124. +0 −186 vendor/plugins/newrelic_rpm/test/new_relic/agent/transaction_sample_test.rb
  125. +0 −385 vendor/plugins/newrelic_rpm/test/new_relic/agent/transaction_sampler_test.rb
  126. +0 −60 vendor/plugins/newrelic_rpm/test/new_relic/agent/worker_loop_test.rb
  127. +0 −117 vendor/plugins/newrelic_rpm/test/new_relic/control_test.rb
  128. +0 −68 vendor/plugins/newrelic_rpm/test/new_relic/deployments_api_test.rb
  129. +0 −75 vendor/plugins/newrelic_rpm/test/new_relic/environment_test.rb
  130. +0 −172 vendor/plugins/newrelic_rpm/test/new_relic/metric_parser_test.rb
  131. +0 −177 vendor/plugins/newrelic_rpm/test/new_relic/metric_spec_test.rb
  132. +0 −9 vendor/plugins/newrelic_rpm/test/new_relic/shim_agent_test.rb
  133. +0 −311 vendor/plugins/newrelic_rpm/test/new_relic/stats_test.rb
  134. +0 −89 vendor/plugins/newrelic_rpm/test/new_relic/version_number_test.rb
  135. +0 −53 vendor/plugins/newrelic_rpm/test/test_helper.rb
  136. +0 −14 vendor/plugins/newrelic_rpm/test/ui/newrelic_controller_test.rb
  137. +0 −53 vendor/plugins/newrelic_rpm/test/ui/newrelic_helper_test.rb
  138. +0 −220 vendor/plugins/newrelic_rpm/ui/controllers/newrelic_controller.rb
  139. +0 −49 vendor/plugins/newrelic_rpm/ui/helpers/google_pie_chart.rb
  140. +0 −319 vendor/plugins/newrelic_rpm/ui/helpers/newrelic_helper.rb
  141. +0 −47 vendor/plugins/newrelic_rpm/ui/views/layouts/newrelic_default.rhtml
  142. +0 −27 vendor/plugins/newrelic_rpm/ui/views/newrelic/_explain_plans.rhtml
  143. +0 −19 vendor/plugins/newrelic_rpm/ui/views/newrelic/_sample.rhtml
  144. +0 −28 vendor/plugins/newrelic_rpm/ui/views/newrelic/_segment.rhtml
  145. +0 −1 vendor/plugins/newrelic_rpm/ui/views/newrelic/_segment_limit_message.rhtml
  146. +0 −14 vendor/plugins/newrelic_rpm/ui/views/newrelic/_segment_row.rhtml
  147. +0 −24 vendor/plugins/newrelic_rpm/ui/views/newrelic/_show_sample_detail.rhtml
  148. +0 −20 vendor/plugins/newrelic_rpm/ui/views/newrelic/_show_sample_sql.rhtml
  149. +0 −3 vendor/plugins/newrelic_rpm/ui/views/newrelic/_show_sample_summary.rhtml
  150. +0 −11 vendor/plugins/newrelic_rpm/ui/views/newrelic/_sql_row.rhtml
  151. +0 −30 vendor/plugins/newrelic_rpm/ui/views/newrelic/_stack_trace.rhtml
  152. +0 −12 vendor/plugins/newrelic_rpm/ui/views/newrelic/_table.rhtml
  153. +0 −42 vendor/plugins/newrelic_rpm/ui/views/newrelic/explain_sql.rhtml
  154. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/arrow-close.png
  155. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/arrow-open.png
  156. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/blue_bar.gif
  157. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/file_icon.png
  158. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/gray_bar.gif
  159. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/new-relic-rpm-desktop.gif
  160. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/new_relic_rpm_desktop.gif
  161. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/textmate.png
  162. +0 −57 vendor/plugins/newrelic_rpm/ui/views/newrelic/index.rhtml
  163. +0 −7,288 vendor/plugins/newrelic_rpm/ui/views/newrelic/javascript/prototype-scriptaculous.js
  164. +0 −107 vendor/plugins/newrelic_rpm/ui/views/newrelic/javascript/transaction_sample.js
  165. +0 −2 vendor/plugins/newrelic_rpm/ui/views/newrelic/sample_not_found.rhtml
  166. +0 −80 vendor/plugins/newrelic_rpm/ui/views/newrelic/show_sample.rhtml
  167. +0 −3 vendor/plugins/newrelic_rpm/ui/views/newrelic/show_source.rhtml
  168. +0 −484 vendor/plugins/newrelic_rpm/ui/views/newrelic/stylesheets/style.css
  169. +0 −52 vendor/plugins/newrelic_rpm/ui/views/newrelic/threads.rhtml
View
@@ -1 +1,2 @@
-.DS_Store
+.DS_Store
+log
View
@@ -5,3 +5,4 @@ gem 'builder'
gem 'rack-rewrite'
gem 'rdiscount'
gem 'toto', :git => "git://github.com/cloudhead/toto.git"
+gem 'newrelic_rpm'
View
@@ -11,6 +11,7 @@ GEM
remote: https://rubygems.org/
specs:
builder (3.0.0)
+ newrelic_rpm (3.3.4.1)
rack (1.4.1)
rack-rewrite (1.2.1)
rdiscount (1.6.8)
@@ -20,6 +21,7 @@ PLATFORMS
DEPENDENCIES
builder
+ newrelic_rpm
rack-rewrite
rdiscount
toto!
View
@@ -11,19 +11,17 @@ end
use Rack::Static, :urls => ['/css', '/js', '/images', '/favicon.ico', '/robots.txt'], :root => 'public'
use Rack::CommonLogger
+NewRelic::Agent.manual_start :app_name => 'Production Hacks', :agent_enabled => true
+
+require 'new_relic/agent/instrumentation/rack'
+module Toto
+ class Server
+ include NewRelic::Agent::Instrumentation::Rack
+ end
+end
+
if ENV['RACK_ENV'] == "development"
use Rack::ShowExceptions
-else
- #ENV['APP_ROOT'] ||= File.dirname(__FILE__)
- #$:.unshift "#{ENV['APP_ROOT']}/vendor/plugins/newrelic_rpm/lib"
- #require 'newrelic_rpm'
- #require 'new_relic/agent/instrumentation/rack'
-
- #module Toto
- #class Server
- #include NewRelic::Agent::Instrumentation::Rack
- #end
- #end
end
use Rack::Rewrite do
@@ -1,20 +1,22 @@
#
-# 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 New Relic Agent. New Relic monitors
+# Ruby, Java, .NET, PHP, and Python applications with deep visibility and low overhead.
+# For more information, visit www.newrelic.com.
#
-# <%= generated_for_user %>
+# Generated May 14, 2012
#
-# here are the settings that are common to all environments
+# This configuration file is custom generated for production-hacks Heroku
+
+# 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
+ # You must specify the license 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 %>'
+ # New Relic service.
+ license_key: '<%= NEW_RELIC_LICENSE_KEY %>'
- # Agent Enabled (Rails Only)
+ # Agent Enabled (Ruby/Rails Only)
# 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
@@ -25,16 +27,16 @@ common: &default_settings
# 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. If you want
+ # up in New Relic. New Relic will then auto-map instances of your application
+ # into a New Relic "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
+ # "All UI" then specify a semicolon-separated list of up to three
# distinct names. If you comment this out, it defaults to the
# capitalized RAILS_ENV (i.e., Production, Staging, etc)
- app_name: My Application
+ app_name: Production Hacks
# When "true", the agent collects performance data about your
- # application and reports this data to the NewRelic RPM service at
+ # application and reports this data to the New Relic service at
# newrelic.com. This global switch is normally overridden for each
# environment below. (formerly called 'enabled')
monitor_mode: true
@@ -48,7 +50,7 @@ common: &default_settings
# log level here.
log_level: info
- # The newrelic agent communicates with the RPM service via http by
+ # The newrelic agent communicates with the New Relic 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
@@ -63,7 +65,7 @@ common: &default_settings
# 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
+ # New Relic 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
@@ -76,11 +78,10 @@ common: &default_settings
# 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
-
+ # http://newrelic.com/docs/general/apdex
apdex_t: 0.5
- # Proxy settings for connecting to the RPM server.
+ # Proxy settings for connecting to the New Relic server.
#
# If a proxy is used, the host setting is required. Other settings
# are optional. Default port is 8080.
@@ -90,7 +91,6 @@ common: &default_settings
# proxy_user:
# proxy_pass:
-
# Tells transaction tracer and error collector (when enabled)
# whether or not to capture HTTP params. When true, frameworks can
# exclude HTTP parameters from being captured.
@@ -100,36 +100,35 @@ common: &default_settings
# ex: ignored_params: credit_card, ssn, password
capture_params: false
-
# Transaction tracer captures deep information about slow
- # transactions and sends this to the RPM service once a
+ # transactions and sends this to the New Relic 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.
+ # turn it off. This feature is only available at the Professional
+ # product level.
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",
+ # New Relic. 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
+ # 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
+ # then capture and send to New Relic the current stack trace. This is
+ # helpful for pinpointing where long SQL calls originate from.
stack_trace_threshold: 0.500
# Determines whether the agent will capture query plans for slow
@@ -142,26 +141,25 @@ common: &default_settings
# explain_threshold: 0.5
# Error collector captures information about uncaught exceptions and
- # sends them to RPM for viewing
+ # sends them to New Relic 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
+ # it off. This feature is only available at the Professional
+ # product level.
enabled: true
# Rails Only - 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. Default is to ignore routing errors
+ # To stop specific errors from reporting to New Relic, set this property
+ # to comma-separated values. Default is to ignore routing errors,
# which are how 404's get triggered.
- #
ignore_errors: ActionController::RoutingError
- # (Advanced) Uncomment this to ensure the cpu and memory samplers
+ # (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
@@ -173,32 +171,32 @@ common: &default_settings
# disable_activerecord_instrumentation: true
# disable_memcache_instrumentation: true
# disable_dj: true
-
+
# Certain types of instrumentation such as GC stats will not work if
# you are running multi-threaded. Please let us know.
# multi_threaded = false
# Application Environments
# ------------------------------------------
-# Environment specific settings are in this section.
-# For Rails applications, RAILS_ENV is used to determine the environment
+# Environment-specific settings are in this section.
+# For Rails applications, RAILS_ENV is used to determine the environment.
# For Java applications, pass -Dnewrelic.environment <environment> to set
-# the environment
+# the environment.
# NOTE if your application has other named environments, you should
-# provide newrelic conifguration settings for these enviromnents here.
+# provide newrelic configuration settings for these environments here.
development:
<<: *default_settings
- # Turn off communication to RPM service in development mode (also
+ # Turn off communication to New Relic service in development mode (also
# 'enabled').
# NOTE: for initial evaluation purposes, you may want to temporarily
- # turn the agent on in development mode.
+ # turn agent communication on in development mode.
monitor_mode: false
# Rails Only - 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.
+ # executed since starting the app server.
# NOTE: There is substantial overhead when running in developer mode.
# Do not use for production or load testing.
developer_mode: true
@@ -212,10 +210,10 @@ test:
# unit, functional or integration tests or the like.
monitor_mode: false
-# Turn on the agent in production for 24x7 monitoring. NewRelic
+# Turn on the agent in production for 24x7 monitoring. New Relic
# 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.
+# transaction, so you can leave this on all the time without
+# incurring any user-visible performance degradation.
production:
<<: *default_settings
monitor_mode: true
@@ -227,3 +225,4 @@ staging:
<<: *default_settings
monitor_mode: true
app_name: My Application (Staging)
+
@@ -1,7 +0,0 @@
-.DS\_Store
-.svn/
-*~
-pkg/
-*.gem
-!rails
-Manifest*
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>New Relic Agent</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.rubypeople.rdt.core.rubybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.rubypeople.rdt.core.rubynature</nature>
- </natures>
-</projectDescription>
Oops, something went wrong.

0 comments on commit ec05e3d

Please sign in to comment.