newrelic_rpm 8.16.0 → 9.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (243) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +3 -41
  4. data/.rubocop_todo.yml +13 -14
  5. data/.simplecov +1 -1
  6. data/CHANGELOG.md +184 -0
  7. data/CONTRIBUTING.md +1 -1
  8. data/Gemfile +1 -1
  9. data/Guardfile +7 -7
  10. data/README.md +3 -2
  11. data/Rakefile +8 -8
  12. data/Thorfile +1 -1
  13. data/bin/nrdebug +36 -36
  14. data/init.rb +1 -1
  15. data/lib/new_relic/agent/agent.rb +3 -16
  16. data/lib/new_relic/agent/agent_helpers/connect.rb +5 -10
  17. data/lib/new_relic/agent/agent_helpers/harvest.rb +4 -4
  18. data/lib/new_relic/agent/agent_helpers/shutdown.rb +5 -5
  19. data/lib/new_relic/agent/agent_helpers/special_startup.rb +3 -4
  20. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +47 -39
  21. data/lib/new_relic/agent/agent_helpers/startup.rb +13 -13
  22. data/lib/new_relic/agent/agent_helpers/transmit.rb +6 -6
  23. data/lib/new_relic/agent/agent_logger.rb +9 -9
  24. data/lib/new_relic/agent/attribute_filter.rb +2 -4
  25. data/lib/new_relic/agent/attribute_processing.rb +2 -2
  26. data/lib/new_relic/agent/audit_logger.rb +5 -5
  27. data/lib/new_relic/agent/autostart.rb +1 -1
  28. data/lib/new_relic/agent/commands/agent_command.rb +2 -2
  29. data/lib/new_relic/agent/commands/agent_command_router.rb +5 -4
  30. data/lib/new_relic/agent/commands/thread_profiler_session.rb +8 -8
  31. data/lib/new_relic/agent/configuration/default_source.rb +155 -530
  32. data/lib/new_relic/agent/configuration/environment_source.rb +2 -2
  33. data/lib/new_relic/agent/configuration/high_security_source.rb +3 -5
  34. data/lib/new_relic/agent/configuration/manager.rb +2 -2
  35. data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -26
  36. data/lib/new_relic/agent/configuration/server_source.rb +24 -24
  37. data/lib/new_relic/agent/configuration/yaml_source.rb +4 -4
  38. data/lib/new_relic/agent/connect/request_builder.rb +1 -1
  39. data/lib/new_relic/agent/connect/response_handler.rb +1 -1
  40. data/lib/new_relic/agent/custom_event_aggregator.rb +4 -4
  41. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  42. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  43. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  44. data/lib/new_relic/agent/database.rb +4 -18
  45. data/lib/new_relic/agent/datastores/metric_helper.rb +5 -5
  46. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +11 -11
  47. data/lib/new_relic/agent/datastores/redis.rb +6 -6
  48. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +8 -10
  49. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +10 -10
  50. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +7 -7
  51. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -1
  52. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -6
  53. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +7 -7
  54. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +4 -4
  55. data/lib/new_relic/agent/distributed_tracing.rb +5 -5
  56. data/lib/new_relic/agent/error_collector.rb +36 -8
  57. data/lib/new_relic/agent/error_filter.rb +5 -5
  58. data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
  59. data/lib/new_relic/agent/event_loop.rb +3 -3
  60. data/lib/new_relic/agent/external.rb +1 -1
  61. data/lib/new_relic/agent/harvester.rb +1 -3
  62. data/lib/new_relic/agent/heap.rb +2 -1
  63. data/lib/new_relic/agent/hostname.rb +1 -1
  64. data/lib/new_relic/agent/http_clients/abstract.rb +9 -21
  65. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -3
  66. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +7 -5
  67. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -0
  68. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +6 -2
  69. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +5 -1
  70. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +8 -5
  71. data/lib/new_relic/agent/http_clients/uri_util.rb +2 -2
  72. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +5 -2
  73. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +3 -2
  74. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +3 -3
  75. data/lib/new_relic/agent/instrumentation/active_job.rb +2 -2
  76. data/lib/new_relic/agent/instrumentation/active_record.rb +3 -2
  77. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +38 -35
  78. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -3
  79. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +2 -2
  80. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +3 -2
  81. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +3 -3
  82. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +6 -4
  83. data/lib/new_relic/agent/instrumentation/curb/chain.rb +1 -1
  84. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +5 -5
  85. data/lib/new_relic/agent/instrumentation/curb.rb +1 -1
  86. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +2 -1
  87. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +1 -1
  88. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +2 -1
  89. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +1 -1
  90. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +3 -3
  91. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +1 -1
  92. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +2 -1
  93. data/lib/new_relic/agent/instrumentation/excon.rb +3 -3
  94. data/lib/new_relic/agent/instrumentation/fiber/chain.rb +20 -0
  95. data/lib/new_relic/agent/instrumentation/fiber/instrumentation.rb +24 -0
  96. data/lib/new_relic/agent/instrumentation/fiber/prepend.rb +18 -0
  97. data/lib/new_relic/agent/instrumentation/fiber.rb +25 -0
  98. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +4 -4
  99. data/lib/new_relic/agent/instrumentation/grape.rb +4 -4
  100. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +2 -1
  101. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +3 -3
  102. data/lib/new_relic/agent/instrumentation/httprb.rb +1 -1
  103. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  104. data/lib/new_relic/agent/instrumentation/logger.rb +1 -1
  105. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +2 -2
  106. data/lib/new_relic/agent/instrumentation/memcache.rb +8 -8
  107. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +3 -3
  108. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +1 -1
  109. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +5 -5
  110. data/lib/new_relic/agent/instrumentation/net_http.rb +2 -2
  111. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +1 -1
  112. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +3 -3
  113. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +2 -2
  114. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +1 -1
  115. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +3 -2
  116. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  117. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +8 -15
  118. data/lib/new_relic/agent/instrumentation/rake.rb +3 -3
  119. data/lib/new_relic/agent/instrumentation/redis/constants.rb +1 -1
  120. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +2 -1
  121. data/lib/new_relic/agent/instrumentation/redis.rb +1 -1
  122. data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
  123. data/lib/new_relic/agent/instrumentation/resque.rb +1 -1
  124. data/lib/new_relic/agent/instrumentation/sequel.rb +8 -9
  125. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +10 -10
  126. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +1 -1
  127. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +1 -1
  128. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
  129. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +6 -5
  130. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  131. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +3 -7
  132. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +2 -1
  133. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +5 -5
  134. data/lib/new_relic/agent/javascript_instrumentor.rb +29 -24
  135. data/lib/new_relic/agent/linking_metadata.rb +2 -2
  136. data/lib/new_relic/agent/log_event_aggregator.rb +15 -15
  137. data/lib/new_relic/agent/logging.rb +73 -33
  138. data/lib/new_relic/agent/messaging.rb +7 -5
  139. data/lib/new_relic/agent/method_tracer.rb +6 -6
  140. data/lib/new_relic/agent/method_tracer_helpers.rb +1 -1
  141. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +4 -5
  142. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
  143. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  144. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +2 -2
  145. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +0 -1
  146. data/lib/new_relic/agent/new_relic_service.rb +15 -15
  147. data/lib/new_relic/agent/obfuscator.rb +1 -1
  148. data/lib/new_relic/agent/parameter_filtering.rb +6 -6
  149. data/lib/new_relic/agent/pipe_channel_manager.rb +7 -6
  150. data/lib/new_relic/agent/pipe_service.rb +5 -3
  151. data/lib/new_relic/agent/priority_sampled_buffer.rb +1 -1
  152. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +0 -1
  153. data/lib/new_relic/agent/sampler.rb +1 -1
  154. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  155. data/lib/new_relic/agent/samplers/cpu_sampler.rb +5 -5
  156. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +9 -9
  157. data/lib/new_relic/agent/samplers/memory_sampler.rb +9 -9
  158. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  159. data/lib/new_relic/agent/span_event_aggregator.rb +4 -4
  160. data/lib/new_relic/agent/span_event_primitive.rb +2 -2
  161. data/lib/new_relic/agent/sql_sampler.rb +2 -2
  162. data/lib/new_relic/agent/stats.rb +1 -1
  163. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
  164. data/lib/new_relic/agent/system_info.rb +10 -10
  165. data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
  166. data/lib/new_relic/agent/threading/backtrace_node.rb +3 -3
  167. data/lib/new_relic/agent/threading/backtrace_service.rb +3 -7
  168. data/lib/new_relic/agent/threading/thread_profile.rb +5 -5
  169. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  170. data/lib/new_relic/agent/tracer.rb +18 -8
  171. data/lib/new_relic/agent/transaction/abstract_segment.rb +9 -9
  172. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  173. data/lib/new_relic/agent/transaction/distributed_tracer.rb +7 -6
  174. data/lib/new_relic/agent/transaction/distributed_tracing.rb +6 -6
  175. data/lib/new_relic/agent/transaction/external_request_segment.rb +11 -11
  176. data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
  177. data/lib/new_relic/agent/transaction/request_attributes.rb +2 -2
  178. data/lib/new_relic/agent/transaction/segment.rb +1 -1
  179. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  180. data/lib/new_relic/agent/transaction/trace.rb +1 -1
  181. data/lib/new_relic/agent/transaction/trace_context.rb +4 -4
  182. data/lib/new_relic/agent/transaction/trace_node.rb +8 -7
  183. data/lib/new_relic/agent/transaction/tracing.rb +4 -4
  184. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  185. data/lib/new_relic/agent/transaction.rb +56 -52
  186. data/lib/new_relic/agent/transaction_error_primitive.rb +5 -5
  187. data/lib/new_relic/agent/transaction_event_aggregator.rb +4 -4
  188. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
  189. data/lib/new_relic/agent/transaction_sampler.rb +3 -3
  190. data/lib/new_relic/agent/transaction_time_aggregator.rb +7 -3
  191. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  192. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  193. data/lib/new_relic/agent/utilization/gcp.rb +3 -3
  194. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  195. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  196. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  197. data/lib/new_relic/agent/vm/mri_vm.rb +9 -8
  198. data/lib/new_relic/agent/worker_loop.rb +1 -1
  199. data/lib/new_relic/agent.rb +79 -35
  200. data/lib/new_relic/cli/command.rb +3 -3
  201. data/lib/new_relic/cli/commands/deployments.rb +26 -25
  202. data/lib/new_relic/cli/commands/install.rb +23 -23
  203. data/lib/new_relic/collection_helper.rb +2 -2
  204. data/lib/new_relic/constants.rb +7 -8
  205. data/lib/new_relic/control/class_methods.rb +3 -3
  206. data/lib/new_relic/control/frameworks/rails.rb +30 -18
  207. data/lib/new_relic/control/instance_methods.rb +6 -6
  208. data/lib/new_relic/control/instrumentation.rb +1 -1
  209. data/lib/new_relic/control/private_instance_methods.rb +1 -1
  210. data/lib/new_relic/dependency_detection.rb +4 -17
  211. data/lib/new_relic/environment_report.rb +4 -4
  212. data/lib/new_relic/helper.rb +2 -1
  213. data/lib/new_relic/language_support.rb +1 -1
  214. data/lib/new_relic/latest_changes.rb +5 -5
  215. data/lib/new_relic/local_environment.rb +0 -10
  216. data/lib/new_relic/noticed_error.rb +20 -18
  217. data/lib/new_relic/rack/browser_monitoring.rb +20 -16
  218. data/lib/new_relic/recipes/capistrano3.rb +1 -1
  219. data/lib/new_relic/recipes/capistrano_legacy.rb +6 -6
  220. data/lib/new_relic/recipes/helpers/send_deployment.rb +5 -5
  221. data/lib/new_relic/supportability_helper.rb +2 -1
  222. data/lib/new_relic/version.rb +2 -2
  223. data/lib/newrelic_rpm.rb +4 -4
  224. data/lib/sequel/extensions/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +5 -5
  225. data/lib/sequel/plugins/{newrelic_instrumentation.rb → new_relic_instrumentation.rb} +4 -4
  226. data/lib/tasks/config.rake +12 -12
  227. data/lib/tasks/coverage_report.rake +3 -3
  228. data/lib/tasks/helpers/format.rb +10 -10
  229. data/lib/tasks/helpers/removers.rb +5 -5
  230. data/lib/tasks/install.rake +4 -4
  231. data/lib/tasks/instrumentation_generator/instrumentation.thor +7 -10
  232. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +1 -1
  233. data/lib/tasks/multiverse.rb +12 -6
  234. data/lib/tasks/tests.rake +6 -6
  235. data/newrelic.yml +5 -8
  236. data/newrelic_rpm.gemspec +29 -26
  237. data/test/agent_helper.rb +25 -24
  238. metadata +13 -14
  239. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -83
  240. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -33
  241. data/lib/new_relic/agent/instrumentation/data_mapper.rb +0 -215
  242. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -36
  243. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -41
