newrelic_rpm 3.9.1.236 → 3.9.2.239

Sign up to get free protection for your applications and to get access to all the features.
Files changed (220) hide show
  1. data.tar.gz.sig +2 -4
  2. data/CHANGELOG +96 -2
  3. data/lib/new_relic/agent.rb +47 -4
  4. data/lib/new_relic/agent/agent.rb +51 -26
  5. data/lib/new_relic/agent/agent_logger.rb +4 -0
  6. data/lib/new_relic/agent/configuration.rb +2 -32
  7. data/lib/new_relic/agent/configuration/default_source.rb +153 -118
  8. data/lib/new_relic/agent/configuration/dotted_hash.rb +52 -0
  9. data/lib/new_relic/agent/configuration/environment_source.rb +1 -1
  10. data/lib/new_relic/agent/configuration/manager.rb +101 -2
  11. data/lib/new_relic/agent/configuration/manual_source.rb +17 -0
  12. data/lib/new_relic/agent/configuration/server_source.rb +12 -4
  13. data/lib/new_relic/agent/configuration/yaml_source.rb +46 -22
  14. data/lib/new_relic/agent/cross_app_monitor.rb +1 -1
  15. data/lib/new_relic/agent/cross_app_tracing.rb +1 -1
  16. data/lib/new_relic/agent/database/obfuscation_helpers.rb +55 -14
  17. data/lib/new_relic/agent/database/obfuscator.rb +22 -7
  18. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +6 -8
  19. data/lib/new_relic/agent/error_collector.rb +24 -16
  20. data/lib/new_relic/agent/event_loop.rb +189 -0
  21. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +8 -17
  22. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +1 -1
  23. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +1 -1
  24. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +17 -16
  25. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +41 -0
  26. data/lib/new_relic/agent/instrumentation/merb/controller.rb +0 -11
  27. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +1 -1
  28. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +0 -8
  29. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -9
  30. data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb +0 -18
  31. data/lib/new_relic/agent/instrumentation/rubyprof.rb +1 -1
  32. data/lib/new_relic/agent/instrumentation/sidekiq.rb +1 -1
  33. data/lib/new_relic/agent/instrumentation/sinatra.rb +12 -1
  34. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  35. data/lib/new_relic/agent/method_tracer.rb +33 -39
  36. data/lib/new_relic/agent/new_relic_service.rb +35 -156
  37. data/lib/new_relic/agent/new_relic_service/encoders.rb +34 -0
  38. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +50 -0
  39. data/lib/new_relic/agent/new_relic_service/marshaller.rb +52 -0
  40. data/lib/new_relic/agent/new_relic_service/pruby_marshaller.rb +52 -0
  41. data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
  42. data/lib/new_relic/agent/traced_method_stack.rb +16 -2
  43. data/lib/new_relic/agent/transaction.rb +0 -4
  44. data/lib/new_relic/collection_helper.rb +2 -2
  45. data/lib/new_relic/control/frameworks/rails.rb +3 -0
  46. data/lib/new_relic/control/instrumentation.rb +6 -2
  47. data/lib/new_relic/json_wrapper.rb +47 -25
  48. data/lib/new_relic/language_support.rb +0 -4
  49. data/lib/new_relic/latest_changes.rb +2 -2
  50. data/lib/new_relic/rack/developer_mode.rb +4 -3
  51. data/lib/new_relic/recipes/capistrano3.rb +2 -2
  52. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
  53. data/lib/new_relic/timer_lib.rb +1 -1
  54. data/lib/new_relic/version.rb +2 -2
  55. data/lib/tasks/config.html.erb +28 -0
  56. data/lib/tasks/config.rake +134 -0
  57. data/lib/tasks/config.text.erb +7 -0
  58. data/lib/tasks/install.rake +0 -63
  59. data/newrelic.yml +7 -0
  60. data/test/active_record_fixtures.rb +4 -4
  61. data/test/agent_helper.rb +58 -18
  62. data/test/environments/lib/environments/runner.rb +1 -1
  63. data/test/environments/rails21/Gemfile +1 -1
  64. data/test/environments/rails21/config/boot.rb +1 -1
  65. data/test/environments/rails22/Gemfile +1 -1
  66. data/test/environments/rails22/config/boot.rb +1 -1
  67. data/test/environments/rails23/config/boot.rb +2 -2
  68. data/test/environments/rails30/Gemfile +1 -1
  69. data/test/environments/rails31/Gemfile +1 -1
  70. data/test/environments/rails32/Gemfile +1 -1
  71. data/test/environments/rails40/Gemfile +1 -1
  72. data/test/environments/rails41/Gemfile +1 -1
  73. data/test/fixtures/cross_agent_tests/labels.json +104 -0
  74. data/test/fixtures/cross_agent_tests/sql_obfuscation/README.md +23 -0
  75. data/test/fixtures/cross_agent_tests/sql_obfuscation/back_quoted_identifiers.mysql.obfuscated +1 -0
  76. data/test/fixtures/cross_agent_tests/sql_obfuscation/back_quoted_identifiers.mysql.sql +1 -0
  77. data/test/fixtures/cross_agent_tests/sql_obfuscation/comment_delimiters_in_strings.obfuscated +1 -0
  78. data/test/fixtures/cross_agent_tests/sql_obfuscation/comment_delimiters_in_strings.sql +1 -0
  79. data/test/fixtures/cross_agent_tests/sql_obfuscation/double_quoted_identifiers.postgres.obfuscated +1 -0
  80. data/test/fixtures/cross_agent_tests/sql_obfuscation/double_quoted_identifiers.postgres.sql +1 -0
  81. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comment_in_string.obfuscated +2 -0
  82. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comment_in_string.sql +2 -0
  83. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comments_with_quotes.obfuscated +1 -0
  84. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comments_with_quotes.sql +2 -0
  85. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_cstyle.obfuscated +1 -0
  86. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_cstyle.sql +1 -0
  87. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_doubledash.obfuscated +2 -0
  88. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_doubledash.sql +2 -0
  89. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_hash.obfuscated +1 -0
  90. data/test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_hash.sql +1 -0
  91. data/test/fixtures/cross_agent_tests/sql_obfuscation/escape_string_constants.postgres.obfuscated +1 -0
  92. data/test/fixtures/cross_agent_tests/sql_obfuscation/escape_string_constants.postgres.sql +4 -0
  93. data/test/fixtures/cross_agent_tests/sql_obfuscation/malformed/unterminated_double_quoted_string.mysql.sql +1 -0
  94. data/test/fixtures/cross_agent_tests/sql_obfuscation/malformed/unterminated_single_quoted_string.sql +1 -0
  95. data/test/fixtures/cross_agent_tests/sql_obfuscation/mixed_comments_and_quotes.obfuscated +1 -0
  96. data/test/fixtures/cross_agent_tests/sql_obfuscation/mixed_comments_and_quotes.sql +2 -0
  97. data/test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_comments_and_newlines.obfuscated +1 -0
  98. data/test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_comments_and_newlines.sql +4 -0
  99. data/test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_end_of_line_comments.obfuscated +1 -0
  100. data/test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_end_of_line_comments.sql +3 -0
  101. data/test/fixtures/cross_agent_tests/sql_obfuscation/multiple_literal_types.mysql.obfuscated +1 -0
  102. data/test/fixtures/cross_agent_tests/sql_obfuscation/multiple_literal_types.mysql.sql +1 -0
  103. data/test/fixtures/cross_agent_tests/sql_obfuscation/numbers_in_identifiers.obfuscated +1 -0
  104. data/test/fixtures/cross_agent_tests/sql_obfuscation/numbers_in_identifiers.sql +1 -0
  105. data/test/fixtures/cross_agent_tests/sql_obfuscation/numeric_literals.obfuscated +1 -0
  106. data/test/fixtures/cross_agent_tests/sql_obfuscation/numeric_literals.sql +1 -0
  107. data/test/fixtures/cross_agent_tests/sql_obfuscation/quote_delimiters_in_comments.obfuscated +1 -0
  108. data/test/fixtures/cross_agent_tests/sql_obfuscation/quote_delimiters_in_comments.sql +1 -0
  109. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_double_quoted.mysql.obfuscated +1 -0
  110. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_double_quoted.mysql.sql +1 -0
  111. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_single_quoted.obfuscated +1 -0
  112. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_single_quoted.sql +1 -0
  113. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_backslash_and_twin_single_quotes.obfuscated +1 -0
  114. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_backslash_and_twin_single_quotes.sql +4 -0
  115. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_double_quote.obfuscated +1 -0
  116. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_double_quote.sql +1 -0
  117. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_newline.obfuscated +1 -0
  118. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_newline.sql +2 -0
  119. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_single_quote.mysql.obfuscated +1 -0
  120. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_single_quote.mysql.sql +1 -0
  121. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_escaped_quotes.mysql.obfuscated +1 -0
  122. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_escaped_quotes.mysql.sql +1 -0
  123. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_backslash.obfuscated +1 -0
  124. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_backslash.sql +4 -0
  125. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash.mysql.obfuscated +1 -0
  126. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash.mysql.sql +1 -0
  127. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash_single_quoted.obfuscated +1 -0
  128. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash_single_quoted.sql +1 -0
  129. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_quote.obfuscated +1 -0
  130. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_quote.sql +1 -0
  131. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.obfuscated +1 -0
  132. data/test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.sql +1 -0
  133. data/test/multiverse/lib/multiverse/output_collector.rb +1 -1
  134. data/test/multiverse/lib/multiverse/runner.rb +1 -1
  135. data/test/multiverse/lib/multiverse/suite.rb +19 -4
  136. data/test/multiverse/suites/agent_only/audit_log_test.rb +1 -38
  137. data/test/multiverse/suites/agent_only/collector_exception_handling_test.rb +25 -35
  138. data/test/multiverse/suites/agent_only/config/newrelic.yml +2 -0
  139. data/test/multiverse/suites/agent_only/encoding_handling_test.rb +1 -0
  140. data/test/multiverse/suites/agent_only/harvest_timestamps_test.rb +1 -1
  141. data/test/multiverse/suites/agent_only/keepalive_test.rb +29 -0
  142. data/test/multiverse/suites/agent_only/labels_test.rb +89 -0
  143. data/test/multiverse/suites/agent_only/marshaling_test.rb +1 -3
  144. data/test/multiverse/suites/agent_only/service_timeout_test.rb +1 -1
  145. data/test/multiverse/suites/agent_only/start_up_test.rb +9 -1
  146. data/test/multiverse/suites/capistrano/config/deploy.rb +6 -2
  147. data/test/multiverse/suites/capistrano/deployment_test.rb +12 -4
  148. data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb +29 -1
  149. data/test/multiverse/suites/curb/Envfile +6 -2
  150. data/test/multiverse/suites/datamapper/Envfile +0 -4
  151. data/test/multiverse/suites/deferred_instrumentation/Envfile +0 -4
  152. data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb +1 -1
  153. data/test/multiverse/suites/excon/Envfile +5 -4
  154. data/test/multiverse/suites/excon/excon_test.rb +1 -1
  155. data/test/multiverse/suites/httpclient/Envfile +0 -4
  156. data/test/multiverse/suites/marshalling/Envfile +12 -0
  157. data/test/multiverse/suites/marshalling/config/newrelic.yml +20 -0
  158. data/test/multiverse/suites/marshalling/marshalling_test.rb +60 -0
  159. data/test/multiverse/suites/mongo/helpers/mongo_operation_tests.rb +1 -1
  160. data/test/multiverse/suites/mongo/helpers/mongo_replica_set.rb +1 -1
  161. data/test/multiverse/suites/mongo/helpers/mongo_server.rb +4 -4
  162. data/test/multiverse/suites/padrino/Envfile +0 -5
  163. data/test/multiverse/suites/padrino/padrino_test.rb +1 -1
  164. data/test/multiverse/suites/rack/rack_auto_instrumentation_test.rb +1 -1
  165. data/test/multiverse/suites/rails/gc_instrumentation_test.rb +2 -1
  166. data/test/multiverse/suites/rails/ignore_test.rb +22 -0
  167. data/test/multiverse/suites/rails/rails2_app/config/boot.rb +2 -2
  168. data/test/multiverse/suites/rails/rails2_app/config/routes.rb +1 -0
  169. data/test/multiverse/suites/resque/Envfile +0 -4
  170. data/test/multiverse/suites/sequel/Envfile +0 -5
  171. data/test/multiverse/suites/sinatra/sinatra_classic_test.rb +1 -1
  172. data/test/multiverse/suites/sinatra/sinatra_modular_test.rb +1 -1
  173. data/test/multiverse/suites/sinatra/sinatra_test_cases.rb +22 -0
  174. data/test/multiverse/suites/typhoeus/Envfile +1 -4
  175. data/test/new_relic/agent/agent/start_worker_thread_test.rb +1 -13
  176. data/test/new_relic/agent/agent_logger_test.rb +11 -0
  177. data/test/new_relic/agent/agent_test.rb +43 -20
  178. data/test/new_relic/agent/audit_logger_test.rb +7 -3
  179. data/test/new_relic/agent/commands/thread_profiler_session_test.rb +0 -1
  180. data/test/new_relic/agent/commands/xray_session_collection_test.rb +1 -1
  181. data/test/new_relic/agent/configuration/dotted_hash_test.rb +53 -0
  182. data/test/new_relic/agent/configuration/manager_test.rb +99 -6
  183. data/test/new_relic/agent/configuration/manual_source_test.rb +18 -0
  184. data/test/new_relic/agent/configuration/orphan_configuration_test.rb +1 -1
  185. data/test/new_relic/agent/configuration/yaml_source_test.rb +8 -4
  186. data/test/new_relic/agent/database/sql_obfuscation_test.rb +76 -0
  187. data/test/new_relic/agent/database_test.rb +2 -38
  188. data/test/new_relic/agent/error_collector/notice_error_test.rb +21 -3
  189. data/test/new_relic/agent/error_collector_test.rb +15 -2
  190. data/test/new_relic/agent/event_loop_test.rb +202 -0
  191. data/test/new_relic/agent/instrumentation/active_record_helper_test.rb +4 -0
  192. data/test/new_relic/agent/instrumentation/controller_instrumentation_test.rb +283 -182
  193. data/test/new_relic/agent/method_tracer_test.rb +1 -2
  194. data/test/new_relic/agent/new_relic_service_test.rb +83 -27
  195. data/test/new_relic/agent/pipe_channel_manager_test.rb +6 -6
  196. data/test/new_relic/agent/rpm_agent_test.rb +1 -8
  197. data/test/new_relic/agent/sql_sampler_test.rb +10 -8
  198. data/test/new_relic/agent/threading/backtrace_service_test.rb +1 -1
  199. data/test/new_relic/agent/traced_method_stack_test.rb +45 -13
  200. data/test/new_relic/agent/transaction_sample_builder_test.rb +1 -2
  201. data/test/new_relic/agent/transaction_test.rb +3 -3
  202. data/test/new_relic/agent_test.rb +47 -8
  203. data/test/new_relic/collection_helper_test.rb +5 -5
  204. data/test/new_relic/control/instrumentation_test.rb +56 -0
  205. data/test/new_relic/control_test.rb +4 -3
  206. data/test/new_relic/fake_collector.rb +7 -2
  207. data/test/new_relic/http_client_test_cases.rb +4 -4
  208. data/test/new_relic/latest_changes_test.rb +3 -3
  209. data/test/new_relic/transaction_sample/segment_test.rb +0 -1
  210. data/test/new_relic/transaction_sample_test.rb +19 -2
  211. data/test/performance/lib/performance/runner.rb +4 -4
  212. data/test/performance/suites/marshalling.rb +46 -30
  213. data/test/performance/suites/sql_obfuscation.rb +30 -0
  214. data/test/test_helper.rb +1 -1
  215. data/ui/helpers/developer_mode_helper.rb +2 -2
  216. data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/java.rb +1 -1
  217. data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb +1 -1
  218. metadata +84 -3
  219. metadata.gz.sig +0 -0
  220. data/test/environments/rails23/config/environments/development.rb +0 -11
