newrelic_rpm 6.9.0.363 → 6.12.0.367

Sign up to get free protection for your applications and to get access to all the features.
Files changed (289) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -0
  3. data/.travis.yml +32 -2
  4. data/CHANGELOG.md +172 -10
  5. data/CODE_OF_CONDUCT.md +46 -0
  6. data/CONTRIBUTING.md +56 -12
  7. data/Gemfile +6 -2
  8. data/LICENSE +208 -38
  9. data/README.md +61 -89
  10. data/Rakefile +2 -0
  11. data/THIRD_PARTY_NOTICES.md +213 -0
  12. data/bin/nrdebug +1 -1
  13. data/init.rb +1 -1
  14. data/install.rb +1 -1
  15. data/lib/new_relic/agent.rb +15 -5
  16. data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
  17. data/lib/new_relic/agent/agent.rb +11 -6
  18. data/lib/new_relic/agent/agent_logger.rb +1 -1
  19. data/lib/new_relic/agent/attribute_filter.rb +1 -1
  20. data/lib/new_relic/agent/attribute_processing.rb +1 -1
  21. data/lib/new_relic/agent/attributes.rb +3 -1
  22. data/lib/new_relic/agent/audit_logger.rb +1 -1
  23. data/lib/new_relic/agent/autostart.rb +1 -1
  24. data/lib/new_relic/agent/chained_call.rb +1 -1
  25. data/lib/new_relic/agent/commands/agent_command.rb +1 -1
  26. data/lib/new_relic/agent/commands/agent_command_router.rb +1 -1
  27. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  28. data/lib/new_relic/agent/configuration.rb +1 -1
  29. data/lib/new_relic/agent/configuration/default_source.rb +28 -1
  30. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
  31. data/lib/new_relic/agent/configuration/environment_source.rb +1 -1
  32. data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
  33. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
  34. data/lib/new_relic/agent/configuration/manager.rb +1 -1
  35. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  36. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
  37. data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
  38. data/lib/new_relic/agent/configuration/server_source.rb +1 -1
  39. data/lib/new_relic/agent/configuration/yaml_source.rb +1 -1
  40. data/lib/new_relic/agent/connect/request_builder.rb +1 -1
  41. data/lib/new_relic/agent/connect/response_handler.rb +1 -1
  42. data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
  43. data/lib/new_relic/agent/database.rb +1 -1
  44. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  45. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  46. data/lib/new_relic/agent/database/obfuscator.rb +1 -1
  47. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
  48. data/lib/new_relic/agent/datastores.rb +1 -1
  49. data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
  50. data/lib/new_relic/agent/datastores/mongo.rb +2 -2
  51. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +1 -1
  52. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
  53. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +1 -1
  54. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
  55. data/lib/new_relic/agent/datastores/redis.rb +1 -1
  56. data/lib/new_relic/agent/deprecator.rb +1 -1
  57. data/lib/new_relic/agent/distributed_tracing.rb +1 -1
  58. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +3 -2
  59. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +1 -1
  60. data/lib/new_relic/agent/distributed_tracing/{distributed_trace_intrinsics.rb → distributed_trace_attributes.rb} +9 -5
  61. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +1 -1
  62. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +3 -4
  63. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +1 -1
  64. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +1 -1
  65. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +2 -2
  66. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  67. data/lib/new_relic/agent/error_collector.rb +31 -12
  68. data/lib/new_relic/agent/error_event_aggregator.rb +5 -5
  69. data/lib/new_relic/agent/error_trace_aggregator.rb +1 -1
  70. data/lib/new_relic/agent/event_aggregator.rb +1 -1
  71. data/lib/new_relic/agent/event_buffer.rb +1 -1
  72. data/lib/new_relic/agent/event_listener.rb +1 -1
  73. data/lib/new_relic/agent/event_loop.rb +1 -1
  74. data/lib/new_relic/agent/external.rb +1 -1
  75. data/lib/new_relic/agent/guid_generator.rb +1 -1
  76. data/lib/new_relic/agent/harvester.rb +1 -1
  77. data/lib/new_relic/agent/heap.rb +1 -1
  78. data/lib/new_relic/agent/hostname.rb +8 -2
  79. data/lib/new_relic/agent/http_clients/abstract.rb +82 -0
  80. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +25 -20
  81. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +29 -14
  82. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +18 -22
  83. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +11 -12
  84. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +17 -5
  85. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +5 -7
  86. data/lib/new_relic/agent/http_clients/uri_util.rb +4 -3
  87. data/lib/new_relic/agent/instrumentation.rb +1 -1
  88. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +5 -6
  89. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +5 -1
  90. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +12 -3
  91. data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
  92. data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
  93. data/lib/new_relic/agent/instrumentation/active_record.rb +85 -38
  94. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -24
  95. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +1 -1
  96. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +92 -34
  97. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +8 -3
  98. data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
  99. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +9 -5
  100. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +24 -8
  101. data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
  102. data/lib/new_relic/agent/instrumentation/bunny.rb +114 -51
  103. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
  104. data/lib/new_relic/agent/instrumentation/curb.rb +92 -27
  105. data/lib/new_relic/agent/instrumentation/data_mapper.rb +4 -2
  106. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +61 -25
  107. data/lib/new_relic/agent/instrumentation/excon.rb +1 -1
  108. data/lib/new_relic/agent/instrumentation/excon/connection.rb +7 -4
  109. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +3 -2
  110. data/lib/new_relic/agent/instrumentation/grape.rb +1 -1
  111. data/lib/new_relic/agent/instrumentation/http.rb +6 -3
  112. data/lib/new_relic/agent/instrumentation/httpclient.rb +5 -3
  113. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  114. data/lib/new_relic/agent/instrumentation/memcache.rb +4 -2
  115. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +7 -3
  116. data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
  117. data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
  118. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +12 -4
  119. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +9 -7
  120. data/lib/new_relic/agent/instrumentation/mongo.rb +10 -4
  121. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +36 -3
  122. data/lib/new_relic/agent/instrumentation/net.rb +59 -22
  123. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +26 -2
  124. data/lib/new_relic/agent/instrumentation/padrino.rb +40 -16
  125. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
  126. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
  127. data/lib/new_relic/agent/instrumentation/rack.rb +36 -13
  128. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
  129. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
  130. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
  131. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  132. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +1 -1
  133. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +1 -1
  134. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +1 -1
  135. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
  136. data/lib/new_relic/agent/instrumentation/rake.rb +54 -20
  137. data/lib/new_relic/agent/instrumentation/redis.rb +141 -56
  138. data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
  139. data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
  140. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
  141. data/lib/new_relic/agent/instrumentation/sidekiq.rb +48 -24
  142. data/lib/new_relic/agent/instrumentation/sinatra.rb +62 -23
  143. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
  144. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  145. data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
  146. data/lib/new_relic/agent/instrumentation/typhoeus.rb +23 -6
  147. data/lib/new_relic/agent/internal_agent_error.rb +1 -1
  148. data/lib/new_relic/agent/javascript_instrumentor.rb +1 -1
  149. data/lib/new_relic/agent/log_once.rb +1 -1
  150. data/lib/new_relic/agent/logging.rb +2 -2
  151. data/lib/new_relic/agent/memory_logger.rb +1 -1
  152. data/lib/new_relic/agent/messaging.rb +1 -1
  153. data/lib/new_relic/agent/method_tracer.rb +16 -5
  154. data/lib/new_relic/agent/method_tracer_helpers.rb +2 -2
  155. data/lib/new_relic/agent/monitors.rb +1 -1
  156. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +1 -1
  157. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
  158. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -1
  159. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +1 -1
  160. data/lib/new_relic/agent/new_relic_service.rb +1 -2
  161. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  162. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -1
  163. data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
  164. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
  165. data/lib/new_relic/agent/noticible_error.rb +22 -0
  166. data/lib/new_relic/agent/null_logger.rb +1 -1
  167. data/lib/new_relic/agent/obfuscator.rb +1 -1
  168. data/lib/new_relic/agent/parameter_filtering.rb +1 -1
  169. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
  170. data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
  171. data/lib/new_relic/agent/pipe_service.rb +1 -1
  172. data/lib/new_relic/agent/prepend_supportability.rb +1 -1
  173. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -5
  174. data/lib/new_relic/agent/range_extensions.rb +1 -1
  175. data/lib/new_relic/agent/rules_engine.rb +1 -1
  176. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
  177. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
  178. data/lib/new_relic/agent/sampler.rb +1 -1
  179. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  180. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  181. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
  182. data/lib/new_relic/agent/samplers/memory_sampler.rb +1 -1
  183. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  184. data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
  185. data/lib/new_relic/agent/span_event_aggregator.rb +1 -1
  186. data/lib/new_relic/agent/span_event_primitive.rb +71 -37
  187. data/lib/new_relic/agent/sql_sampler.rb +4 -4
  188. data/lib/new_relic/agent/stats.rb +1 -1
  189. data/lib/new_relic/agent/stats_engine.rb +1 -1
  190. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -1
  191. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
  192. data/lib/new_relic/agent/supported_versions.rb +1 -1
  193. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
  194. data/lib/new_relic/agent/system_info.rb +13 -4
  195. data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
  196. data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
  197. data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
  198. data/lib/new_relic/agent/threading/thread_profile.rb +1 -1
  199. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  200. data/lib/new_relic/agent/tracer.rb +31 -16
  201. data/lib/new_relic/agent/transaction.rb +67 -46
  202. data/lib/new_relic/agent/transaction/abstract_segment.rb +29 -2
  203. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  204. data/lib/new_relic/agent/transaction/distributed_tracer.rb +3 -3
  205. data/lib/new_relic/agent/transaction/distributed_tracing.rb +2 -2
  206. data/lib/new_relic/agent/transaction/external_request_segment.rb +26 -10
  207. data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
  208. data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
  209. data/lib/new_relic/agent/transaction/segment.rb +18 -2
  210. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
  211. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  212. data/lib/new_relic/agent/transaction/trace.rb +1 -1
  213. data/lib/new_relic/agent/transaction/trace_builder.rb +1 -1
  214. data/lib/new_relic/agent/transaction/trace_context.rb +1 -1
  215. data/lib/new_relic/agent/transaction/trace_node.rb +1 -1
  216. data/lib/new_relic/agent/transaction/tracing.rb +1 -1
  217. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  218. data/lib/new_relic/agent/transaction_error_primitive.rb +8 -6
  219. data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
  220. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
  221. data/lib/new_relic/agent/transaction_event_recorder.rb +1 -1
  222. data/lib/new_relic/agent/transaction_metrics.rb +1 -1
  223. data/lib/new_relic/agent/transaction_sampler.rb +1 -1
  224. data/lib/new_relic/agent/transaction_time_aggregator.rb +1 -1
  225. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  226. data/lib/new_relic/agent/utilization/azure.rb +1 -1
  227. data/lib/new_relic/agent/utilization/gcp.rb +1 -1
  228. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  229. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  230. data/lib/new_relic/agent/utilization_data.rb +1 -1
  231. data/lib/new_relic/agent/vm.rb +1 -1
  232. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  233. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  234. data/lib/new_relic/agent/vm/mri_vm.rb +1 -1
  235. data/lib/new_relic/agent/vm/snapshot.rb +1 -1
  236. data/lib/new_relic/agent/worker_loop.rb +1 -1
  237. data/lib/new_relic/cli/command.rb +1 -1
  238. data/lib/new_relic/cli/commands/deployments.rb +1 -1
  239. data/lib/new_relic/cli/commands/install.rb +4 -3
  240. data/lib/new_relic/coerce.rb +1 -1
  241. data/lib/new_relic/collection_helper.rb +1 -1
  242. data/lib/new_relic/constants.rb +5 -1
  243. data/lib/new_relic/control.rb +1 -1
  244. data/lib/new_relic/control/class_methods.rb +1 -1
  245. data/lib/new_relic/control/frameworks.rb +1 -1
  246. data/lib/new_relic/control/frameworks/external.rb +1 -1
  247. data/lib/new_relic/control/frameworks/merb.rb +1 -1
  248. data/lib/new_relic/control/frameworks/rails.rb +1 -1
  249. data/lib/new_relic/control/frameworks/rails3.rb +1 -1
  250. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  251. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  252. data/lib/new_relic/control/frameworks/ruby.rb +1 -1
  253. data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
  254. data/lib/new_relic/control/instance_methods.rb +1 -1
  255. data/lib/new_relic/control/instrumentation.rb +1 -1
  256. data/lib/new_relic/control/server_methods.rb +1 -1
  257. data/lib/new_relic/delayed_job_injection.rb +1 -1
  258. data/lib/new_relic/dependency_detection.rb +1 -1
  259. data/lib/new_relic/environment_report.rb +6 -2
  260. data/lib/new_relic/helper.rb +1 -1
  261. data/lib/new_relic/language_support.rb +1 -1
  262. data/lib/new_relic/latest_changes.rb +2 -2
  263. data/lib/new_relic/local_environment.rb +1 -1
  264. data/lib/new_relic/metric_data.rb +1 -1
  265. data/lib/new_relic/metric_spec.rb +1 -1
  266. data/lib/new_relic/metrics.rb +1 -1
  267. data/lib/new_relic/noticed_error.rb +29 -10
  268. data/lib/new_relic/rack.rb +1 -1
  269. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  270. data/lib/new_relic/rack/agent_middleware.rb +1 -1
  271. data/lib/new_relic/rack/browser_monitoring.rb +3 -2
  272. data/lib/new_relic/recipes.rb +1 -1
  273. data/lib/new_relic/recipes/capistrano3.rb +1 -1
  274. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
  275. data/lib/new_relic/supportability_helper.rb +1 -1
  276. data/lib/new_relic/version.rb +2 -2
  277. data/lib/newrelic_rpm.rb +1 -1
  278. data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
  279. data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
  280. data/lib/tasks/all.rb +1 -1
  281. data/lib/tasks/multiverse.rb +26 -1
  282. data/lib/tasks/newrelic.rb +1 -1
  283. data/lib/tasks/tests.rake +1 -1
  284. data/newrelic_rpm.gemspec +11 -9
  285. data/recipes/newrelic.rb +1 -1
  286. data/test/agent_helper.rb +231 -70
  287. metadata +18 -15
  288. data/lib/new_relic/agent/http_clients/abstract_request.rb +0 -31
  289. data/true +0 -0
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  @name = :passenger
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  module NewRelic
6
6
  module Agent
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'new_relic/agent/instrumentation/controller_instrumentation'
6
6
 