@@ -19,7 +19,7 @@ module NewRelic
19
19
  else
20
20
  # if this transaction is ignored, make sure child
21
21
  # transaction are also ignored
22
- state.current_transaction.ignore! if state.current_transaction
22
+ state.current_transaction&.ignore!
23
23
  NewRelic::Agent.instance.push_trace_execution_flag(false)
24
24
  end
25
25
  rescue => e
@@ -90,7 +90,8 @@ module NewRelic
90
90
  end
91
91
 
92
92
  def queue_start(request)
93
- if request && request.respond_to?(:env)
93
+ # the following line needs else branch coverage
94
+ if request && request.respond_to?(:env) # rubocop:disable Style/SafeNavigation
94
95
  QueueTime.parse_frontend_timestamp(request.env, Process.clock_gettime(Process::CLOCK_REALTIME))
95
96
  end
96
97
  end
@@ -75,7 +75,7 @@ module NewRelic
75
75
  # so do not mistake rendering a collection for rendering a file.
76
76
  if identifier.nil? && name != RENDER_COLLECTION_EVENT_NAME
77
77
  'file'
78
- elsif identifier =~ /template$/
78
+ elsif /template$/.match?(identifier)
79
79
  identifier
80
80
  elsif identifier && (parts = identifier.split('/')).size > 1