data/test/performance/suites/sql_obfuscation.rb ADDED
@@ -0,0 +1,30 @@
1
+ # encoding: utf-8
2
+ # This file is distributed under New Relic's license terms.
3
+ # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
4
+
5
+ class SqlObfuscationTests < Performance::TestCase
6
+ def setup
7
+ require 'new_relic/agent/database'
8
+ @long_query = NewRelic::Agent::Database::Statement.new("SELECT DISTINCT table0.* FROM `table0` INNER JOIN `table1` ON `table1`.`metric_id` = `table0`.`id` LEFT JOIN `table3` ON table3.id_column = table0.id_column AND table3.metric_id = table0.id WHERE `table1`.`other_id` IN (92776, 49992, 61710, 84911, 90744, 40647) AND `table0`.`id_column` = 81067 AND `table0`.`col12` = '' AND ((table0.id_column=81067 )) AND ((table3.timestamp IS NULL OR table3.timestamp > 1406810459)) AND (((table0.name LIKE 'WebTransaction/%') OR ((table0.name LIKE 'OtherTransaction/%/%') AND (table0.name NOT LIKE '%/all')))) LIMIT 2250")
9
+ @short_query = NewRelic::Agent::Database::Statement.new("SELECT * FROM `table` WHERE id=2540250 AND name LIKE 'OtherTransaction/%/%'")
10
+
11
+ @long_query_pg = @long_query.dup
12
+ @long_query_pg.adapter = 'postgresql'
13
+ @short_query_pg = @short_query.dup
14
+ @short_query_pg.adapter = 'postgresql'
15
+ end
16
+
17
+ def test_obfuscate_sql
18
+ iterations.times do
19
+ NewRelic::Agent::Database.obfuscate_sql(@long_query)
20
+ NewRelic::Agent::Database.obfuscate_sql(@short_query)
21
+ end
22
+ end
23
+
24
+ def test_obfuscate_sql_postgres
25
+ iterations.times do
26
+ NewRelic::Agent::Database.obfuscate_sql(@long_query_pg)
27
+ NewRelic::Agent::Database.obfuscate_sql(@short_query_pg)
28
+ end
29
+ end
30
+ end
data/test/test_helper.rb CHANGED
@@ -38,7 +38,7 @@ else
38
38
  begin