@@ -81,22 +81,45 @@ module NewRelic
81
81
  end
82
82
 
83
83
  module RackBuilder
84
- def run_with_newrelic(app, *args)
85
- if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
86
- wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
87
- run_without_newrelic(wrapped_app, *args)
88
- else
89
- run_without_newrelic(app, *args)
84
+
85
+ if RUBY_VERSION < "2.7.0"
86
+ def run_with_newrelic(app, *args)
87
+ if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
88
+ wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
89
+ run_without_newrelic(wrapped_app, *args)
90
+ else
91
+ run_without_newrelic(app, *args)
92
+ end
90
93
  end
94
+ else
95
+ def run_with_newrelic(app, *args, **kwargs)
96
+ if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
97
+ wrapped_app = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
98
+ run_without_newrelic(wrapped_app, *args, **kwargs)
99
+ else
100
+ run_without_newrelic(app, *args, **kwargs)
101
+ end
102
+ end
91
103
  end
92
104
 
93
- def use_with_newrelic(middleware_class, *args, &blk)
94
- if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
95
- wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
96
- use_without_newrelic(wrapped_middleware_class, *args, &blk)
97
- else
98
- use_without_newrelic(middleware_class, *args, &blk)
105
+ if RUBY_VERSION < "2.7.0"
106
+ def use_with_newrelic(middleware_class, *args, &blk)
107
+ if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
108
+ wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
109
+ use_without_newrelic(wrapped_middleware_class, *args, &blk)
110
+ else
111
+ use_without_newrelic(middleware_class, *args, &blk)
112
+ end
99
113
  end