81
81
  parts[-2..-1].join('/')
@@ -99,11 +99,11 @@ module NewRelic
99
99
  end
100
100
 
101
101
  def finish
102
- @finishable.finish if @finishable
102
+ @finishable&.finish
103
103
  end
104
104
 
105
105
  def notice_error(error)
106
- @finishable.notice_error(error) if @finishable
106
+ @finishable&.notice_error(error)
107
107
  end
108
108
  end
109
109
  end
@@ -57,7 +57,7 @@ module NewRelic
57
57
 
58
58
  # Don't nest transactions if we're already in a web transaction.
59
59
  # Probably inline processing the job if that happens, so just trace.
60
- if txn && txn.recording_web_transaction?
60
+ if txn&.recording_web_transaction?
61
61
  run_in_trace(job, block, :Consume)
62
62
  elsif txn && !txn.recording_web_transaction?
63
63
  ::NewRelic::Agent::Transaction.set_default_transaction_name(
@@ -71,7 +71,7 @@ module NewRelic
71
71
  end
72
72
 
73
73
  def self.run_in_trace(job, block, event)
74
- trace_execution_scoped("MessageBroker/#{adapter}/Queue/#{event}/Named/#{job.queue_name}",
74
+ trace_execution_scoped("ActiveJob/#{adapter.sub(/^ActiveJob::/, '')}/Queue/#{event}/Named/#{job.queue_name}",
75
75
  code_information: code_information_for_job(job)) do
76
76
  block.call
77
77
  end
@@ -13,7 +13,8 @@ module NewRelic
13
13
  ::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
14
14
  statement.config)
15
15
  end
16
- if connection && connection.respond_to?(:execute)
16
+ # the following line needs else branch coverage
17
+ if connection && connection.respond_to?(:execute) # rubocop:disable Style/SafeNavigation
17
18
  return connection.execute("EXPLAIN #{statement.sql}")
18
19
  end
19
20
  end
@@ -43,7 +44,7 @@ module NewRelic
43
44
  end
44
45
  end
45
46
 
46
- if RUBY_VERSION < "2.7.0"
47
+ if RUBY_VERSION < '2.7.0'
47
48
  def log_with_newrelic_instrumentation(*args, &block)
48
49
  state = NewRelic::Agent::Tracer.state
49
50
 
@@ -49,7 +49,7 @@ module NewRelic
49
49
 
50
50
  alias_method(:delete_all_without_newrelic, :delete_all)
51
51
 
52
- if RUBY_VERSION < "2.7.0"
52
+ if RUBY_VERSION < '2.7.0'
53
53
  def delete_all(*args, &blk)
54
54
  ::NewRelic::Agent.with_database_metric_name(self.name, nil, ACTIVE_RECORD) do
55
55
  delete_all_without_newrelic(*args, &blk)
@@ -92,9 +92,9 @@ module NewRelic
92
92
  end
93
93
  end
94
94
 
95
- ACTIVE_RECORD = "ActiveRecord".freeze
96
- OTHER = "other".freeze
97
- MAKARA_SUFFIX = "_makara".freeze
95
+ ACTIVE_RECORD = 'ActiveRecord'.freeze
96
+ OTHER = 'other'.freeze
97
+ MAKARA_SUFFIX = '_makara'.freeze
98
98
 
99
99
  # convert vendor (makara, etc.) wrapper names to their bare names
100
100
  # ex: postgresql_makara -> postgresql
@@ -102,7 +102,7 @@ module NewRelic
102
102
  # TODO: OLD RUBIES - RUBY_VERSION < 2.5
103
103
  # With Ruby 2.5+ we could use #delete_suffix instead of #chomp for a
104
104
  # potential speed boost
105
- return adapter_name.chomp(MAKARA_SUFFIX) if adapter_name && adapter_name.end_with?(MAKARA_SUFFIX)
105
+ return adapter_name.chomp(MAKARA_SUFFIX) if adapter_name&.end_with?(MAKARA_SUFFIX)
106
106
 
107
107
  adapter_name
108
108
  end
@@ -118,7 +118,7 @@ module NewRelic
118
118
  SPACE = ' '.freeze
119
119
 
120
120
  def split_name(name)
121
- if name && name.respond_to?(:split)
121
+ if name&.respond_to?(:split)
122
122
  name.split(SPACE)
123
123
  else
124
124
  NewRelic::EMPTY_ARRAY
@@ -163,47 +163,50 @@ module NewRelic
163
163
  end
164
164
 
165
165
  PRODUCT_NAMES = {
166
- "mysql" => "MySQL",
167
- "mysql2" => "MySQL",
166
+ 'mysql' => 'MySQL',
167
+ 'mysql2' => 'MySQL',
168
168
 
169
- "postgresql" => "Postgres",
169
+ 'postgresql' => 'Postgres',
170
170
 
171
- "sqlite3" => "SQLite",
171
+ 'sqlite3' => 'SQLite',
172
172
 
173
173
  # https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
174
- "jdbcmysql" => "MySQL",
174
+ 'jdbcmysql' => 'MySQL',
175
175
 
176
176
  # https://rubygems.org/gems/activerecord-jdbcpostgresql-adapter
177
- "jdbcpostgresql" => "Postgres",
177
+ 'jdbcpostgresql' => 'Postgres',
178
178
 
179
179
  # https://rubygems.org/gems/activerecord-postgis-adapter
180
- "postgis" => "Postgres",
180
+ 'postgis' => 'Postgres',
181
181
 
182
182
  # https://rubygems.org/gems/activerecord-jdbcsqlite3-adapter
183
- "jdbcsqlite3" => "SQLite",
183
+ 'jdbcsqlite3' => 'SQLite',
184
184
 
185
185
  # https://rubygems.org/gems/activerecord-jdbcderby-adapter
186
- "derby" => "Derby",
187
- "jdbcderby" => "Derby",
186
+ 'derby' => 'Derby',
187
+ 'jdbcderby' => 'Derby',
188
188
 
189
189
  # https://rubygems.org/gems/activerecord-jdbc-adapter
190
- "jdbc" => "JDBC",
190
+ 'jdbc' => 'JDBC',
191
191
 
192
192
  # https://rubygems.org/gems/activerecord-jdbcmssql-adapter
193
- "jdbcmssql" => "MSSQL",
194
- "mssql" => "MSSQL",
193
+ 'jdbcmssql' => 'MSSQL',
194
+ 'mssql' => 'MSSQL',
195
195
 
196
196
  # https://rubygems.org/gems/activerecord-sqlserver-adapter
197
- "sqlserver" => "MSSQL",
197
+ 'sqlserver' => 'MSSQL',
198
198
 
199
199
  # https://rubygems.org/gems/activerecord-odbc-adapter
200
- "odbc" => "ODBC",
200
+ 'odbc' => 'ODBC',
201
201
 
202
202
  # https://rubygems.org/gems/activerecord-oracle_enhanced-adapter
203
- "oracle_enhanced" => "Oracle"
203
+ 'oracle_enhanced' => 'Oracle',
204
+
205
+ # https://rubygems.org/gems/activerecord-amazon-timestream-adapter
206
+ 'amazon_timestream' => 'Timestream'
204
207
  }.freeze
205
208
 
206
- ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = "ActiveRecord".freeze
209
+ ACTIVE_RECORD_DEFAULT_PRODUCT_NAME = 'ActiveRecord'.freeze
207
210
 
208
211
  def map_product(adapter_name)
209
212
  PRODUCT_NAMES.fetch(adapter_name, ACTIVE_RECORD_DEFAULT_PRODUCT_NAME)
@@ -213,24 +216,24 @@ module NewRelic
213
216
  extend self
214
217
 
215
218
  PRODUCT_SYMBOLS = {
216
- "mysql" => :mysql,
217
- "mysql2" => :mysql,
218
- "jdbcmysql" => :mysql,
219
+ 'mysql' => :mysql,
220
+ 'mysql2' => :mysql,
221
+ 'jdbcmysql' => :mysql,
219
222
 
220
- "postgresql" => :postgres,
221
- "jdbcpostgresql" => :postgres,
222
- "postgis" => :postgres
223
+ 'postgresql' => :postgres,
224
+ 'jdbcpostgresql' => :postgres,
225
+ 'postgis' => :postgres
223
226
  }.freeze
224
227
 
225
228
  DATASTORE_DEFAULT_PORTS = {
226
- :mysql => "3306",
227
- :postgres => "5432"
229
+ :mysql => '3306',
230
+ :postgres => '5432'
228
231
  }.freeze
229
232
 
230
- DEFAULT = "default".freeze
231
- UNKNOWN = "unknown".freeze
232
- SLASH = "/".freeze
233
- LOCALHOST = "localhost".freeze
233
+ DEFAULT = 'default'.freeze
234
+ UNKNOWN = 'unknown'.freeze
235
+ SLASH = '/'.freeze
236
+ LOCALHOST = 'localhost'.freeze
234
237
 
235
238
  def adapter_from_config(config)
236
239
  bare_name = NewRelic::Agent::Instrumentation::ActiveRecordHelper.bare_adapter_name(config[:adapter])
@@ -16,7 +16,7 @@ module NewRelic
16
16
 
17
17
  module BaseExtensions4x
18
18
  # https://github.com/rails/rails/blob/4-1-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L371
19
- def log(sql, name = "SQL", binds = [], statement_name = nil)
19
+ def log(sql, name = 'SQL', binds = [], statement_name = nil)
20
20
  @instrumenter.instrument(
21
21
  SQL_ACTIVE_RECORD,
22
22
  :sql => sql,
@@ -38,7 +38,7 @@ module NewRelic
38
38
 
39
39
  module BaseExtensions50
40
40
  # https://github.com/rails/rails/blob/5-0-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L582
41
- def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
41
+ def log(sql, name = 'SQL', binds = [], type_casted_binds = [], statement_name = nil)
42
42
  @instrumenter.instrument(
43
43
  SQL_ACTIVE_RECORD,
44
44
  sql: sql,
@@ -56,7 +56,7 @@ module NewRelic
56
56
 
57
57
  module BaseExtensions51
58
58
  # https://github.com/rails/rails/blob/5-1-stable/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb#L603
59
- def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil) # :doc:
59
+ def log(sql, name = 'SQL', binds = [], type_casted_binds = [], statement_name = nil) # :doc:
60
60
  @instrumenter.instrument(
61
61
  SQL_ACTIVE_RECORD,
62
62
  sql: sql,
@@ -11,7 +11,7 @@ module NewRelic
11
11
  ACTIVE_RECORD = 'ActiveRecord'.freeze
12
12
 
13
13
  module BaseExtensions
14
- if RUBY_VERSION < "2.7.0"
14
+ if RUBY_VERSION < '2.7.0'
15
15
  def save(*args, &blk)
16
16
  ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
17
17
  super
@@ -46,7 +46,7 @@ module NewRelic
46
46
  # Starting in v5.1.6, this call no longer happens. We'll
47
47
  # have to set the database metrics explicitly now.
48
48
  #
49
- if RUBY_VERSION < "2.7.0"
49
+ if RUBY_VERSION < '2.7.0'
50
50
  def touch(*args, **kwargs, &blk)
51
51
  ::NewRelic::Agent.with_database_metric_name(self.class.name, nil, ACTIVE_RECORD) do
52
52
  super
@@ -33,7 +33,7 @@ module NewRelic
33
33
  # defensive.
34
34
  return if defined?(cached?)
35
35
 
36
- if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::STRING >= "5.1.0"
36
+ if defined?(::ActiveRecord) && ::ActiveRecord::VERSION::STRING >= '5.1.0'
37
37
  def cached?(payload)
38
38
  payload.fetch(:cached, false)
39
39
  end
@@ -74,7 +74,8 @@ module NewRelic
74
74
  ::ActiveRecord::Base.send("#{statement.config[:adapter]}_connection",
75
75
  statement.config)
76
76
  end
77
- if connection && connection.respond_to?(:exec_query)
77
+ # the following line needs else branch coverage
78
+ if connection && connection.respond_to?(:exec_query) # rubocop:disable Style/SafeNavigation
78
79
  return connection.exec_query("EXPLAIN #{statement.sql}",
79
80
  "Explain #{statement.name}",
80
81
  statement.binds)
@@ -46,7 +46,7 @@ module NewRelic
46
46
  exchange_type: type
47
47
  )
48
48
  rescue => e
49
- NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Exchange#publish", e)
49
+ NewRelic::Agent.logger.error('Error starting message broker segment in Bunny::Exchange#publish', e)
50
50
  yield
51
51
  else
52
52
  NewRelic::Agent::Tracer.capture_segment_error(segment) do
@@ -90,7 +90,7 @@ module NewRelic
90
90
  start_time: t0
91
91
  )
92
92
  rescue => e
93
- NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Queue#pop", e)
93
+ NewRelic::Agent.logger.error('Error starting message broker segment in Bunny::Queue#pop', e)
94
94
  else
95
95
  if bunny_error
96
96
  segment.notice_error(bunny_error)
@@ -113,7 +113,7 @@ module NewRelic
113
113
  destination_name: name
114
114
  )