39
39
  require 'config/environment'
40
40
  require 'newrelic_rpm'
41
- rescue LoadError => e
41
+ rescue LoadError
42
42
  puts "Running tests in standalone mode."
43
43
 
44
44
  require 'bundler'
data/ui/helpers/developer_mode_helper.rb CHANGED
@@ -25,7 +25,7 @@ module NewRelic::DeveloperModeHelper
25
25
  def application_caller(trace)
26
26
  trace = strip_nr_from_backtrace(trace) unless params[:show_nr]
27
27
  trace.each do |trace_line|
28
- file, line, gem = file_and_line(trace_line)
28
+ file, _line, gem = file_and_line(trace_line)
29
29
  unless file && exclude_file_from_stack_trace?(file, false, gem)
30
30
  return trace_line
31
31
  end
@@ -36,7 +36,7 @@ module NewRelic::DeveloperModeHelper
36
36
  def application_stack_trace(trace, include_rails = false)
37
37
  trace = strip_nr_from_backtrace(trace) unless params[:show_nr]
38
38
  trace.reject do |trace_line|
39
- file, line, gem = file_and_line(trace_line)
39
+ file, _line, gem = file_and_line(trace_line)
40
40
  file && exclude_file_from_stack_trace?(file, include_rails, gem)
41
41
  end