114
+ else
115
+ def use_with_newrelic(middleware_class, *args, **kwargs, &blk)
116
+ if ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled?
117
+ wrapped_middleware_class = ::NewRelic::Agent::Instrumentation::MiddlewareProxy.for_class(middleware_class)
118
+ use_without_newrelic(wrapped_middleware_class, *args, **kwargs, &blk)
119
+ else
120
+ use_without_newrelic(middleware_class, *args, **kwargs, &blk)
121
+ end
122
+ end
100
123
  end
101
124
 
102
125
  # We patch this method for a reason that actually has nothing to do with
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'new_relic/agent/parameter_filtering'
6
6
 
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  @name = :rails_action_web_service
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'new_relic/agent/parameter_filtering'
6
6
 
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'new_relic/agent/instrumentation/middleware_proxy'
6
6
 
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
  require 'new_relic/agent/instrumentation/action_cable_subscriber'
5
5
  require 'new_relic/agent/prepend_supportability'
6
6
 
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
  require 'new_relic/agent/instrumentation/action_controller_subscriber'
5
5
  require 'new_relic/agent/prepend_supportability'
6
6
 
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
  require 'new_relic/agent/instrumentation/action_view_subscriber'
5
5
  require 'new_relic/agent/prepend_supportability'
6
6
 
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  @name = :rainbows
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  DependencyDetection.defer do
6
6
  # Why not :rake? newrelic-rake used that name, so avoid conflicting
