newrelic_rpm 6.11.0.365 → 6.12.0.367

Sign up to get free protection for your applications and to get access to all the features.
Files changed (285) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.travis.yml +1 -2
  4. data/CHANGELOG.md +73 -5
  5. data/CODE_OF_CONDUCT.md +46 -0
  6. data/CONTRIBUTING.md +56 -12
  7. data/Gemfile +1 -1
  8. data/LICENSE +208 -38
  9. data/README.md +61 -89
  10. data/THIRD_PARTY_NOTICES.md +213 -0
  11. data/bin/nrdebug +1 -1
  12. data/init.rb +1 -1
  13. data/install.rb +1 -1
  14. data/lib/new_relic/agent.rb +12 -3
  15. data/lib/new_relic/agent/adaptive_sampler.rb +1 -1
  16. data/lib/new_relic/agent/agent.rb +8 -1
  17. data/lib/new_relic/agent/agent_logger.rb +1 -1
  18. data/lib/new_relic/agent/attribute_filter.rb +1 -1
  19. data/lib/new_relic/agent/attribute_processing.rb +1 -1
  20. data/lib/new_relic/agent/attributes.rb +3 -1
  21. data/lib/new_relic/agent/audit_logger.rb +1 -1
  22. data/lib/new_relic/agent/autostart.rb +1 -1
  23. data/lib/new_relic/agent/chained_call.rb +1 -1
  24. data/lib/new_relic/agent/commands/agent_command.rb +1 -1
  25. data/lib/new_relic/agent/commands/agent_command_router.rb +1 -1
  26. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  27. data/lib/new_relic/agent/configuration.rb +1 -1
  28. data/lib/new_relic/agent/configuration/default_source.rb +1 -1
  29. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -1
  30. data/lib/new_relic/agent/configuration/environment_source.rb +1 -1
  31. data/lib/new_relic/agent/configuration/event_harvest_config.rb +1 -1
  32. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
  33. data/lib/new_relic/agent/configuration/manager.rb +1 -1
  34. data/lib/new_relic/agent/configuration/manual_source.rb +1 -1
  35. data/lib/new_relic/agent/configuration/mask_defaults.rb +1 -1
  36. data/lib/new_relic/agent/configuration/security_policy_source.rb +1 -1
  37. data/lib/new_relic/agent/configuration/server_source.rb +1 -1
  38. data/lib/new_relic/agent/configuration/yaml_source.rb +1 -1
  39. data/lib/new_relic/agent/connect/request_builder.rb +1 -1
  40. data/lib/new_relic/agent/connect/response_handler.rb +1 -1
  41. data/lib/new_relic/agent/custom_event_aggregator.rb +1 -1
  42. data/lib/new_relic/agent/database.rb +1 -1
  43. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  44. data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -1
  45. data/lib/new_relic/agent/database/obfuscator.rb +1 -1
  46. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +1 -1
  47. data/lib/new_relic/agent/datastores.rb +1 -1
  48. data/lib/new_relic/agent/datastores/metric_helper.rb +1 -1
  49. data/lib/new_relic/agent/datastores/mongo.rb +1 -1
  50. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +1 -1
  51. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -1
  52. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +1 -1
  53. data/lib/new_relic/agent/datastores/mongo/statement_formatter.rb +1 -1
  54. data/lib/new_relic/agent/datastores/redis.rb +1 -1
  55. data/lib/new_relic/agent/deprecator.rb +1 -1
  56. data/lib/new_relic/agent/distributed_tracing.rb +1 -1
  57. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +1 -1
  58. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +1 -1
  59. data/lib/new_relic/agent/distributed_tracing/{distributed_trace_intrinsics.rb → distributed_trace_attributes.rb} +9 -5
  60. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +1 -1
  61. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -1
  62. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +1 -1
  63. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +1 -1
  64. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +1 -1
  65. data/lib/new_relic/agent/encoding_normalizer.rb +1 -1
  66. data/lib/new_relic/agent/error_collector.rb +1 -1
  67. data/lib/new_relic/agent/error_event_aggregator.rb +1 -1
  68. data/lib/new_relic/agent/error_trace_aggregator.rb +1 -1
  69. data/lib/new_relic/agent/event_aggregator.rb +1 -1
  70. data/lib/new_relic/agent/event_buffer.rb +1 -1
  71. data/lib/new_relic/agent/event_listener.rb +1 -1
  72. data/lib/new_relic/agent/event_loop.rb +1 -1
  73. data/lib/new_relic/agent/external.rb +1 -1
  74. data/lib/new_relic/agent/guid_generator.rb +1 -1
  75. data/lib/new_relic/agent/harvester.rb +1 -1
  76. data/lib/new_relic/agent/heap.rb +1 -1
  77. data/lib/new_relic/agent/hostname.rb +1 -1
  78. data/lib/new_relic/agent/http_clients/abstract.rb +1 -1
  79. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +1 -1
  80. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +1 -1
  81. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -1
  82. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +1 -1
  83. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +1 -1
  84. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +1 -1
  85. data/lib/new_relic/agent/http_clients/uri_util.rb +1 -1
  86. data/lib/new_relic/agent/instrumentation.rb +1 -1
  87. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +1 -1
  88. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +1 -1
  89. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +1 -1
  90. data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
  91. data/lib/new_relic/agent/instrumentation/active_merchant.rb +1 -1
  92. data/lib/new_relic/agent/instrumentation/active_record.rb +84 -39
  93. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +82 -24
  94. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +1 -1
  95. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +92 -34
  96. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +1 -1
  97. data/lib/new_relic/agent/instrumentation/active_storage.rb +1 -1
  98. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +1 -1
  99. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +24 -8
  100. data/lib/new_relic/agent/instrumentation/authlogic.rb +1 -1
  101. data/lib/new_relic/agent/instrumentation/bunny.rb +74 -28
  102. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +1 -1
  103. data/lib/new_relic/agent/instrumentation/curb.rb +34 -10
  104. data/lib/new_relic/agent/instrumentation/data_mapper.rb +1 -1
  105. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +61 -25
  106. data/lib/new_relic/agent/instrumentation/excon.rb +1 -1
  107. data/lib/new_relic/agent/instrumentation/excon/connection.rb +1 -1
  108. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +1 -1
  109. data/lib/new_relic/agent/instrumentation/grape.rb +1 -1
  110. data/lib/new_relic/agent/instrumentation/http.rb +1 -1
  111. data/lib/new_relic/agent/instrumentation/httpclient.rb +1 -1
  112. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  113. data/lib/new_relic/agent/instrumentation/memcache.rb +1 -1
  114. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +1 -1
  115. data/lib/new_relic/agent/instrumentation/merb/controller.rb +1 -1
  116. data/lib/new_relic/agent/instrumentation/merb/errors.rb +1 -1
  117. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +12 -4
  118. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +9 -7
  119. data/lib/new_relic/agent/instrumentation/mongo.rb +1 -1
  120. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +25 -5
  121. data/lib/new_relic/agent/instrumentation/net.rb +58 -24
  122. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +1 -1
  123. data/lib/new_relic/agent/instrumentation/padrino.rb +40 -16
  124. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +1 -1
  125. data/lib/new_relic/agent/instrumentation/queue_time.rb +1 -1
  126. data/lib/new_relic/agent/instrumentation/rack.rb +36 -13
  127. data/lib/new_relic/agent/instrumentation/rails/action_controller.rb +1 -1
  128. data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb +1 -1
  129. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +1 -1
  130. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  131. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +1 -1
  132. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +1 -1
  133. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +1 -1
  134. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +1 -1
  135. data/lib/new_relic/agent/instrumentation/rake.rb +54 -20
  136. data/lib/new_relic/agent/instrumentation/redis.rb +138 -59
  137. data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
  138. data/lib/new_relic/agent/instrumentation/sequel.rb +1 -1
  139. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +1 -1
  140. data/lib/new_relic/agent/instrumentation/sidekiq.rb +5 -5
  141. data/lib/new_relic/agent/instrumentation/sinatra.rb +62 -23
  142. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
  143. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  144. data/lib/new_relic/agent/instrumentation/sunspot.rb +1 -1
  145. data/lib/new_relic/agent/instrumentation/typhoeus.rb +1 -1
  146. data/lib/new_relic/agent/internal_agent_error.rb +1 -1
  147. data/lib/new_relic/agent/javascript_instrumentor.rb +1 -1
  148. data/lib/new_relic/agent/log_once.rb +1 -1
  149. data/lib/new_relic/agent/logging.rb +1 -1
  150. data/lib/new_relic/agent/memory_logger.rb +1 -1
  151. data/lib/new_relic/agent/messaging.rb +1 -1
  152. data/lib/new_relic/agent/method_tracer.rb +1 -1
  153. data/lib/new_relic/agent/method_tracer_helpers.rb +1 -1
  154. data/lib/new_relic/agent/monitors.rb +1 -1
  155. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +1 -1
  156. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
  157. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +1 -1
  158. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +1 -1
  159. data/lib/new_relic/agent/new_relic_service.rb +1 -1
  160. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  161. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +1 -1
  162. data/lib/new_relic/agent/new_relic_service/marshaller.rb +1 -1
  163. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +1 -1
  164. data/lib/new_relic/agent/noticible_error.rb +1 -1
  165. data/lib/new_relic/agent/null_logger.rb +1 -1
  166. data/lib/new_relic/agent/obfuscator.rb +1 -1
  167. data/lib/new_relic/agent/parameter_filtering.rb +1 -1
  168. data/lib/new_relic/agent/payload_metric_mapping.rb +1 -1
  169. data/lib/new_relic/agent/pipe_channel_manager.rb +1 -1
  170. data/lib/new_relic/agent/pipe_service.rb +1 -1
  171. data/lib/new_relic/agent/prepend_supportability.rb +1 -1
  172. data/lib/new_relic/agent/priority_sampled_buffer.rb +8 -5
  173. data/lib/new_relic/agent/range_extensions.rb +1 -1
  174. data/lib/new_relic/agent/rules_engine.rb +1 -1
  175. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +1 -1
  176. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +1 -1
  177. data/lib/new_relic/agent/sampler.rb +1 -1
  178. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  179. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  180. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +1 -1
  181. data/lib/new_relic/agent/samplers/memory_sampler.rb +1 -1
  182. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  183. data/lib/new_relic/agent/samplers/vm_sampler.rb +1 -1
  184. data/lib/new_relic/agent/span_event_aggregator.rb +1 -1
  185. data/lib/new_relic/agent/span_event_primitive.rb +24 -5
  186. data/lib/new_relic/agent/sql_sampler.rb +4 -4
  187. data/lib/new_relic/agent/stats.rb +1 -1
  188. data/lib/new_relic/agent/stats_engine.rb +1 -1
  189. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -1
  190. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -1
  191. data/lib/new_relic/agent/supported_versions.rb +1 -1
  192. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
  193. data/lib/new_relic/agent/system_info.rb +1 -1
  194. data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
  195. data/lib/new_relic/agent/threading/backtrace_node.rb +1 -1
  196. data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
  197. data/lib/new_relic/agent/threading/thread_profile.rb +1 -1
  198. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  199. data/lib/new_relic/agent/tracer.rb +1 -1
  200. data/lib/new_relic/agent/transaction.rb +20 -3
  201. data/lib/new_relic/agent/transaction/abstract_segment.rb +3 -2
  202. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  203. data/lib/new_relic/agent/transaction/distributed_tracer.rb +3 -3
  204. data/lib/new_relic/agent/transaction/distributed_tracing.rb +2 -2
  205. data/lib/new_relic/agent/transaction/external_request_segment.rb +1 -1
  206. data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
  207. data/lib/new_relic/agent/transaction/request_attributes.rb +1 -1
  208. data/lib/new_relic/agent/transaction/segment.rb +18 -2
  209. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +1 -1
  210. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  211. data/lib/new_relic/agent/transaction/trace.rb +1 -1
  212. data/lib/new_relic/agent/transaction/trace_builder.rb +1 -1
  213. data/lib/new_relic/agent/transaction/trace_context.rb +1 -1
  214. data/lib/new_relic/agent/transaction/trace_node.rb +1 -1
  215. data/lib/new_relic/agent/transaction/tracing.rb +1 -1
  216. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  217. data/lib/new_relic/agent/transaction_error_primitive.rb +3 -3
  218. data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
  219. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
  220. data/lib/new_relic/agent/transaction_event_recorder.rb +1 -1
  221. data/lib/new_relic/agent/transaction_metrics.rb +1 -1
  222. data/lib/new_relic/agent/transaction_sampler.rb +1 -1
  223. data/lib/new_relic/agent/transaction_time_aggregator.rb +1 -1
  224. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  225. data/lib/new_relic/agent/utilization/azure.rb +1 -1
  226. data/lib/new_relic/agent/utilization/gcp.rb +1 -1
  227. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  228. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  229. data/lib/new_relic/agent/utilization_data.rb +1 -1
  230. data/lib/new_relic/agent/vm.rb +1 -1
  231. data/lib/new_relic/agent/vm/jruby_vm.rb +1 -1
  232. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  233. data/lib/new_relic/agent/vm/mri_vm.rb +1 -1
  234. data/lib/new_relic/agent/vm/snapshot.rb +1 -1
  235. data/lib/new_relic/agent/worker_loop.rb +1 -1
  236. data/lib/new_relic/cli/command.rb +1 -1
  237. data/lib/new_relic/cli/commands/deployments.rb +1 -1
  238. data/lib/new_relic/cli/commands/install.rb +1 -1
  239. data/lib/new_relic/coerce.rb +1 -1
  240. data/lib/new_relic/collection_helper.rb +1 -1
  241. data/lib/new_relic/constants.rb +1 -1
  242. data/lib/new_relic/control.rb +1 -1
  243. data/lib/new_relic/control/class_methods.rb +1 -1
  244. data/lib/new_relic/control/frameworks.rb +1 -1
  245. data/lib/new_relic/control/frameworks/external.rb +1 -1
  246. data/lib/new_relic/control/frameworks/merb.rb +1 -1
  247. data/lib/new_relic/control/frameworks/rails.rb +1 -1
  248. data/lib/new_relic/control/frameworks/rails3.rb +1 -1
  249. data/lib/new_relic/control/frameworks/rails4.rb +1 -1
  250. data/lib/new_relic/control/frameworks/rails_notifications.rb +1 -1
  251. data/lib/new_relic/control/frameworks/ruby.rb +1 -1
  252. data/lib/new_relic/control/frameworks/sinatra.rb +1 -1
  253. data/lib/new_relic/control/instance_methods.rb +1 -1
  254. data/lib/new_relic/control/instrumentation.rb +1 -1
  255. data/lib/new_relic/control/server_methods.rb +1 -1
  256. data/lib/new_relic/delayed_job_injection.rb +1 -1
  257. data/lib/new_relic/dependency_detection.rb +1 -1
  258. data/lib/new_relic/environment_report.rb +1 -1
  259. data/lib/new_relic/helper.rb +1 -1
  260. data/lib/new_relic/language_support.rb +1 -1
  261. data/lib/new_relic/latest_changes.rb +2 -2
  262. data/lib/new_relic/local_environment.rb +1 -1
  263. data/lib/new_relic/metric_data.rb +1 -1
  264. data/lib/new_relic/metric_spec.rb +1 -1
  265. data/lib/new_relic/metrics.rb +1 -1
  266. data/lib/new_relic/noticed_error.rb +1 -1
  267. data/lib/new_relic/rack.rb +1 -1
  268. data/lib/new_relic/rack/agent_hooks.rb +1 -1
  269. data/lib/new_relic/rack/agent_middleware.rb +1 -1
  270. data/lib/new_relic/rack/browser_monitoring.rb +1 -1
  271. data/lib/new_relic/recipes.rb +1 -1
  272. data/lib/new_relic/recipes/capistrano3.rb +1 -1
  273. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -1
  274. data/lib/new_relic/supportability_helper.rb +1 -1
  275. data/lib/new_relic/version.rb +2 -2
  276. data/lib/newrelic_rpm.rb +1 -1
  277. data/lib/sequel/extensions/newrelic_instrumentation.rb +1 -1
  278. data/lib/sequel/plugins/newrelic_instrumentation.rb +1 -1
  279. data/lib/tasks/all.rb +1 -1
  280. data/lib/tasks/multiverse.rb +1 -1
  281. data/lib/tasks/newrelic.rb +1 -1
  282. data/newrelic_rpm.gemspec +8 -6
  283. data/recipes/newrelic.rb +1 -1
  284. data/test/agent_helper.rb +19 -11
  285. metadata +13 -10
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  module NewRelic
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require 'json'
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  module NewRelic
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require_relative 'trace_context_payload'
@@ -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/coerce'
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
  # This module was extracted from NewRelic::JSONWrapper
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/error_trace_aggregator'
5
5
  require 'new_relic/agent/error_event_aggregator'
