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
 
5
5
  require 'new_relic/agent/instrumentation/active_record_subscriber'
6
6
  require 'new_relic/agent/instrumentation/active_record_prepend'
@@ -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
 
@@ -11,16 +11,31 @@ module NewRelic
11
11
  ACTIVE_RECORD = 'ActiveRecord'.freeze
12
12
 
13
13
  module BaseExtensions
14
- def save(*args, &blk)
15
- ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
16
- super
14
+
15
+ if RUBY_VERSION < "2.7.0"
16
+ def save(*args, &blk)
17
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
18
+ super
19
+ end
20
+ end
21
+ def save!(*args, &blk)
22
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
23
+ super
24
+ end
17
25
  end
18
- end
19
26
 
20
- def save!(*args, &blk)
21
- ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
22
- super
27
+ else
28
+ def save(*args, **kwargs, &blk)
29
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
30
+ super
31
+ end
23
32
  end
33
+ def save!(*args, **kwargs, &blk)
34
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
35
+ super
36
+ end
37
+ end
38
+
24
39
  end
25
40
  end
26
41
 
@@ -30,42 +45,85 @@ module NewRelic
30
45
  # Starting in v5.1.6, this call no longer happens. We'll
31
46
  # have to set the database metrics explicitly now.
32
47
  #
33
- def touch(*args, &blk)
34
- ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
35
- super
48
+ if RUBY_VERSION < "2.7.0"
49
+ def touch(*args, **kwargs, &blk)
50
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
51
+ super
52
+ end
53
+ end
54
+ else
55
+ def touch(*args, **kwargs, &blk)
56
+ ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
57
+ super
58
+ end
36
59
  end
37
60
  end
61
+
38
62
  end
39
63
 
40
64
  module RelationExtensions
41
- def update_all(*args, &blk)
42
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
43
- super
65
+ if RUBY_VERSION < "2.7.0"
66
+ def update_all(*args, &blk)
67
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
68
+ super
69
+ end
44
70
  end
45
- end
46
-
47
- def delete_all(*args, &blk)
48
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
49
- super
71
+
72
+ def delete_all(*args, &blk)
73
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
74
+ super
75
+ end
50
76
  end
51
- end
52
-
53
- def destroy_all(*args, &blk)
54
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
55
- super
77
+
78
+ def destroy_all(*args, &blk)
79
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
80
+ super
81
+ end
56
82
  end
57
- end
58
-
59
- def calculate(*args, &blk)
60
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
61
- super
83
+
84
+ def calculate(*args, &blk)
85
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
86
+ super
87
+ end
62
88
  end
63
- end
64
-
65
- def pluck(*args, &blk)
66
- ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
67
- super
89
+
90
+ def pluck(*args, &blk)
91
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
92
+ super
93
+ end
94
+ end
95
+
96
+ else
97
+ def update_all(*args, **kwargs, &blk)
98
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
99
+ super
100
+ end
68
101
  end
102
+
103
+ def delete_all(*args, **kwargs, &blk)
104
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
105
+ super
106
+ end
107
+ end
108
+
109
+ def destroy_all(*args, **kwargs, &blk)
110
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
111
+ super
112
+ end
113
+ end
114
+
115
+ def calculate(*args, **kwargs, &blk)
116
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
117
+ super
118
+ end
119
+ end
120
+
121
+ def pluck(*args, **kwargs, &blk)
122
+ ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
123
+ super
124
+ end
125
+ end
126
+
69
127
  end
70
128
  end
71
129
  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
  require 'new_relic/agent/instrumentation/active_record_helper'
5
5
  require 'new_relic/agent/instrumentation/notifications_subscriber'
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/active_storage_subscriber'
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/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
 
5
5
  require 'new_relic/agent/database'
6
6
 
@@ -8,15 +8,31 @@ module NewRelic
8
8
  module Instrumentation
9
9
  module ActsAsSolrInstrumentation
10
10
  module ParserMethodsInstrumentation