@@ -23,26 +23,51 @@ DependencyDetection.defer do
23
23
  class Task
24
24
  alias_method :invoke_without_newrelic, :invoke
25
25
 
26
- def invoke(*args)
27
- unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
28
- return invoke_without_newrelic(*args)
29
- end
30
26
 
31
- begin
32
- timeout = NewRelic::Agent.config[:'rake.connect_timeout']
33
- NewRelic::Agent.instance.wait_on_connect(timeout)
34
- rescue => e
35
- NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
36
- return invoke_without_newrelic(*args)
27
+ if RUBY_VERSION < "2.7.0"
28
+ def invoke(*args)
29
+ unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
30
+ return invoke_without_newrelic(*args)
31
+ end
32
+
33
+ begin
34
+ timeout = NewRelic::Agent.config[:'rake.connect_timeout']
35
+ NewRelic::Agent.instance.wait_on_connect(timeout)
36
+ rescue => e
37
+ NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
38
+ return invoke_without_newrelic(*args)
39
+ end
40
+
41
+ NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
42
+
43
+ NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
44
+ NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
45
+ invoke_without_newrelic(*args)
46
+ end
37
47
  end
38
-
39
- NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
40
-
41
- NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
42
- NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
43
- invoke_without_newrelic(*args)
48
+ else
49
+ def invoke(*args, **kwargs)
50
+ unless NewRelic::Agent::Instrumentation::RakeInstrumentation.should_trace? name
51
+ return invoke_without_newrelic(*args, **kwargs)
52
+ end
53
+
54
+ begin
55
+ timeout = NewRelic::Agent.config[:'rake.connect_timeout']
56
+ NewRelic::Agent.instance.wait_on_connect(timeout)
57
+ rescue => e
58
+ NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
59
+ return invoke_without_newrelic(*args, **kwargs)
60
+ end
61
+
62
+ NewRelic::Agent::Instrumentation::RakeInstrumentation.before_invoke_transaction(self)
63
+
64
+ NewRelic::Agent::Tracer.in_transaction(name: "OtherTransaction/Rake/invoke/#{name}", category: :rake) do
65
+ NewRelic::Agent::Instrumentation::RakeInstrumentation.record_attributes(args, self)
66
+ invoke_without_newrelic(*args, **kwargs)
67
+ end
44
68
  end