6
6
 
@@ -1,7 +1,7 @@
1
1
  # -*- ruby -*-
2
2
  # encoding: utf-8
3
3
  # This file is distributed under New Relic's license terms.
4
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
4
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
5
  # frozen_string_literal: true
6
6
 
7
7
  require 'new_relic/agent/event_aggregator'
@@ -1,7 +1,7 @@
1
1
  # -*- ruby -*-
2
2
  # encoding: utf-8
3
3
  # This file is distributed under New Relic's license terms.
4
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
4
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
5
 
6
6
  module NewRelic
7
7
  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/priority_sampled_buffer'
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
  # EventBuffer is intended to be an abstract base class. It should not be
6
6
  # instantiated directly. Subclasses should define an `append_event` method
@@ -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::Agent
6
6
  # Basic mechanism for the agent instance to provide agent-wide eventing.
@@ -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 'thread'
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/transaction/tracing'
6
6
  require 'new_relic/agent/distributed_tracing/cross_app_tracing'
@@ -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
  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
  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
  require 'socket'
5
5
 
6
6
  module NewRelic
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  module NewRelic
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require_relative 'abstract'
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require_relative 'abstract'
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require_relative 'abstract'
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require_relative 'abstract'
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require_relative 'abstract'
@@ -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
  # frozen_string_literal: true