42
42
  end
data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/java.rb CHANGED
@@ -6,7 +6,7 @@ require 'new_relic/metric_parser/java_parser'
6
6
  module NewRelic
7
7
  module MetricParser
8
8
  class Java < NewRelic::MetricParser::MetricParser
9
- JavaParser
9
+ include JavaParser
10
10
  def initialize(name)
11
11
  super
12
12
  if segments.length > 2
data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb CHANGED
@@ -65,7 +65,7 @@ module NewRelic
65
65
  end
66
66
  private
67
67
  def file_name(path)
68
- label = path.gsub /\.html\.rhtml/, '.rhtml'
68
+ label = path.gsub(/\.html\.rhtml/, '.rhtml')
69
69
  label = segments[1] if label.empty?
70
70
  label
71
71
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: newrelic_rpm
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.9.1.236
4
+ version: 3.9.2.239
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -41,7 +41,7 @@ cert_chain:
41
41
  K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
42
42
  d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
43
43
  LS0tLS0K
44
- date: 2014-07-28 00:00:00.000000000 Z
44
+ date: 2014-08-20 00:00:00.000000000 Z
45
45
  dependencies:
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: rake
@@ -270,9 +270,11 @@ files:
270
270
  - lib/new_relic/agent/commands/xray_session_collection.rb