45
69
  end
70
+
46
71
  end
47
72
  end
48
73
  end
@@ -86,11 +111,20 @@ module NewRelic
86
111
 
87
112
  task.instance_variable_set(:@__newrelic_instrumented_execute, true)
88
113
  task.instance_eval do
89
- def execute(*args, &block)
90
- NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
91
- super
114
+ if RUBY_VERSION < "2.7.0"
115
+ def execute(*args, &block)
116
+ NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
117
+ super
118
+ end
119
+ end
120
+ else
121
+ def execute(*args, **kwargs, &block)
122
+ NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/#{self.name}") do
123
+ super
124
+ end
92
125
  end
93
126
  end
127
+
94
128
  end
95
129
 
96
130
  instrument_execute_on_prereqs(task)
@@ -1,6 +1,6 @@
1
1
  # encoding: utf-8
2
2
  # This file is distributed under New Relic's license terms.
3
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
3
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
4
 
5
5
  require 'new_relic/agent/datastores'
6
6
  require 'new_relic/agent/datastores/redis'
@@ -55,73 +55,158 @@ DependencyDetection.defer do
55
55
  Redis::Client.class_eval do
56
56
  alias_method :call_without_new_relic, :call
57
57
 
58
- def call(*args, &block)
59
- operation = args[0][0]
60
- statement = ::NewRelic::Agent::Datastores::Redis.format_command(args[0])
61
-
62
- hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
63
- port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
64
-
65
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
66
- product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
67
- operation: operation,
68
- host: hostname,
69
- port_path_or_id: port_path_or_id,
70
- database_name: db
71
- )
72
- begin
73
- segment.notice_nosql_statement(statement) if statement
74
- call_without_new_relic(*args, &block)
75
- ensure
76
- segment.finish if segment
58
+ if RUBY_VERSION < "2.7.0"
59
+ def call(*args, &block)
60
+ operation = args[0][0]
61
+ statement = ::NewRelic::Agent::Datastores::Redis.format_command(args[0])
62
+
63
+ hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
64
+ port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
65
+
66
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
67
+ product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
68
+ operation: operation,
69
+ host: hostname,
70
+ port_path_or_id: port_path_or_id,
71
+ database_name: db
72
+ )
73
+ begin
74
+ segment.notice_nosql_statement(statement) if statement
75
+ NewRelic::Agent::Tracer.capture_segment_error segment do
76
+ call_without_new_relic(*args, &block)
77
+ end
78
+ ensure
79
+ segment.finish if segment
80
+ end
81
+ end
82
+ else
83
+ def call(*args, **kwargs, &block)
84
+ operation = args[0][0]
85
+ statement = ::NewRelic::Agent::Datastores::Redis.format_command(args[0])
86
+
87
+ hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
88
+ port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
89
+
90
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
91
+ product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
92
+ operation: operation,
93
+ host: hostname,
94
+ port_path_or_id: port_path_or_id,
95
+ database_name: db
96
+ )
97
+ begin
98
+ segment.notice_nosql_statement(statement) if statement
99
+ NewRelic::Agent::Tracer.capture_segment_error segment do
100
+ call_without_new_relic(*args, **kwargs, &block)
101
+ end
102
+ ensure
103
+ segment.finish if segment
104
+ end
77
105
  end