115
115
  rescue => e
116
- NewRelic::Agent.logger.error("Error starting message broker segment in Bunny::Queue#purge", e)
116
+ NewRelic::Agent.logger.error('Error starting message broker segment in Bunny::Queue#purge', e)
117
117
  yield
118
118
  else
119
119
  NewRelic::Agent::Tracer.capture_segment_error(segment) do
@@ -180,7 +180,7 @@ module NewRelic
180
180
  code_info = NewRelic::Agent::MethodTracerHelpers.code_information(self, method)
181
181
  argument_list = generate_argument_list(options.merge(code_info))
182
182
 
183
- class_eval(<<-EOC)
183
+ class_eval(<<~EOC)
184
184
  def #{with_method_name}(*args, &block)
185
185
  perform_action_with_newrelic_trace(#{argument_list.join(',')}) do
186
186
  #{without_method_name}(*args, &block)
@@ -236,7 +236,8 @@ module NewRelic
236
236
  end
237
237
 
238
238
  def self.prefix_for_category(txn, category = nil)
239
- category ||= (txn && txn.category)
239
+ # the following line needs else branch coverage
240
+ category ||= (txn && txn.category) # rubocop:disable Style/SafeNavigation
240
241
  case category
241
242
  when :controller then ::NewRelic::Agent::Transaction::CONTROLLER_PREFIX
242
243
  when :web then ::NewRelic::Agent::Transaction::CONTROLLER_PREFIX
@@ -360,7 +361,7 @@ module NewRelic
360
361
  skip_tracing = do_not_trace? || !state.is_execution_traced?
361
362
 
362
363
  if skip_tracing
363
- state.current_transaction.ignore! if state.current_transaction
364
+ state.current_transaction&.ignore!
364
365
  NewRelic::Agent.disable_all_tracing { return yield }
365
366
  end
366
367
 
@@ -386,7 +387,8 @@ module NewRelic
386
387
  raise
387
388
  end
388
389
  ensure
389
- finishable.finish if finishable
390
+ # the following line needs else branch coverage
391
+ finishable.finish if finishable # rubocop:disable Style/SafeNavigation
390
392
  end
391
393
  end
392
394
 
@@ -7,7 +7,7 @@ require_relative 'instrumentation'
7
7
  module NewRelic::Agent::Instrumentation
8
8
  module Curb
9
9
  module Chain
10
- def self.instrument!
10
+ def self.instrument! # rubocop:disable Metrics/AbcSize
11
11
  Curl::Easy.class_eval do
12
12
  include NewRelic::Agent::Instrumentation::Curb::Easy
13
13
 
@@ -81,7 +81,7 @@ module NewRelic
81
81
  def perform_with_tracing
82
82
  return yield if first_request_is_serial?
83
83
 
84
- trace_execution_scoped("External/Multiple/Curb::Multi/perform") do
84
+ trace_execution_scoped('External/Multiple/Curb::Multi/perform') do
85
85
  yield
86
86
  end
87
87
  end
@@ -107,7 +107,7 @@ module NewRelic
107
107
  request._nr_instrumented = true
108
108
  end
109
109
  rescue => err
110
- NewRelic::Agent.logger.error("Untrapped exception", err)
110
+ NewRelic::Agent.logger.error('Untrapped exception', err)
111
111
  end
112
112
 
113
113
  # Create request and response adapter objects for the specified +request+
@@ -141,12 +141,12 @@ module NewRelic
141
141
  request._nr_original_on_complete = original_callback
142
142
  request.on_complete do |finished_request|
143
143
  begin
144
- segment.process_response_headers(wrapped_response) if segment
144
+ segment&.process_response_headers(wrapped_response)
145
145
  ensure
146
146
  ::NewRelic::Agent::Transaction::Segment.finish(segment)
147
147
  # Make sure the existing completion callback is run, and restore the
148
148
  # on_complete callback to how it was before.
149
- original_callback.call(finished_request) if original_callback
149
+ original_callback&.call(finished_request)
150
150
  remove_instrumentation_callbacks(request)
151
151
  end
152
152
  end
@@ -173,7 +173,7 @@ module NewRelic
173
173
  segment.notice_error(noticeable_error)
174
174
  end
175
175
  ensure
176
- original_callback.call(failed_request, error) if original_callback
176
+ original_callback&.call(failed_request, error)
177
177
  remove_failure_callback(failed_request)
178
178
  end
179
179
  end
@@ -8,7 +8,7 @@ require_relative 'curb/prepend'
8
8
  DependencyDetection.defer do
9
9
  named :curb
10
10
 
11
- CURB_MIN_VERSION = Gem::Version.new("0.8.1")
11
+ CURB_MIN_VERSION = Gem::Version.new('0.8.1')
12
12
 
13
13
  depends_on do
14
14
  defined?(Curl) && defined?(Curl::CURB_VERSION) &&
@@ -23,7 +23,8 @@ module NewRelic::Agent::Instrumentation
23
23
  NewRelic::Agent.notice_error(payload[:exception_object]) if payload.key?(:exception_object)
24
24
 
25
25
  finishable = pop_segment(id)
26
- finishable.finish if finishable
26
+ # the following line needs else branch coverage
27
+ finishable.finish if finishable # rubocop:disable Style/SafeNavigation
27
28
  rescue => e
28
29
  log_notification_error(e, name, 'finish')
29
30
  end
@@ -22,7 +22,7 @@ module NewRelic
22
22
  install_newrelic_job_tracer
23
23
  NewRelic::Control.instance.init_plugin(:dispatcher => :delayed_job)
24
24
  else
25
- NewRelic::Agent.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
25
+ NewRelic::Agent.logger.warn('Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation')
26
26
  end
27
27
  end
28
28
  end
@@ -109,6 +109,7 @@ DependencyDetection.defer do
109
109
  end
110
110
 
111
111
  def delayed_job_version
112
- Gem.loaded_specs['delayed_job'].version if Gem.loaded_specs['delayed_job']
112
+ # the following line needs else branch coverage
113
+ Gem.loaded_specs['delayed_job'].version if Gem.loaded_specs['delayed_job'] # rubocop:disable Style/SafeNavigation
113
114
  end
114
115
  end
@@ -6,7 +6,7 @@ module NewRelic::Agent::Instrumentation
6
6
  module Elasticsearch
7
7
  def self.instrument!
8
8
  to_instrument = if ::Gem::Version.create(::Elasticsearch::VERSION) <
9
- ::Gem::Version.create("8.0.0")
9
+ ::Gem::Version.create('8.0.0')
10
10
  ::Elasticsearch::Transport::Client
11
11
  else
12
12
  ::Elastic::Transport::Client
@@ -37,7 +37,7 @@ module NewRelic::Agent::Instrumentation
37
37
  end
38
38
  return nil unless operation_index
39
39
 
40
- caller_locations[operation_index].to_s.split('`')[-1].gsub(/\W/, "")
40
+ caller_locations[operation_index].to_s.split('`')[-1].gsub(/\W/, '')
41
41
  end
42
42
 
43
43
  def nr_reported_query(query)
@@ -52,10 +52,10 @@ module NewRelic::Agent::Instrumentation
52
52
  return if nr_hosts.empty?
53
53
 
54
54
  NewRelic::Agent.disable_all_tracing do
55
- @nr_cluster_name ||= perform_request('GET', '_cluster/health').body["cluster_name"]
55
+ @nr_cluster_name ||= perform_request('GET', '_cluster/health').body['cluster_name']
56
56
  end
57
57
  rescue StandardError => e
58
- NewRelic::Agent.logger.error("Failed to get cluster name for elasticsearch", e)
58
+ NewRelic::Agent.logger.error('Failed to get cluster name for elasticsearch', e)
59
59
  nil
60
60
  end
61
61
 
@@ -16,7 +16,7 @@ DependencyDetection.defer do
16
16
  executes do
17
17
  NewRelic::Agent.logger.info('Installing Elasticsearch instrumentation')
18
18
 
19
- to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create("8.0.0")
19
+ to_instrument = if Gem::Version.create(Elasticsearch::VERSION) < Gem::Version.create('8.0.0')
20
20
  Elasticsearch::Transport::Client
21
21
  else
22
22
  Elastic::Transport::Client
@@ -46,7 +46,8 @@ module ::Excon
46
46
  end
47
47
 
48
48
  def finish_trace(datum) # THREAD_LOCAL_ACCESS
49
- segment = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR)
49
+ # The following line needs else branch coverage
50
+ segment = datum[:connection] && datum[:connection].instance_variable_get(TRACE_DATA_IVAR) # rubocop:disable Style/SafeNavigation
50
51
  if segment
