Permalink
Browse files

Merge branch 'master' of git@github.com:redinger/enki

Conflicts:
	config/.gitignore
	vendor/plugins/rpm/Rakefile
	vendor/plugins/rpm/init.rb
	vendor/plugins/rpm/lib/new_relic/agent.rb
	vendor/plugins/rpm/lib/new_relic/agent/agent.rb
	vendor/plugins/rpm/lib/new_relic/agent/collection_helper.rb
	vendor/plugins/rpm/lib/new_relic/agent/error_collector.rb
	vendor/plugins/rpm/lib/new_relic/agent/instrumentation/active_record_instrumentation.rb
	vendor/plugins/rpm/lib/new_relic/agent/instrumentation/controller_instrumentation.rb
	vendor/plugins/rpm/lib/new_relic/agent/instrumentation/dispatcher_instrumentation.rb
	vendor/plugins/rpm/lib/new_relic/agent/instrumentation/merb/dispatcher.rb
	vendor/plugins/rpm/lib/new_relic/agent/instrumentation/merb/errors.rb
	vendor/plugins/rpm/lib/new_relic/agent/instrumentation/rails/action_controller.rb
	vendor/plugins/rpm/lib/new_relic/agent/instrumentation/rails/dispatcher.rb
	vendor/plugins/rpm/lib/new_relic/agent/instrumentation/rails/errors.rb
	vendor/plugins/rpm/lib/new_relic/agent/method_tracer.rb
	vendor/plugins/rpm/lib/new_relic/agent/patch_const_missing.rb
	vendor/plugins/rpm/lib/new_relic/agent/stats_engine.rb
	vendor/plugins/rpm/lib/new_relic/agent/transaction_sampler.rb
	vendor/plugins/rpm/lib/new_relic/agent/worker_loop.rb
	vendor/plugins/rpm/lib/new_relic/commands/deployments.rb
	vendor/plugins/rpm/lib/new_relic/control/ruby.rb
	vendor/plugins/rpm/lib/new_relic/local_environment.rb
	vendor/plugins/rpm/lib/new_relic/noticed_error.rb
	vendor/plugins/rpm/lib/new_relic/recipes.rb
	vendor/plugins/rpm/lib/new_relic/stats.rb
	vendor/plugins/rpm/lib/new_relic/transaction_analysis.rb
	vendor/plugins/rpm/lib/new_relic/transaction_sample.rb
	vendor/plugins/rpm/lib/new_relic/version.rb
	vendor/plugins/rpm/lib/new_relic_api.rb
	vendor/plugins/rpm/lib/newrelic_rpm.rb
	vendor/plugins/rpm/newrelic.yml
	vendor/plugins/rpm/newrelic_rpm.gemspec
	vendor/plugins/rpm/test/config/newrelic.yml
	vendor/plugins/rpm/test/new_relic/agent/agent_test_controller.rb
	vendor/plugins/rpm/test/new_relic/agent/collection_helper_test.rb
	vendor/plugins/rpm/test/new_relic/agent/controller_test.rb
	vendor/plugins/rpm/test/new_relic/agent/transaction_sample_test.rb
	vendor/plugins/rpm/test/new_relic/agent/worker_loop_test.rb
	vendor/plugins/rpm/test/new_relic/metric_spec_test.rb
	vendor/plugins/rpm/test/test_helper.rb
	vendor/plugins/rpm/test/ui/newrelic_helper_test.rb
	vendor/plugins/rpm/ui/controllers/newrelic_controller.rb
	vendor/plugins/rpm/ui/helpers/newrelic_helper.rb
	vendor/plugins/rpm/ui/views/layouts/newrelic_default.rhtml
	vendor/plugins/rpm/ui/views/newrelic/_sample.rhtml
	vendor/plugins/rpm/ui/views/newrelic/_segment.rhtml
	vendor/plugins/rpm/ui/views/newrelic/_segment_row.rhtml
	vendor/plugins/rpm/ui/views/newrelic/_show_sample_detail.rhtml
	vendor/plugins/rpm/ui/views/newrelic/_show_sample_sql.rhtml
	vendor/plugins/rpm/ui/views/newrelic/explain_sql.rhtml
	vendor/plugins/rpm/ui/views/newrelic/index.rhtml
	vendor/plugins/rpm/ui/views/newrelic/show_sample.rhtml
	vendor/plugins/rpm/ui/views/newrelic/stylesheets/style.css
  • Loading branch information...