271
271
  - lib/new_relic/agent/configuration.rb
272
272
  - lib/new_relic/agent/configuration/default_source.rb
273
+ - lib/new_relic/agent/configuration/dotted_hash.rb
273
274
  - lib/new_relic/agent/configuration/environment_source.rb
274
275
  - lib/new_relic/agent/configuration/high_security_source.rb
275
276
  - lib/new_relic/agent/configuration/manager.rb
277
+ - lib/new_relic/agent/configuration/manual_source.rb
276
278
  - lib/new_relic/agent/configuration/mask_defaults.rb
277
279
  - lib/new_relic/agent/configuration/server_source.rb
278
280
  - lib/new_relic/agent/configuration/yaml_source.rb
@@ -289,6 +291,7 @@ files:
289
291
  - lib/new_relic/agent/datastores/mongo/statement_formatter.rb
290
292
  - lib/new_relic/agent/error_collector.rb
291
293
  - lib/new_relic/agent/event_listener.rb
294
+ - lib/new_relic/agent/event_loop.rb
292
295
  - lib/new_relic/agent/harvester.rb
293
296
  - lib/new_relic/agent/hostname.rb
294
297
  - lib/new_relic/agent/http_clients/curb_wrappers.rb
@@ -316,6 +319,7 @@ files:
316
319
  - lib/new_relic/agent/instrumentation/excon/connection.rb