51
52
  begin
52
53
  segment.notice_error(datum[:error]) if datum[:error]
@@ -18,7 +18,7 @@ DependencyDetection.defer do
18
18
  # but alas, it does not yet.
19
19
 
20
20
  # TODO: MAJOR VERSION - update min version to 0.56.0
21
- EXCON_MIN_VERSION = Gem::Version.new("0.19.0")
21
+ EXCON_MIN_VERSION = Gem::Version.new('0.19.0')
22
22
 
23
23
  depends_on do
24
24
  defined?(Excon) && defined?(Excon::VERSION)
@@ -46,7 +46,7 @@ DependencyDetection.defer do
46
46
  deprecation_msg
47
47
  )
48
48
 
49
- NewRelic::Agent.record_metric("Supportability/Deprecated/Excon", 1)
49
+ NewRelic::Agent.record_metric('Supportability/Deprecated/Excon', 1)
50
50
  end
51
51
 
52
52
  def install_excon_instrumentation(excon_version)
@@ -64,7 +64,7 @@ DependencyDetection.defer do
64
64
  if defaults[:middlewares]
65
65
  defaults[:middlewares] << Excon::Middleware::NewRelicCrossAppTracing
66
66
  else
67
- NewRelic::Agent.logger.warn("Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation")
67
+ NewRelic::Agent.logger.warn('Did not find :middlewares key in Excon.defaults, skipping Excon instrumentation')
68
68
  end