5
5
 
6
6
  require_relative 'abstract'
@@ -1,7 +1,7 @@
1
1
  # -*- ruby -*-
2
2
  # encoding: utf-8
3
3
  # This file is distributed under New Relic's license terms.
4
- # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
4
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
5
  # frozen_string_literal: true
6
6
 
7
7
  # This module includes utilities for manipulating URIs, particularly from the
@@ -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'
6
6
  module NewRelic
@@ -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/notifications_subscriber'
5
5
 
6
6
  module NewRelic
@@ -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/notifications_subscriber'
5
5
  require 'new_relic/agent/instrumentation/ignore_actions'
6
6
  require 'new_relic/agent/parameter_filtering'
@@ -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/notifications_subscriber'
5
5
 
6
6
  # Listen for ActiveSupport::Notifications events for ActionView render
@@ -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/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 = :active_merchant
@@ -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/active_record_prepend'
6
6
 
@@ -43,46 +43,91 @@ module NewRelic
43
43
  end
44
44
  end
45
45
 
46
- def log_with_newrelic_instrumentation(*args, &block)
47
- state = NewRelic::Agent::Tracer.state
48
-
49
- if !state.is_execution_traced?
50
- return log_without_newrelic_instrumentation(*args, &block)
51
- end
52
-
53
- sql, name, _ = args
54
-
55
- product, operation, collection = ActiveRecordHelper.product_operation_collection_for(
56
- NewRelic::Helper.correctly_encoded(name),
57
- NewRelic::Helper.correctly_encoded(sql),
58
- @config && @config[:adapter])
59
-
60
- host = nil
61
- port_path_or_id = nil
62
- database = nil
63
-
64
- if ActiveRecordHelper::InstanceIdentification.supported_adapter?(@config)
65
- host = ActiveRecordHelper::InstanceIdentification.host(@config)
66
- port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(@config)
67
- database = @config && @config[:database]
46
+ if RUBY_VERSION < "2.7.0"
47
+ def log_with_newrelic_instrumentation(*args, &block)
48
+ state = NewRelic::Agent::Tracer.state
49
+
50
+ if !state.is_execution_traced?
51
+ return log_without_newrelic_instrumentation(*args, &block)
52
+ end
53
+
54
+ sql, name, _ = args
55
+
56
+ product, operation, collection = ActiveRecordHelper.product_operation_collection_for(
57
+ NewRelic::Helper.correctly_encoded(name),
58
+ NewRelic::Helper.correctly_encoded(sql),
59
+ @config && @config[:adapter])
60
+
61
+ host = nil
62
+ port_path_or_id = nil
63
+ database = nil
64
+
65
+ if ActiveRecordHelper::InstanceIdentification.supported_adapter?(@config)
66
+ host = ActiveRecordHelper::InstanceIdentification.host(@config)
67
+ port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(@config)
68
+ database = @config && @config[:database]
69
+ end
70
+
71
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
72
+ product: product,
73
+ operation: operation,
74
+ collection: collection,
75
+ host: host,
76
+ port_path_or_id: port_path_or_id,
77
+ database_name: database
78
+ )
79
+ segment._notice_sql(sql, @config, EXPLAINER)
80
+
81
+ begin
82
+ NewRelic::Agent::Tracer.capture_segment_error segment do
83
+ log_without_newrelic_instrumentation(*args, &block)
84
+ end
85
+ ensure
86
+ segment.finish if segment
87
+ end
68
88
  end