317
320
  - lib/new_relic/agent/instrumentation/excon/middleware.rb
318
321
  - lib/new_relic/agent/instrumentation/httpclient.rb
322
+ - lib/new_relic/agent/instrumentation/ignore_actions.rb
319
323
  - lib/new_relic/agent/instrumentation/memcache.rb
320
324
  - lib/new_relic/agent/instrumentation/merb/controller.rb
321
325
  - lib/new_relic/agent/instrumentation/merb/errors.rb
@@ -352,6 +356,10 @@ files:
352
356
  - lib/new_relic/agent/memory_logger.rb
353
357
  - lib/new_relic/agent/method_tracer.rb
354
358
  - lib/new_relic/agent/new_relic_service.rb
359
+ - lib/new_relic/agent/new_relic_service/encoders.rb
360
+ - lib/new_relic/agent/new_relic_service/json_marshaller.rb
361
+ - lib/new_relic/agent/new_relic_service/marshaller.rb
362
+ - lib/new_relic/agent/new_relic_service/pruby_marshaller.rb
355
363
  - lib/new_relic/agent/null_logger.rb
356
364
  - lib/new_relic/agent/obfuscator.rb
357
365
  - lib/new_relic/agent/pipe_channel_manager.rb
@@ -453,6 +461,9 @@ files:
453
461
  - lib/sequel/extensions/newrelic_instrumentation.rb
454
462
  - lib/sequel/plugins/newrelic_instrumentation.rb
455
463
  - lib/tasks/all.rb
464
+ - lib/tasks/config.html.erb
465
+ - lib/tasks/config.rake
466
+ - lib/tasks/config.text.erb
456
467
  - lib/tasks/install.rake
457
468
  - lib/tasks/tests.rake
458
469
  - lib/tasks/versions.html.erb
@@ -501,7 +512,6 @@ files:
501
512
  - test/environments/rails23/config/boot.rb
502
513
  - test/environments/rails23/config/database.yml
503
514
  - test/environments/rails23/config/environment.rb
504
- - test/environments/rails23/config/environments/development.rb
505
515
  - test/environments/rails23/config/environments/production.rb
506
516
  - test/environments/rails23/config/environments/test.rb
507
517
  - test/environments/rails23/config/preinitializer.rb
@@ -546,6 +556,7 @@ files:
546
556
  - test/environments/rails41/db/schema.rb
547
557
  - test/fixtures/cross_agent_tests/README.md
548
558
  - test/fixtures/cross_agent_tests/cat_map.json
559
+ - test/fixtures/cross_agent_tests/labels.json
549
560
  - test/fixtures/cross_agent_tests/postgres_explain_obfuscation/basic_where.colon_obfuscated.txt
550
561
  - test/fixtures/cross_agent_tests/postgres_explain_obfuscation/basic_where.explain.txt
551
562
  - test/fixtures/cross_agent_tests/postgres_explain_obfuscation/basic_where.obfuscated.txt
@@ -663,6 +674,65 @@ files:
663
674
  - test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_spaces_around_equals.html
664
675
  - test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_with_others.html
665
676
  - test/fixtures/cross_agent_tests/rum_loader_insertion_location/x_ua_meta_tag_with_spaces.html