78
106
  end
79
107
 
108
+
109
+
80
110
  alias_method :call_pipeline_without_new_relic, :call_pipeline
81
111
 
82
- def call_pipeline(*args, &block)
83
- pipeline = args[0]
84
- operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? NewRelic::Agent::Datastores::Redis::MULTI_OPERATION : NewRelic::Agent::Datastores::Redis::PIPELINE_OPERATION
85
- statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
86
-
87
- hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
88
- port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
89
-
90
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
91
- product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
92
- operation: operation,
93
- host: hostname,
94
- port_path_or_id: port_path_or_id,
95
- database_name: db
96
- )
97
- begin
98
- segment.notice_nosql_statement(statement)
99
- call_pipeline_without_new_relic(*args, &block)
100
- ensure
101
- segment.finish if segment
112
+ if RUBY_VERSION < "2.7.0"
113
+ def call_pipeline(*args, &block)
114
+ pipeline = args[0]
115
+ operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? NewRelic::Agent::Datastores::Redis::MULTI_OPERATION : NewRelic::Agent::Datastores::Redis::PIPELINE_OPERATION
116
+ statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
117
+
118
+ hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
119
+ port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
120
+
121
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
122
+ product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
123
+ operation: operation,
124
+ host: hostname,
125
+ port_path_or_id: port_path_or_id,
126
+ database_name: db
127
+ )
128
+ begin
129
+ segment.notice_nosql_statement(statement)
130
+ NewRelic::Agent::Tracer.capture_segment_error segment do
131
+ call_pipeline_without_new_relic(*args, &block)
132
+ end
133
+ ensure
134
+ segment.finish if segment
135
+ end
136
+ end
137
+ else
138
+ def call_pipeline(*args, **kwargs, &block)
139
+ pipeline = args[0]
140
+ operation = pipeline.is_a?(::Redis::Pipeline::Multi) ? NewRelic::Agent::Datastores::Redis::MULTI_OPERATION : NewRelic::Agent::Datastores::Redis::PIPELINE_OPERATION
141
+ statement = ::NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline.commands)
142
+
143
+ hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
144
+ port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
145
+
146
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
147
+ product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
148
+ operation: operation,
149
+ host: hostname,
150
+ port_path_or_id: port_path_or_id,
151
+ database_name: db
152
+ )
153
+ begin
154
+ segment.notice_nosql_statement(statement)
155
+ NewRelic::Agent::Tracer.capture_segment_error segment do
156
+ call_pipeline_without_new_relic(*args, **kwargs, &block)
157
+ end
158
+ ensure
159
+ segment.finish if segment
160
+ end
102
161
  end