69
-
70
- segment = NewRelic::Agent::Tracer.start_datastore_segment(
71
- product: product,
72
- operation: operation,
73
- collection: collection,
74
- host: host,
75
- port_path_or_id: port_path_or_id,
76
- database_name: database
77
- )
78
- segment._notice_sql(sql, @config, EXPLAINER)
79
-
80
- begin
81
- NewRelic::Agent::Tracer.capture_segment_error segment do
82
- log_without_newrelic_instrumentation(*args, &block)
89
+ else
90
+ def log_with_newrelic_instrumentation(*args, **kwargs, &block)
91
+ state = NewRelic::Agent::Tracer.state
92
+
93
+ if !state.is_execution_traced?
94
+ return log_without_newrelic_instrumentation(*args, **kwargs, &block)
95
+ end
96
+
97
+ sql, name, _ = args
98
+
99
+ product, operation, collection = ActiveRecordHelper.product_operation_collection_for(
100
+ NewRelic::Helper.correctly_encoded(name),
101
+ NewRelic::Helper.correctly_encoded(sql),
102
+ @config && @config[:adapter])
103
+
104
+ host = nil
105
+ port_path_or_id = nil
106
+ database = nil
107
+
108
+ if ActiveRecordHelper::InstanceIdentification.supported_adapter?(@config)
109
+ host = ActiveRecordHelper::InstanceIdentification.host(@config)
110
+ port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(@config)
111
+ database = @config && @config[:database]
112
+ end
113
+
114
+ segment = NewRelic::Agent::Tracer.start_datastore_segment(
115
+ product: product,
116
+ operation: operation,
117
+ collection: collection,
118
+ host: host,
119
+ port_path_or_id: port_path_or_id,
120
+ database_name: database
121
+ )
122
+ segment._notice_sql(sql, @config, EXPLAINER)
123
+
124
+ begin
125
+ NewRelic::Agent::Tracer.capture_segment_error segment do
126
+ log_without_newrelic_instrumentation(*args, **kwargs, &block)
127
+ end
128
+ ensure
129
+ segment.finish if segment
83
130
  end