677
+ - test/fixtures/cross_agent_tests/sql_obfuscation/README.md
678
+ - test/fixtures/cross_agent_tests/sql_obfuscation/back_quoted_identifiers.mysql.obfuscated
679
+ - test/fixtures/cross_agent_tests/sql_obfuscation/back_quoted_identifiers.mysql.sql
680
+ - test/fixtures/cross_agent_tests/sql_obfuscation/comment_delimiters_in_strings.obfuscated
681
+ - test/fixtures/cross_agent_tests/sql_obfuscation/comment_delimiters_in_strings.sql
682
+ - test/fixtures/cross_agent_tests/sql_obfuscation/double_quoted_identifiers.postgres.obfuscated
683
+ - test/fixtures/cross_agent_tests/sql_obfuscation/double_quoted_identifiers.postgres.sql
684
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comment_in_string.obfuscated
685
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comment_in_string.sql
686
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comments_with_quotes.obfuscated
687
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_line_comments_with_quotes.sql
688
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_cstyle.obfuscated
689
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_cstyle.sql
690
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_doubledash.obfuscated
691
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_doubledash.sql
692
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_hash.obfuscated
693
+ - test/fixtures/cross_agent_tests/sql_obfuscation/end_of_query_comment_hash.sql
694
+ - test/fixtures/cross_agent_tests/sql_obfuscation/escape_string_constants.postgres.obfuscated
695
+ - test/fixtures/cross_agent_tests/sql_obfuscation/escape_string_constants.postgres.sql
696
+ - test/fixtures/cross_agent_tests/sql_obfuscation/malformed/unterminated_double_quoted_string.mysql.sql
697
+ - test/fixtures/cross_agent_tests/sql_obfuscation/malformed/unterminated_single_quoted_string.sql
698
+ - test/fixtures/cross_agent_tests/sql_obfuscation/mixed_comments_and_quotes.obfuscated
699
+ - test/fixtures/cross_agent_tests/sql_obfuscation/mixed_comments_and_quotes.sql
700
+ - test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_comments_and_newlines.obfuscated
701
+ - test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_comments_and_newlines.sql
702
+ - test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_end_of_line_comments.obfuscated
703
+ - test/fixtures/cross_agent_tests/sql_obfuscation/mixed_quotes_end_of_line_comments.sql
704
+ - test/fixtures/cross_agent_tests/sql_obfuscation/multiple_literal_types.mysql.obfuscated
705
+ - test/fixtures/cross_agent_tests/sql_obfuscation/multiple_literal_types.mysql.sql
706
+ - test/fixtures/cross_agent_tests/sql_obfuscation/numbers_in_identifiers.obfuscated
707
+ - test/fixtures/cross_agent_tests/sql_obfuscation/numbers_in_identifiers.sql
708
+ - test/fixtures/cross_agent_tests/sql_obfuscation/numeric_literals.obfuscated
709
+ - test/fixtures/cross_agent_tests/sql_obfuscation/numeric_literals.sql
710
+ - test/fixtures/cross_agent_tests/sql_obfuscation/quote_delimiters_in_comments.obfuscated
711
+ - test/fixtures/cross_agent_tests/sql_obfuscation/quote_delimiters_in_comments.sql
712
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_double_quoted.mysql.obfuscated
713
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_double_quoted.mysql.sql
714
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_single_quoted.obfuscated
715
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_single_quoted.sql
716
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_backslash_and_twin_single_quotes.obfuscated
717
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_backslash_and_twin_single_quotes.sql
718
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_double_quote.obfuscated
719
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_double_quote.sql
720
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_newline.obfuscated
721
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_newline.sql
722
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_single_quote.mysql.obfuscated
723
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_embedded_single_quote.mysql.sql
724
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_escaped_quotes.mysql.obfuscated
725
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_escaped_quotes.mysql.sql
726
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_backslash.obfuscated
727
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_backslash.sql
728
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash.mysql.obfuscated
729
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash.mysql.sql
730
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash_single_quoted.obfuscated
731
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_backslash_single_quoted.sql
732
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_quote.obfuscated
733
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_trailing_escaped_quote.sql
734
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.obfuscated
735
+ - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.sql
666
736
  - test/fixtures/cross_agent_tests/sql_parsing.json
667
737
  - test/fixtures/cross_agent_tests/url_clean.json
668
738
  - test/fixtures/cross_agent_tests/url_domain_extraction.json
@@ -708,7 +778,9 @@ files:
708
778
  - test/multiverse/suites/agent_only/exclusive_time_test.rb
709
779
  - test/multiverse/suites/agent_only/harvest_timestamps_test.rb
710
780
  - test/multiverse/suites/agent_only/http_response_code_test.rb
781
+ - test/multiverse/suites/agent_only/keepalive_test.rb
711
782
  - test/multiverse/suites/agent_only/key_transactions_test.rb
783
+ - test/multiverse/suites/agent_only/labels_test.rb
712
784
  - test/multiverse/suites/agent_only/logging_test.rb