root
root committed May 25, 2009
2 parents c5b4c96 + 5e29f7f commit 31ef043e415ca75d77f5cfe450debf19167038ec
Showing with 12,796 additions and 4,378 deletions.
  1. +4 −0 config/.gitignore
  2. +0 −37 vendor/plugins/newrelic_rpm/LICENSE
  3. +0 −136 vendor/plugins/newrelic_rpm/README
  4. +0 −4 vendor/plugins/newrelic_rpm/bin/newrelic_cmd
  5. +0 −30 vendor/plugins/newrelic_rpm/init.rb
  6. +0 −37 vendor/plugins/newrelic_rpm/install.rb
  7. +0 −29 vendor/plugins/newrelic_rpm/lib/new_relic/agent.rb
  8. +0 −13 vendor/plugins/newrelic_rpm/lib/new_relic/agent/chained_call.rb
  9. +0 −18 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/active_merchant.rb
  10. +0 −95 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/active_record_instrumentation.rb
  11. +0 −90 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/data_mapper.rb
  12. +0 −105 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/dispatcher_instrumentation.rb
  13. +0 −18 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/memcache.rb
  14. +0 −17 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/merb/controller.rb
  15. +0 −27 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/action_web_service.rb
  16. +0 −30 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/dispatcher.rb
  17. +0 −6 vendor/plugins/newrelic_rpm/lib/new_relic/agent/instrumentation/rails/rails.rb
  18. +0 −171 vendor/plugins/newrelic_rpm/lib/new_relic/agent/method_tracer.rb
  19. +0 −29 vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/cpu.rb
  20. +0 −55 vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/memory.rb
  21. +0 −26 vendor/plugins/newrelic_rpm/lib/new_relic/agent/samplers/mongrel.rb
  22. +0 −40 vendor/plugins/newrelic_rpm/lib/new_relic/agent/synchronize.rb
  23. +0 −30 vendor/plugins/newrelic_rpm/lib/new_relic/commands/new_relic_commands.rb
  24. +0 −278 vendor/plugins/newrelic_rpm/lib/new_relic/config.rb
  25. +0 −35 vendor/plugins/newrelic_rpm/lib/new_relic/config/merb.rb
  26. +0 −119 vendor/plugins/newrelic_rpm/lib/new_relic/config/rails.rb
  27. +0 −135 vendor/plugins/newrelic_rpm/lib/new_relic/local_environment.rb
  28. +0 −6 vendor/plugins/newrelic_rpm/lib/new_relic/merbtasks.rb
  29. +0 −26 vendor/plugins/newrelic_rpm/lib/new_relic/metric_data.rb
  30. +0 −39 vendor/plugins/newrelic_rpm/lib/new_relic/metric_spec.rb
  31. +0 −7 vendor/plugins/newrelic_rpm/lib/new_relic/metrics.rb
  32. +0 −95 vendor/plugins/newrelic_rpm/lib/new_relic/shim_agent.rb
  33. +0 −27 vendor/plugins/newrelic_rpm/lib/newrelic_rpm.rb
  34. +0 −17 vendor/plugins/newrelic_rpm/lib/tasks/agent_tests.rake
  35. +0 −4 vendor/plugins/newrelic_rpm/lib/tasks/all.rb
  36. +0 −7 vendor/plugins/newrelic_rpm/lib/tasks/install.rake
  37. +0 −9 vendor/plugins/newrelic_rpm/newrelic_spec.rb
  38. +0 −6 vendor/plugins/newrelic_rpm/recipes/newrelic.rb
  39. +0 −1 vendor/plugins/newrelic_rpm/spec_helper.rb
  40. +0 −40 vendor/plugins/newrelic_rpm/test/new_relic/agent/mock_ar_connection.rb
  41. +0 −23 vendor/plugins/newrelic_rpm/test/new_relic/agent/mock_scope_listener.rb
  42. +0 −15 vendor/plugins/newrelic_rpm/test/new_relic/agent/model_fixture.rb
  43. +0 −90 vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_active_record.rb
  44. +0 −148 vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_agent.rb
  45. +0 −52 vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_dispatcher_instrumentation.rb
  46. +0 −127 vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_error_collector.rb
  47. +0 −218 vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_stats_engine.rb
  48. +0 −37 vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_synchronize.rb
  49. +0 −302 vendor/plugins/newrelic_rpm/test/new_relic/agent/tc_transaction_sampler.rb
  50. +0 −13 vendor/plugins/newrelic_rpm/test/new_relic/agent/testable_agent.rb
  51. +0 −36 vendor/plugins/newrelic_rpm/test/new_relic/tc_config.rb
  52. +0 −94 vendor/plugins/newrelic_rpm/test/new_relic/tc_environment.rb
  53. +0 −141 vendor/plugins/newrelic_rpm/test/new_relic/tc_stats.rb
  54. +0 −55 vendor/plugins/newrelic_rpm/ui/helpers/google_pie_chart.rb
  55. +0 −27 vendor/plugins/newrelic_rpm/ui/views/newrelic/_explain_plans.rhtml
  56. +0 −14 vendor/plugins/newrelic_rpm/ui/views/newrelic/_segment_row.rhtml
  57. +0 −3 vendor/plugins/newrelic_rpm/ui/views/newrelic/_show_sample_summary.rhtml
  58. +0 −11 vendor/plugins/newrelic_rpm/ui/views/newrelic/_sql_row.rhtml
  59. +0 −30 vendor/plugins/newrelic_rpm/ui/views/newrelic/_stack_trace.rhtml
  60. +0 −12 vendor/plugins/newrelic_rpm/ui/views/newrelic/_table.rhtml
  61. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/arrow-close.png
  62. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/arrow-open.png
  63. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/blue_bar.gif
  64. BIN vendor/plugins/newrelic_rpm/ui/views/newrelic/images/gray_bar.gif
  65. +0 −107 vendor/plugins/newrelic_rpm/ui/views/newrelic/javascript/transaction_sample.js
  66. +0 −2 vendor/plugins/newrelic_rpm/ui/views/newrelic/sample_not_found.rhtml
  67. +0 −3 vendor/plugins/newrelic_rpm/ui/views/newrelic/show_source.rhtml
  68. +85 −29 vendor/plugins/{newrelic_rpm/lib/new_relic/version.rb → rpm/CHANGELOG}
  69. +3 −3 vendor/plugins/{newrelic_rpm → rpm}/Rakefile
  70. +33 −0 vendor/plugins/rpm/bin/mongrel_rpm
  71. +34 −0 vendor/plugins/rpm/cert/cacert.pem
  72. +38 −0 vendor/plugins/rpm/init.rb
  73. +201 −0 vendor/plugins/rpm/lib/new_relic/agent.rb
  74. +157 −341 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/agent.rb
  75. +11 −24 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/collection_helper.rb
  76. +29 −15 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/error_collector.rb
  77. +82 −0 vendor/plugins/rpm/lib/new_relic/agent/instrumentation/active_record_instrumentation.rb
  78. +56 −30 ...or/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/instrumentation/controller_instrumentation.rb
  79. +130 −0 vendor/plugins/rpm/lib/new_relic/agent/instrumentation/dispatcher_instrumentation.rb
  80. +5 −7 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/instrumentation/merb/dispatcher.rb
  81. +1 −1 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/instrumentation/merb/errors.rb
  82. +29 −3 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/instrumentation/rails/action_controller.rb
  83. +38 −0 vendor/plugins/rpm/lib/new_relic/agent/instrumentation/rails/dispatcher.rb
  84. +2 −3 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/instrumentation/rails/errors.rb
  85. +191 −0 vendor/plugins/rpm/lib/new_relic/agent/method_tracer.rb
  86. +46 −26 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/patch_const_missing.rb
  87. +12 −0 vendor/plugins/rpm/lib/new_relic/agent/sampler.rb
  88. +42 −0 vendor/plugins/rpm/lib/new_relic/agent/samplers/cpu_sampler.rb
  89. +126 −0 vendor/plugins/rpm/lib/new_relic/agent/samplers/memory_sampler.rb
  90. +22 −0 vendor/plugins/rpm/lib/new_relic/agent/samplers/mongrel_sampler.rb
  91. +11 −0 vendor/plugins/rpm/lib/new_relic/agent/shim_agent.rb
  92. +85 −45 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/stats_engine.rb
  93. +72 −38 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/transaction_sampler.rb
  94. +8 −18 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/agent/worker_loop.rb
  95. +9 −9 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/commands/deployments.rb
  96. +388 −0 vendor/plugins/rpm/lib/new_relic/control.rb
  97. +27 −0 vendor/plugins/rpm/lib/new_relic/control/merb.rb
  98. +139 −0 vendor/plugins/rpm/lib/new_relic/control/rails.rb
  99. +9 −2 vendor/plugins/{newrelic_rpm/lib/new_relic/config → rpm/lib/new_relic/control}/ruby.rb
  100. +259 −0 vendor/plugins/rpm/lib/new_relic/local_environment.rb
  101. +102 −0 vendor/plugins/rpm/lib/new_relic/metric_parser.rb
  102. +25 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/active_merchant.rb
  103. +11 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/active_record.rb
  104. +51 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/controller.rb
  105. +38 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/controller_cpu.rb
  106. +23 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/database.rb
  107. +6 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/errors.rb
  108. +12 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/mem_cache.rb
  109. +61 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/view.rb
  110. +9 −0 vendor/plugins/rpm/lib/new_relic/metric_parser/web_service.rb
  111. +5 −1 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/noticed_error.rb
  112. +5 −0 vendor/plugins/rpm/lib/new_relic/rack.rb
  113. +57 −0 vendor/plugins/rpm/lib/new_relic/rack/metric_app.rb
  114. +25 −0 vendor/plugins/rpm/lib/new_relic/rack/newrelic.ru
  115. +25 −0 vendor/plugins/rpm/lib/new_relic/rack/newrelic.yml
  116. +10 −3 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/recipes.rb
  117. +113 −139 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/stats.rb
  118. +7 −8 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/transaction_analysis.rb
  119. +87 −11 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic/transaction_sample.rb
  120. +46 −0 vendor/plugins/rpm/lib/new_relic/version.rb
  121. +7 −6 vendor/plugins/{newrelic_rpm → rpm}/lib/new_relic_api.rb
  122. +30 −0 vendor/plugins/rpm/lib/newrelic_rpm.rb
  123. +13 −0 vendor/plugins/rpm/lib/tasks/tests.rake
  124. +33 −12 vendor/plugins/{newrelic_rpm → rpm}/newrelic.yml
  125. +32 −0 vendor/plugins/rpm/newrelic_rpm.gemspec
  126. +55 −0 vendor/plugins/rpm/test/active_record_fixtures.rb
  127. +16 −2 vendor/plugins/{newrelic_rpm → rpm}/test/config/newrelic.yml
  128. +14 −10 vendor/plugins/{newrelic_rpm/test/config/test_config.rb → rpm/test/config/test_control.rb}
  129. +187 −0 vendor/plugins/rpm/test/new_relic/agent/active_record_instrumentation_test.rb
  130. +104 −0 vendor/plugins/rpm/test/new_relic/agent/agent_test.rb
  131. +8 −0 vendor/plugins/{newrelic_rpm → rpm}/test/new_relic/agent/agent_test_controller.rb
  132. +56 −0 vendor/plugins/rpm/test/new_relic/agent/classloader_patch_test.rb
  133. +28 −23 ...est/new_relic/agent/tc_collection_helper.rb → rpm/test/new_relic/agent/collection_helper_test.rb}
  134. +12 −11 ...newrelic_rpm/test/new_relic/agent/tc_controller.rb → rpm/test/new_relic/agent/controller_test.rb}
  135. +70 −0 vendor/plugins/rpm/test/new_relic/agent/dispatcher_instrumentation_test.rb
  136. +155 −0 vendor/plugins/rpm/test/new_relic/agent/error_collector_test.rb
  137. +6 −12 ...ic_rpm/test/new_relic/agent/tc_method_tracer.rb → rpm/test/new_relic/agent/method_tracer_test.rb}
  138. +260 −0 vendor/plugins/rpm/test/new_relic/agent/stats_engine_test.rb
  139. +2 −2 ...t/tc_transaction_sample_builder.rb → rpm/test/new_relic/agent/transaction_sample_builder_test.rb}
  140. +9 −13 ...t/new_relic/agent/tc_transaction_sample.rb → rpm/test/new_relic/agent/transaction_sample_test.rb}
  141. +317 −0 vendor/plugins/rpm/test/new_relic/agent/transaction_sampler_test.rb
  142. +1 −1 ...wrelic_rpm/test/new_relic/agent/tc_worker_loop.rb → rpm/test/new_relic/agent/worker_loop_test.rb}
  143. +75 −0 vendor/plugins/rpm/test/new_relic/control_test.rb
  144. +8 −4 .../{newrelic_rpm/test/new_relic/tc_deployments_api.rb → rpm/test/new_relic/deployments_api_test.rb}
  145. +75 −0 vendor/plugins/rpm/test/new_relic/environment_test.rb
  146. +166 −0 vendor/plugins/rpm/test/new_relic/metric_parser_test.rb
  147. +28 −1 .../plugins/{newrelic_rpm/test/new_relic/tc_metric_spec.rb → rpm/test/new_relic/metric_spec_test.rb}
  148. +69 −0 vendor/plugins/rpm/test/new_relic/samplers_test.rb
  149. +1 −1 ...or/plugins/{newrelic_rpm/test/new_relic/tc_shim_agent.rb → rpm/test/new_relic/shim_agent_test.rb}
  150. +291 −0 vendor/plugins/rpm/test/new_relic/stats_test.rb
  151. +38 −0 vendor/plugins/rpm/test/new_relic/version_number_test.rb
  152. +4 −11 vendor/plugins/{newrelic_rpm → rpm}/test/test_helper.rb
  153. +14 −0 vendor/plugins/rpm/test/ui/newrelic_controller_test.rb
  154. +16 −7 vendor/plugins/{newrelic_rpm/test/ui/tc_newrelic_helper.rb → rpm/test/ui/newrelic_helper_test.rb}
  155. +16 −6 vendor/plugins/{newrelic_rpm → rpm}/ui/controllers/newrelic_controller.rb
  156. +44 −15 vendor/plugins/{newrelic_rpm → rpm}/ui/helpers/newrelic_helper.rb
  157. +5 −7 vendor/plugins/{newrelic_rpm → rpm}/ui/views/layouts/newrelic_default.rhtml
  158. +5 −2 vendor/plugins/{newrelic_rpm → rpm}/ui/views/newrelic/_sample.rhtml
  159. +1 −1 vendor/plugins/{newrelic_rpm → rpm}/ui/views/newrelic/_segment.rhtml
  160. +1 −0 vendor/plugins/rpm/ui/views/newrelic/_segment_limit_message.rhtml
  161. +14 −0 vendor/plugins/rpm/ui/views/newrelic/_segment_row.rhtml
  162. +3 −1 vendor/plugins/{newrelic_rpm → rpm}/ui/views/newrelic/_show_sample_detail.rhtml
  163. +2 −1 vendor/plugins/{newrelic_rpm → rpm}/ui/views/newrelic/_show_sample_sql.rhtml
  164. +2 −5 vendor/plugins/{newrelic_rpm → rpm}/ui/views/newrelic/explain_sql.rhtml
  165. BIN vendor/plugins/rpm/ui/views/newrelic/images/file_icon.png
  166. BIN vendor/plugins/rpm/ui/views/newrelic/images/new_relic_rpm_desktop.gif
  167. +21 −13 vendor/plugins/{newrelic_rpm → rpm}/ui/views/newrelic/index.rhtml
  168. +7,288 −0 vendor/plugins/rpm/ui/views/newrelic/javascript/prototype-scriptaculous.js
  169. +1 −1 vendor/plugins/{newrelic_rpm → rpm}/ui/views/newrelic/show_sample.rhtml
  170. +39 −0 vendor/plugins/{newrelic_rpm → rpm}/ui/views/newrelic/stylesheets/style.css
  171. +52 −0 vendor/plugins/rpm/ui/views/newrelic/threads.rhtml