84
- ensure
85
- segment.finish if segment
86
131
  end
87
132
  end
88
133
  end
@@ -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/metric_helper'
6
6
 
@@ -19,20 +19,38 @@ module NewRelic
19
19
  def instrument_save_methods
20
20
  ::ActiveRecord::Base.class_eval do
21
21
  alias_method :save_without_newrelic, :save
22
-
23
- def save(*args, &blk)
24
- ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
25
- save_without_newrelic(*args, &blk)
22
+
23
+ if RUBY_VERSION < "2.7.0"
24
+ def save(*args, &blk)
25
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
26
+ save_without_newrelic(*args, &blk)
27
+ end
28
+ end
29
+ else
30
+ def save(*args, **kwargs, &blk)
31
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
32
+ save_without_newrelic(*args, **kwargs, &blk)
33
+ end
26
34
  end
35
+
27
36
  end
28
37
 
29
38
  alias_method :save_without_newrelic!, :save!
30
39
 
31
- def save!(*args, &blk)
32
- ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
33
- save_without_newrelic!(*args, &blk)
40
+ if RUBY_VERSION < "2.7.0"
41
+ def save!(*args, &blk)
42
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
43
+ save_without_newrelic!(*args, &blk)
44
+ end
45
+ end
46
+ else
47
+ def save!(*args, **kwargs, &blk)
48
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
49
+ save_without_newrelic!(*args, **kwargs, &blk)
50
+ end
34
51
  end