713
785
  - test/multiverse/suites/agent_only/marshaling_test.rb
714
786
  - test/multiverse/suites/agent_only/pipe_manager_test.rb
@@ -756,6 +828,9 @@ files:
756
828
  - test/multiverse/suites/httpclient/Envfile
757
829
  - test/multiverse/suites/httpclient/config/newrelic.yml
758
830
  - test/multiverse/suites/httpclient/httpclient_test.rb
831
+ - test/multiverse/suites/marshalling/Envfile
832
+ - test/multiverse/suites/marshalling/config/newrelic.yml
833
+ - test/multiverse/suites/marshalling/marshalling_test.rb
759
834
  - test/multiverse/suites/mongo/Envfile
760
835
  - test/multiverse/suites/mongo/config/newrelic.yml
761
836
  - test/multiverse/suites/mongo/helpers/mongo_operation_tests.rb
@@ -871,15 +946,18 @@ files:
871
946
  - test/new_relic/agent/commands/xray_session_collection_test.rb
872
947
  - test/new_relic/agent/commands/xray_session_test.rb
873
948
  - test/new_relic/agent/configuration/default_source_test.rb
949
+ - test/new_relic/agent/configuration/dotted_hash_test.rb
874
950
  - test/new_relic/agent/configuration/environment_source_test.rb
875
951
  - test/new_relic/agent/configuration/high_security_source_test.rb
876
952
  - test/new_relic/agent/configuration/manager_test.rb
953
+ - test/new_relic/agent/configuration/manual_source_test.rb
877
954
  - test/new_relic/agent/configuration/orphan_configuration_test.rb
878
955
  - test/new_relic/agent/configuration/server_source_test.rb
879
956
  - test/new_relic/agent/configuration/yaml_source_test.rb
880
957
  - test/new_relic/agent/cross_app_monitor_test.rb
881
958
  - test/new_relic/agent/cross_app_tracing_test.rb
882
959
  - test/new_relic/agent/database/postgres_explain_obfuscator_test.rb
960
+ - test/new_relic/agent/database/sql_obfuscation_test.rb
883
961
  - test/new_relic/agent/database_test.rb
884
962
  - test/new_relic/agent/datastores/mongo/metric_generator_test.rb
885
963
  - test/new_relic/agent/datastores/mongo/metric_translator_test.rb
@@ -888,6 +966,7 @@ files:
888
966
  - test/new_relic/agent/error_collector/notice_error_test.rb
889
967
  - test/new_relic/agent/error_collector_test.rb
890
968
  - test/new_relic/agent/event_listener_test.rb
969
+ - test/new_relic/agent/event_loop_test.rb
891
970
  - test/new_relic/agent/harvester_test.rb
892
971
  - test/new_relic/agent/hostname_test.rb
893
972
  - test/new_relic/agent/http_clients/uri_util_test.rb
@@ -967,6 +1046,7 @@ files:
967
1046
  - test/new_relic/control/class_methods_test.rb
968
1047
  - test/new_relic/control/frameworks/rails_test.rb
969
1048
  - test/new_relic/control/instance_methods_test.rb
1049
+ - test/new_relic/control/instrumentation_test.rb
970
1050
  - test/new_relic/control_test.rb
971
1051
  - test/new_relic/data_container_tests.rb
972
1052
  - test/new_relic/dependency_detection_test.rb
@@ -1031,6 +1111,7 @@ files:
1031
1111
  - test/performance/suites/marshalling.rb
1032
1112
  - test/performance/suites/rack_middleware.rb
1033
1113
  - test/performance/suites/rum_autoinsertion.rb
1114
+ - test/performance/suites/sql_obfuscation.rb
1034
1115
  - test/performance/suites/startup.rb
1035
1116
  - test/performance/suites/thread_profiling.rb
1036
1117
  - test/performance/suites/trace_execution_scoped.rb
metadata.gz.sig CHANGED
Binary file
data/test/environments/rails23/config/environments/development.rb DELETED
@@ -1,11 +0,0 @@
1
- # encoding: utf-8
2
- # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
4
-
5
- config.cache_classes = false
6
- config.whiny_nils = true
7
- config.action_controller.consider_all_requests_local = true
8
- config.action_view.debug_rjs = true
9
- config.action_controller.perform_caching = false
10
- config.action_mailer.raise_delivery_errors = false
11
- end