View
@@ -1,3 +1,7 @@
database.yml
defensio.yml
+<<<<<<< HEAD:config/.gitignore
newrelic.yml
+=======
+newrelic.yml
+>>>>>>> 5e29f7f21b667ccc8f30e0e679fbe8f4033f38d5:config/.gitignore
@@ -1,37 +0,0 @@
-Copyright (c) 2008 New Relic, Inc. All rights reserved.
-
-Certain inventions disclosed in this file may be claimed within
-patents owned or patent applications filed by New Relic, Inc. or third
-parties.
-
-Subject to the terms of this notice, New Relic grants you a
-nonexclusive, nontransferable license, without the right to
-sublicense, to (a) install and execute one copy of these files on any
-number of workstations owned or controlled by you and (b) distribute
-verbatim copies of these files to third parties. As a condition to the
-foregoing grant, you must provide this notice along with each copy you
-distribute and you must not remove, alter, or obscure this notice. All
-other use, reproduction, modification, distribution, or other
-exploitation of these files is strictly prohibited, except as may be set
-forth in a separate written license agreement between you and New
-Relic. The terms of any such license agreement will control over this
-notice. The license stated above will be automatically terminated and
-revoked if you exceed its scope or violate any of the terms of this
-notice.
-
-This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of New Relic, except as
-required for reasonable and customary use in describing the origin of
-this file and reproducing the content of this notice. You may not
-mark or brand this file with any trade name, trademarks, service
-marks, or product names other than the original brand (if any)
-provided by New Relic.
-
-Unless otherwise expressly agreed by New Relic in a separate written
-license agreement, these files are provided AS IS, WITHOUT WARRANTY OF
-ANY KIND, including without any implied warranties of MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE, or NON-INFRINGEMENT. As a
-condition to your use of these files, you are solely responsible for
-such use. New Relic will have no liability to you for direct,
-indirect, consequential, incidental, special, or punitive damages or
-for lost profits or data.
@@ -1,136 +0,0 @@
-= New Relic RPM
-
-* http://www.newrelic.com
-
-New Relic RPM is a Ruby performance management system, developed by
-New Relic, Inc. RPM provides you with deep information about the
-performance of your Ruby on Rails or Merb application as it runs in
-production. The New Relic Agent is distributed as a either a Rails
-plugin or a Gem, both hosted on RubyForge.
-
-The New Relic Agent runs in one of two modes:
-
-* Developer Mode : Adds a web interface mapped to /newrelic to your
- application for showing detailed performance metrics on a page by
- page basis.
-
-* Production Mode : Low overhead instrumentation that captures
- detailed information on your application running in production and
- transmits them to rpm.newrelic.com where you can monitor them in
- real time.
-
-=== Developer Mode
-
-Developer mode is on by default when you run your application in the
-development environment (but not when it runs in other environments.)
-When running in developer mode, RPM will track the performance of
-every http request serviced by your application, and store in memory
-this information for the last 100 http transactions.
-
-When running in Developer Mode, the RPM will also add a few pages to
-your application that allow you to analyze this performance
-information. (Don't worry - those pages are not added to your
-application's routes when you run in production mode.)
-
-To view this performance information, including detailed SQL statement
-analysis, open '/newrelic' in your web application. For instance if
-you are running mongrel or thin on port 3000, enter the following into
-your browser:
-
-http://localhost:3000/newrelic
-
-=== Production Mode
-
-To monitor your applications in production, create an account at
-http://newrelic.com/get-RPM.html
-
-When your application runs in the production environment, the New
-Relic agent runs in production mode. It connects to the New Relic RPM
-service and sends deep performance data to the RPM service for your
-analysis. To view this data, login to http://rpm.newrelic.com.
-
-NOTE: You must have a valid account and license key to view this data
-online. When you sign up for an account at www.newrelic.com, you will
-be provided with a license key, as well as a default configuration
-file for New Relic RPM. You can either paste your license key into
-your existing configuration file, config/newrelic.yml, or you can
-replace that config file with the one included in your welcome email.
-
-== Installation
-
-RPM requires an agent be installed in the application as either a
-Rails plug-in or a gem. Both are available on RubyForge--instructions
-below.
-
-=== Git your RPM on!
-
-The agent is also available on Github under newrelic/rpm. As of March,
-2009, we keep the latest release on the master, the edge on a working
-branch, and previous releases with tags. Fork away!
-
-=== Requirements:
-
-Ruby 1.8.6
-Rails 1.2.6 or above
-Merb 1.0 or above
-
-=== Rails Plug-In Installation
-
- script/plugin install http://newrelic.rubyforge.org/svn/newrelic_rpm
-
-=== Gem Installation
-
- sudo gem install newrelic_rpm
-
-For Rails, edit environment.rb and add to the initalizer block:
-
- config.gem "newrelic_rpm"
-
-The Developer Mode is unavailable when using the gem on Rails versions
-prior to 2.0.
-
-== Merb Support
-
-To monitor a merb app install the newrelic_rpm gem and add
-
- dependency 'newrelic_rpm'
-
-to your init.rb file.
-
-Current features implemented:
-
- * Standard monitoring, overview pages
- * Error capturing
- * Full Active Record instrumentation, including SQL explains
- * Very limited Data Mapper instrumentation
- * Transaction Traces are implemented but will not be very useful
- with Data Mapper until more work is done with the Data Mapper
- instrumentation
-
-Still under development:
-
- * Developer Mode
- * Data Mapper bindings
-
-Also some of the instrumentation has been implemented with method
-chaining, a mechanism that truly goes against the merb way. This was
-necessary in some cases where the API’s were not yet available or
-understood well enough to use. Converting these to hook methods using
-the Merb public API is a work in progress.
-
-== Support
-
-Reach out to us--and to fellow RPM users--at
-http://support.newrelic.com. There you'll find documentation, FAQs,
-and forums where you can submit suggestions and discuss RPM with New
-Relic staff and other users.
-
-Find a bug? E-mail support@newrelic.com, or post it to
-support.newrelic.com.
-
-For other support channels, see http://www.newrelic.com/support.
-
-Thank you, and may your application scale to infinity plus one.
-
-Lew Cirne, Founder and CEO
-New Relic, Inc.
@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-# executes one of the commands in the new_relic/commands directory
-# pass the name of the command as an argument
-require File.dirname(__FILE__) + '/../lib/new_relic/commands/new_relic_commands'
@@ -1,30 +0,0 @@
-# This is the initialization for the RPM Rails plugin
-require 'new_relic/config'
-
-# If you are having problems seeing data, be sure and check the
-# newrelic_agent log files.
-#
-# If you can't find any log files and you don't see anything in your
-# application log files, try uncommenting these lines to verify
-# the plugin is being loaded, then contact support@newrelic.com
-# if you are unable to resolve the issue.
-# STDOUT.puts "RPM detected environment: #{NewRelic::Config.instance.local_env}, RAILS_ENV: #{RAILS_ENV}"
-
-# Initializer for the NewRelic Agent
-
-begin
- # JRuby's glassfish plugin is trying to run the Initializer twice,
- # which isn't a good thing so we ignore subsequent invocations here.
- if ! defined?(::NEWRELIC_STARTED)
- ::NEWRELIC_STARTED = "#{caller.join("\n")}"
- NewRelic::Config.instance.start_plugin (defined?(config) ? config : nil)
- else
- NewRelic::Config.instance.log.debug "Attempt to initialize the plugin twice!"
- NewRelic::Config.instance.log.debug "Original call: \n#{::NEWRELIC_STARTED}"
- NewRelic::Config.instance.log.debug "Here we are now: \n#{caller.join("\n")}"
- end
-rescue => e
- NewRelic::Config.instance.log! "Error initializing New Relic plugin (#{e})", :error
- NewRelic::Config.instance.log! e.backtrace.join("\n"), :error
- NewRelic::Config.instance.log! "Agent is disabled."
-end
@@ -1,37 +0,0 @@
-require 'ftools'
-require 'erb'
-
-# Install a newrelic.yml file into the local config directory.
-# If no such directory exists, install it in ~/.newrelic.
-#
-# If a config file already exists, print a warning and exit.
-#
-if File.directory? "config"
- dest_dir = "config"
-else
- dest_dir = File.join(ENV["HOME"],".newrelic") rescue nil
- FileUtils.mkdir(dest_dir) if dest_dir
-end
-
-src_config_file = File.join(File.dirname(__FILE__),"newrelic.yml")
-dest_config_file = File.join(dest_dir, "newrelic.yml") if dest_dir
-
-if !dest_dir
- STDERR.puts "Could not find a config or ~/.newrelic directory to locate the default newrelic.yml file"
-elsif File::exists? dest_config_file
- STDERR.puts "\nA config file already exists at #{dest_config_file}.\n"
-else
- generated_for_user = ""
- license_key = "PASTE_YOUR_KEY_HERE"
- yaml = ERB.new(File.read(src_config_file)).result(binding)
- File.open( dest_config_file, 'w' ) do |out|
- out.puts yaml
- end
-
- puts IO.read(File.join(File.dirname(__FILE__), 'README'))
- puts "\n--------------------------------------------------------\n"
- puts "Installing a default configuration file in #{dest_dir}."
- puts "To monitor your application in production mode, you must enter a license key."
- puts "See #{dest_config_file}"
- puts "For a license key, sign up at http://rpm.newrelic.com/signup."
-end
@@ -1,29 +0,0 @@
-require 'new_relic/version'
-require 'new_relic/local_environment'
-require 'new_relic/stats'
-require 'new_relic/metric_spec'
-require 'new_relic/metric_data'
-require 'new_relic/transaction_analysis'
-require 'new_relic/transaction_sample'
-require 'new_relic/noticed_error'
-
-require 'new_relic/agent/chained_call'
-require 'new_relic/agent/agent'
-require 'new_relic/agent/method_tracer'
-require 'new_relic/agent/synchronize'
-require 'new_relic/agent/worker_loop'
-require 'new_relic/agent/stats_engine'
-require 'new_relic/agent/collection_helper'
-require 'new_relic/agent/transaction_sampler'
-require 'new_relic/agent/error_collector'
-
-require 'set'
-require 'sync'
-require 'thread'
-require 'resolv'
-require 'timeout'
-
-
-module NewRelic::Agent
-
-end
@@ -1,13 +0,0 @@
-# This is used to allow obfuscators to be chained.
-
-class NewRelic::ChainedCall
- def initialize(block1, block2)
- @block1 = block1
- @block2 = block2
- end
-
- def call(sql)
- sql = @block1.call(sql)
- @block2.call(sql)
- end
-end
@@ -1,18 +0,0 @@
-# ActiveMerchant Instrumentation.
-
-if defined? ActiveMerchant
-
- ActiveMerchant::Billing::Gateway.implementations.each do |gateway|
- gateway.class_eval do
- implemented_methods = public_instance_methods(false)
- gateway_name = self.name.split('::').last
- [:authorize, :purchase, :credit, :void, :capture, :recurring].each do |operation|
- if implemented_methods.include?(operation.to_s)
- add_method_tracer operation, "ActiveMerchant/gateway/#{gateway_name}/#{operation}", :scoped_metric_only => true
- add_method_tracer operation, "ActiveMerchant/gateway/#{gateway_name}", :push_scope => false
- add_method_tracer operation, "ActiveMerchant/operation/#{operation}", :push_scope => false
- end
- end
- end
- end
-end
Oops, something went wrong.

0 comments on commit 31ef043

Please sign in to comment.