11
- def parse_query_with_newrelic(*args)
12
- self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
13
- begin
14
- parse_query_without_newrelic(*args)
15
- ensure
16
- return unless txn = ::NewRelic::Agent::Tracer.current_transaction
17
- txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
11
+
12
+ if RUBY_VERSION < "2.7.0"
13
+ def parse_query_with_newrelic(*args)
14
+ self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
15
+ begin
16
+ parse_query_without_newrelic(*args)
17
+ ensure
18
+ return unless txn = ::NewRelic::Agent::Tracer.current_transaction
19
+ txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
20
+ end
21
+ end
22
+ end
23
+
24
+ else
25
+ def parse_query_with_newrelic(*args, **kwargs)
26
+ self.class.trace_execution_scoped(["SolrClient/ActsAsSolr/query"]) do
27
+ begin
28
+ parse_query_without_newrelic(*args, **kwargs)
29
+ ensure
30
+ return unless txn = ::NewRelic::Agent::Tracer.current_transaction
31
+ txn.current_segment.params[:statement] = ::NewRelic::Agent::Database.truncate_query(args.first.inspect) rescue nil
32
+ end
18
33
  end
19
34
  end
35
+
20
36
  end
21
37
  end
22
38
  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
  DependencyDetection.defer do
6
6
  @name = :authlogic
@@ -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
  DependencyDetection.defer do
@@ -100,46 +100,92 @@ DependencyDetection.defer do
100
100
 
101
101
  alias_method :purge_without_new_relic, :purge
102
102
 
103
- def purge *args
104
- begin
105
- type = server_named? ? :temporary_queue : :queue
106
- segment = NewRelic::Agent::Tracer.start_message_broker_segment(
107
- action: :purge,
108
- library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
109
- destination_type: type,
110
- destination_name: name
111
- )
112
- rescue => e
113
- NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
114
- purge_without_new_relic(*args)
115
- else
116
- NewRelic::Agent::Tracer.capture_segment_error segment do
103
+ if RUBY_VERSION < "2.7.0"
104
+ def purge *args
105
+ begin
106
+ type = server_named? ? :temporary_queue : :queue
107
+ segment = NewRelic::Agent::Tracer.start_message_broker_segment(
108
+ action: :purge,
109
+ library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
110
+ destination_type: type,
111
+ destination_name: name
112
+ )
113
+ rescue => e
114
+ NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
117
115
  purge_without_new_relic(*args)
116
+ else
117
+ NewRelic::Agent::Tracer.capture_segment_error segment do
118
+ purge_without_new_relic(*args)
119
+ end
120
+ ensure
121
+ segment.finish if segment
122
+ end
123
+ end
124
+
125
+ else
126
+ def purge *args, **kwargs
127
+ begin
128
+ type = server_named? ? :temporary_queue : :queue
129
+ segment = NewRelic::Agent::Tracer.start_message_broker_segment(
130
+ action: :purge,
131
+ library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
132
+ destination_type: type,
133
+ destination_name: name
134
+ )
135
+ rescue => e
136
+ NewRelic::Agent.logger.error "Error starting message broker segment in Bunny::Queue#purge", e
137
+ purge_without_new_relic(*args, **kwargs)
138
+ else
139
+ NewRelic::Agent::Tracer.capture_segment_error segment do
140
+ purge_without_new_relic(*args, **kwargs)
141
+ end
142
+ ensure
143
+ segment.finish if segment
118
144
  end
119
- ensure
120
- segment.finish if segment
121
145
  end
122
146
  end
147
+
123
148
  end
124
149
 
125
150
  class Consumer
126
151
  alias_method :call_without_new_relic, :call
127
152
 
128
- def call *args
129
- delivery_info, message_properties, _ = args
130
- queue_name = queue.respond_to?(:name) ? queue.name : queue
153
+ if RUBY_VERSION < "2.7.0"
154
+ def call *args
155
+ delivery_info, message_properties, _ = args
156
+ queue_name = queue.respond_to?(:name) ? queue.name : queue
157
+
158
+ NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
159
+ library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
160
+ destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
161
+ delivery_info: delivery_info,
162
+ message_properties: message_properties,
163
+ exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
164
+ queue_name: queue_name) do
165
+
166
+ call_without_new_relic(*args)
167
+ end
168
+ end
169
+ else
170
+ def call *args, **kwargs
171
+ delivery_info, message_properties, _ = args
172
+ queue_name = queue.respond_to?(:name) ? queue.name : queue
131
173
 