35
52
  end
53
+
36
54
  end
37
55
  end
38
56
 
@@ -40,42 +58,82 @@ module NewRelic
40
58
  ::ActiveRecord::Relation.class_eval do
41
59
  alias_method :update_all_without_newrelic, :update_all
42
60
 
43
- def update_all(*args, &blk)
44
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
45
- update_all_without_newrelic(*args, &blk)
61
+ if RUBY_VERSION < "2.7.0"
62
+ def update_all(*args, &blk)
63
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
64
+ update_all_without_newrelic(*args, &blk)
65
+ end
66
+ end
67
+ else
68
+ def update_all(*args, **kwargs, &blk)
69
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
70
+ update_all_without_newrelic(*args, **kwargs, &blk)
71
+ end
46
72
  end
47
73
  end
48
-
74
+
49
75
  alias_method :delete_all_without_newrelic, :delete_all
50
76
 
51
- def delete_all(*args, &blk)
52
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
53
- delete_all_without_newrelic(*args, &blk)
77
+ if RUBY_VERSION < "2.7.0"
78
+ def delete_all(*args, &blk)
79
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
80
+ delete_all_without_newrelic(*args, &blk)
81
+ end
82
+ end
83
+ else
84
+ def delete_all(*args, **kwargs, &blk)
85
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
86
+ delete_all_without_newrelic(*args, **kwargs, &blk)
87
+ end
54
88
  end