69
69
  end
70
70
  end
@@ -0,0 +1,20 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ module NewRelic::Agent::Instrumentation
6
+ module MonitoredFiber
7
+ def self.instrument!
8
+ ::Fiber.class_eval do
9
+ include NewRelic::Agent::Instrumentation::MonitoredFiber
10
+
11
+ alias_method(:initialize_without_new_relic, :initialize)
12
+
13
+ def initialize(*args, &block)
14
+ traced_block = add_thread_tracing(*args, &block)
15
+ initialize_with_newrelic_tracing { initialize_without_new_relic(*args, &traced_block) }
16
+ end
17
+ end
18
+ end
19
+ end
20
+ end
@@ -0,0 +1,24 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ module NewRelic::Agent::Instrumentation
6
+ module MonitoredFiber
7
+ attr_reader :nr_parent_key
8
+
9
+ def initialize_with_newrelic_tracing
10
+ @nr_parent_key = NewRelic::Agent::Tracer.current_segment_key
11
+ yield
12
+ end
13
+
14
+ def add_thread_tracing(*args, &block)
15
+ return block if !NewRelic::Agent::Tracer.thread_tracing_enabled?
16
+
17
+ NewRelic::Agent::Tracer.thread_block_with_current_transaction(
18
+ *args,
19
+ segment_name: 'Ruby/Fiber',
20
+ &block
21
+ )
22
+ end
23
+ end
24
+ end
@@ -0,0 +1,18 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'instrumentation'
6
+
7
+ module NewRelic::Agent::Instrumentation
8
+ module MonitoredFiber
9
+ module Prepend
10
+ include NewRelic::Agent::Instrumentation::MonitoredFiber
11
+
12
+ def initialize(*args, &block)
13
+ traced_block = add_thread_tracing(*args, &block)
14
+ initialize_with_newrelic_tracing { super(*args, &traced_block) }
15
+ end
16
+ end
17
+ end
18
+ end
@@ -0,0 +1,25 @@
1
+ # This file is distributed under New Relic's license terms.
2
+ # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
+ # frozen_string_literal: true
4
+
5
+ require_relative 'fiber/instrumentation'
6
+ require_relative 'fiber/chain'
7
+ require_relative 'fiber/prepend'
8
+
9
+ DependencyDetection.defer do
10
+ named :fiber
11
+
12
+ depends_on do
13
+ defined?(Fiber)
14
+ end
15
+
16
+ executes do
17
+ NewRelic::Agent.logger.info('Installing Fiber instrumentation')
18
+
19
+ if use_prepend?
20
+ prepend_instrument Fiber, NewRelic::Agent::Instrumentation::MonitoredFiber::Prepend
21
+ else
22
+ chain_instrument NewRelic::Agent::Instrumentation::MonitoredFiber
23
+ end
24
+ end
25
+ end