132
- NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
133
- library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
134
- destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
135
- delivery_info: delivery_info,
136
- message_properties: message_properties,
137
- exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
138
- queue_name: queue_name) do
174
+ NewRelic::Agent::Messaging.wrap_amqp_consume_transaction(
175
+ library: NewRelic::Agent::Instrumentation::Bunny::LIBRARY,
176
+ destination_name: NewRelic::Agent::Instrumentation::Bunny.exchange_name(delivery_info.exchange),
177
+ delivery_info: delivery_info,
178
+ message_properties: message_properties,
179
+ exchange_type: NewRelic::Agent::Instrumentation::Bunny.exchange_type(delivery_info, channel),
180
+ queue_name: queue_name) do
139
181
 
140
- call_without_new_relic(*args)
182
+ call_without_new_relic(*args, **kwargs)
183
+ end
141
184
  end
142
185
  end
186
+
187
+
188
+
143
189
  end
144
190
  end
145
191
  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/transaction'
6
6
  require 'new_relic/agent/instrumentation/queue_time'
@@ -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
  named :curb
@@ -32,24 +32,48 @@ DependencyDetection.defer do
32
32
 
33
33
  # We have to hook these three methods separately, as they don't use
34
34
  # Curl::Easy#http
35
- def http_head_with_newrelic(*args, &blk)
36
- self._nr_http_verb = :HEAD
37
- http_head_without_newrelic(*args, &blk)
35
+ if RUBY_VERSION < "2.7.0"
36
+ def http_head_with_newrelic(*args, &blk)
37
+ self._nr_http_verb = :HEAD
38
+ http_head_without_newrelic(*args, &blk)
39
+ end
40
+ else
41
+ def http_head_with_newrelic(*args, **kwargs, &blk)
42
+ self._nr_http_verb = :HEAD
43
+ http_head_without_newrelic(*args, **kwargs, &blk)
44
+ end
38
45
  end
46
+
39
47
  alias_method :http_head_without_newrelic, :http_head
40
48
  alias_method :http_head, :http_head_with_newrelic
41
49
 
42
- def http_post_with_newrelic(*args, &blk)
43
- self._nr_http_verb = :POST
44
- http_post_without_newrelic(*args, &blk)
50
+ if RUBY_VERSION < "2.7.0"
51
+ def http_post_with_newrelic(*args, &blk)
52
+ self._nr_http_verb = :POST
53
+ http_post_without_newrelic(*args, &blk)
54
+ end
55
+ else
56
+ def http_post_with_newrelic(*args, **kwargs, &blk)
57
+ self._nr_http_verb = :POST
58
+ http_post_without_newrelic(*args, **kwargs, &blk)
59
+ end
45
60
  end
61
+
46
62
  alias_method :http_post_without_newrelic, :http_post
47
63
  alias_method :http_post, :http_post_with_newrelic
48
64
 
49
- def http_put_with_newrelic(*args, &blk)
50
- self._nr_http_verb = :PUT
51
- http_put_without_newrelic(*args, &blk)
65
+ if RUBY_VERSION < "2.7.0"
66
+ def http_put_with_newrelic(*args, &blk)
67
+ self._nr_http_verb = :PUT
68
+ http_put_without_newrelic(*args, &blk)
69
+ end
70
+ else
71
+ def http_put_with_newrelic(*args, **kwargs, &blk)
72
+ self._nr_http_verb = :PUT
73
+ http_put_without_newrelic(*args, **kwargs, &blk)
74
+ end
52
75
  end
76
+
53
77
  alias_method :http_put_without_newrelic, :http_put
54
78
  alias_method :http_put, :http_put_with_newrelic
55
79