55
89
  end
56
90
 
57
91
  alias_method :destroy_all_without_newrelic, :destroy_all
58
92
 
59
- def destroy_all(*args, &blk)
60
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
61
- destroy_all_without_newrelic(*args, &blk)
93
+ if RUBY_VERSION < "2.7.0"
94
+ def destroy_all(*args, &blk)
95
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
96
+ destroy_all_without_newrelic(*args, &blk)
97
+ end
98
+ end
99
+ else
100
+ def destroy_all(*args, **kwargs, &blk)
101
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
102
+ destroy_all_without_newrelic(*args, **kwargs, &blk)
103
+ end
62
104
  end
63
105
  end
64
106
 
65
107
  alias_method :calculate_without_newrelic, :calculate
66
108
 
67
- def calculate(*args, &blk)
68
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
69
- calculate_without_newrelic(*args, &blk)
109
+ if RUBY_VERSION < "2.7.0"
110
+ def calculate(*args, &blk)
111
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
112
+ calculate_without_newrelic(*args, &blk)
113
+ end
114
+ end
115
+ else
116
+ def calculate(*args, **kwargs, &blk)
117
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
118
+ calculate_without_newrelic(*args, **kwargs, &blk)
119
+ end
70
120
  end
71
121
  end
72
122
 
73
123
  if method_defined?(:pluck)
74
124
  alias_method :pluck_without_newrelic, :pluck
75
125
 
76
- def pluck(*args, &blk)
77
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
78
- pluck_without_newrelic(*args, &blk)
126
+ if RUBY_VERSION < "2.7.0"
127
+ def pluck(*args, &blk)
128
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
129
+ pluck_without_newrelic(*args, &blk)
130
+ end
131
+ end
132
+ else
133
+ def pluck(*args, **kwargs, &blk)
134
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
135
+ pluck_without_newrelic(*args, **kwargs, &blk)
136
+ end
79
137
  end
80
138
  end
81
139
  end