103
162
  end
104
163
 
105
164
  alias_method :connect_without_new_relic, :connect
106
165
 
107
- def connect(*args, &block)
108
- hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
109
- port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
110
-
111
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
112
- product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
113
- operation: NewRelic::Agent::Datastores::Redis::CONNECT,
114
- host: hostname,
115
- port_path_or_id: port_path_or_id,
116
- database_name: db
117
- )
118
-
119
- begin
120
- connect_without_new_relic(*args, &block)
121
- ensure
122
- segment.finish if segment
166
+ if RUBY_VERSION < "2.7.0"
167
+ def connect(*args, &block)
168
+ hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
169
+ port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
170
+
171
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
172
+ product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
173
+ operation: NewRelic::Agent::Datastores::Redis::CONNECT,
174
+ host: hostname,
175
+ port_path_or_id: port_path_or_id,
176
+ database_name: db
177
+ )
178
+
179
+ begin
180
+ NewRelic::Agent::Tracer.capture_segment_error segment do
181
+ connect_without_new_relic(*args, &block)
182
+ end
183
+ ensure
184
+ segment.finish if segment
185
+ end
186
+ end
187
+ else
188
+ def connect(*args, **kwargs, &block)
189
+ hostname = NewRelic::Agent::Instrumentation::Redis.host_for(self)
190
+ port_path_or_id = NewRelic::Agent::Instrumentation::Redis.port_path_or_id_for(self)
191
+
192
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
193
+ product: NewRelic::Agent::Datastores::Redis::PRODUCT_NAME,
194
+ operation: NewRelic::Agent::Datastores::Redis::CONNECT,
195
+ host: hostname,
196
+ port_path_or_id: port_path_or_id,
197
+ database_name: db
198
+ )
199
+
200
+ begin
201
+ NewRelic::Agent::Tracer.capture_segment_error segment do
202
+ connect_without_new_relic(*args, **kwargs, &block)
203
+ end
204
+ ensure
205
+ segment.finish if segment
206
+ end
123
207
  end
124
208
  end
209
+
125
210
  end
126
211
  end
127
212
  end