newrelic_rpm 9.0.0 → 9.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (224) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +6 -16
  4. data/.rubocop_todo.yml +4 -43
  5. data/.simplecov +1 -1
  6. data/CHANGELOG.md +60 -2
  7. data/Gemfile +1 -1
  8. data/Guardfile +7 -7
  9. data/README.md +1 -2
  10. data/Rakefile +8 -8
  11. data/Thorfile +1 -1
  12. data/bin/nrdebug +20 -20
  13. data/init.rb +1 -1
  14. data/lib/new_relic/agent/agent.rb +3 -16
  15. data/lib/new_relic/agent/agent_helpers/connect.rb +4 -9
  16. data/lib/new_relic/agent/agent_helpers/harvest.rb +4 -4
  17. data/lib/new_relic/agent/agent_helpers/shutdown.rb +5 -5
  18. data/lib/new_relic/agent/agent_helpers/special_startup.rb +2 -2
  19. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +47 -39
  20. data/lib/new_relic/agent/agent_helpers/startup.rb +13 -13
  21. data/lib/new_relic/agent/agent_helpers/transmit.rb +6 -6
  22. data/lib/new_relic/agent/agent_logger.rb +9 -9
  23. data/lib/new_relic/agent/attribute_filter.rb +2 -2
  24. data/lib/new_relic/agent/attribute_processing.rb +2 -2
  25. data/lib/new_relic/agent/audit_logger.rb +5 -5
  26. data/lib/new_relic/agent/autostart.rb +1 -1
  27. data/lib/new_relic/agent/commands/agent_command.rb +2 -2
  28. data/lib/new_relic/agent/commands/agent_command_router.rb +5 -4
  29. data/lib/new_relic/agent/commands/thread_profiler_session.rb +5 -5
  30. data/lib/new_relic/agent/configuration/default_source.rb +57 -56
  31. data/lib/new_relic/agent/configuration/environment_source.rb +2 -2
  32. data/lib/new_relic/agent/configuration/high_security_source.rb +3 -3
  33. data/lib/new_relic/agent/configuration/manager.rb +2 -2
  34. data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -10
  35. data/lib/new_relic/agent/configuration/server_source.rb +24 -24
  36. data/lib/new_relic/agent/configuration/yaml_source.rb +4 -4
  37. data/lib/new_relic/agent/connect/request_builder.rb +1 -1
  38. data/lib/new_relic/agent/connect/response_handler.rb +1 -1
  39. data/lib/new_relic/agent/custom_event_aggregator.rb +4 -4
  40. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  41. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  42. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  43. data/lib/new_relic/agent/database.rb +4 -4
  44. data/lib/new_relic/agent/datastores/metric_helper.rb +5 -5
  45. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +11 -11
  46. data/lib/new_relic/agent/datastores/redis.rb +6 -6
  47. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +7 -8
  48. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +10 -10
  49. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +7 -7
  50. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -1
  51. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -6
  52. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +7 -7
  53. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +4 -4
  54. data/lib/new_relic/agent/distributed_tracing.rb +5 -5
  55. data/lib/new_relic/agent/error_collector.rb +35 -7
  56. data/lib/new_relic/agent/error_filter.rb +2 -2
  57. data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
  58. data/lib/new_relic/agent/event_loop.rb +3 -3
  59. data/lib/new_relic/agent/external.rb +1 -1
  60. data/lib/new_relic/agent/harvester.rb +1 -3
  61. data/lib/new_relic/agent/heap.rb +2 -1
  62. data/lib/new_relic/agent/hostname.rb +1 -1
  63. data/lib/new_relic/agent/http_clients/abstract.rb +9 -21
  64. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -3
  65. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +7 -5
  66. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -0
  67. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +6 -2
  68. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +5 -1
  69. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +8 -5
  70. data/lib/new_relic/agent/http_clients/uri_util.rb +2 -2
  71. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +5 -2
  72. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +3 -2
  73. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +3 -3
  74. data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
  75. data/lib/new_relic/agent/instrumentation/active_record.rb +3 -2
  76. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +38 -35
  77. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -3
  78. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +2 -2
  79. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +3 -2
  80. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +3 -3
  81. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +5 -3
  82. data/lib/new_relic/agent/instrumentation/curb/chain.rb +1 -1
  83. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +5 -5
  84. data/lib/new_relic/agent/instrumentation/curb.rb +1 -1
  85. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +2 -1
  86. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +1 -1
  87. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +2 -1
  88. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +1 -1
  89. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +3 -3
  90. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +1 -1
  91. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +2 -1
  92. data/lib/new_relic/agent/instrumentation/excon.rb +3 -3
  93. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +4 -4
  94. data/lib/new_relic/agent/instrumentation/grape.rb +3 -3
  95. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +2 -1
  96. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +3 -3
  97. data/lib/new_relic/agent/instrumentation/httprb.rb +1 -1
  98. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  99. data/lib/new_relic/agent/instrumentation/logger.rb +1 -1
  100. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +2 -2
  101. data/lib/new_relic/agent/instrumentation/memcache.rb +6 -6
  102. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +3 -3
  103. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +1 -1
  104. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +5 -5
  105. data/lib/new_relic/agent/instrumentation/net_http.rb +1 -1
  106. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +1 -1
  107. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +3 -3
  108. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +2 -2
  109. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +1 -1
  110. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +3 -2
  111. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  112. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +7 -7
  113. data/lib/new_relic/agent/instrumentation/rake.rb +2 -2
  114. data/lib/new_relic/agent/instrumentation/redis/constants.rb +1 -1
  115. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +2 -1
  116. data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
  117. data/lib/new_relic/agent/instrumentation/sequel.rb +4 -4
  118. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +10 -10
  119. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +1 -1
  120. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +1 -1
  121. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
  122. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +6 -5
  123. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  124. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +2 -1
  125. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +5 -5
  126. data/lib/new_relic/agent/javascript_instrumentor.rb +29 -24
  127. data/lib/new_relic/agent/linking_metadata.rb +2 -2
  128. data/lib/new_relic/agent/log_event_aggregator.rb +15 -15
  129. data/lib/new_relic/agent/logging.rb +73 -33
  130. data/lib/new_relic/agent/messaging.rb +7 -5
  131. data/lib/new_relic/agent/method_tracer.rb +6 -6
  132. data/lib/new_relic/agent/method_tracer_helpers.rb +1 -1
  133. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +4 -4
  134. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
  135. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  136. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +2 -2
  137. data/lib/new_relic/agent/new_relic_service.rb +14 -14
  138. data/lib/new_relic/agent/obfuscator.rb +1 -1
  139. data/lib/new_relic/agent/parameter_filtering.rb +6 -6
  140. data/lib/new_relic/agent/pipe_channel_manager.rb +7 -6
  141. data/lib/new_relic/agent/pipe_service.rb +5 -3
  142. data/lib/new_relic/agent/priority_sampled_buffer.rb +1 -1
  143. data/lib/new_relic/agent/sampler.rb +1 -1
  144. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  145. data/lib/new_relic/agent/samplers/cpu_sampler.rb +5 -5
  146. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +9 -9
  147. data/lib/new_relic/agent/samplers/memory_sampler.rb +9 -9
  148. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  149. data/lib/new_relic/agent/span_event_aggregator.rb +4 -4
  150. data/lib/new_relic/agent/span_event_primitive.rb +2 -2
  151. data/lib/new_relic/agent/sql_sampler.rb +2 -2
  152. data/lib/new_relic/agent/stats.rb +1 -1
  153. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
  154. data/lib/new_relic/agent/system_info.rb +10 -10
  155. data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
  156. data/lib/new_relic/agent/threading/backtrace_node.rb +3 -3
  157. data/lib/new_relic/agent/threading/backtrace_service.rb +3 -7
  158. data/lib/new_relic/agent/threading/thread_profile.rb +5 -5
  159. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  160. data/lib/new_relic/agent/tracer.rb +8 -7
  161. data/lib/new_relic/agent/transaction/abstract_segment.rb +7 -7
  162. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  163. data/lib/new_relic/agent/transaction/distributed_tracer.rb +7 -6
  164. data/lib/new_relic/agent/transaction/distributed_tracing.rb +6 -6
  165. data/lib/new_relic/agent/transaction/external_request_segment.rb +11 -11
  166. data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
  167. data/lib/new_relic/agent/transaction/request_attributes.rb +2 -2
  168. data/lib/new_relic/agent/transaction/segment.rb +1 -1
  169. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  170. data/lib/new_relic/agent/transaction/trace.rb +1 -1
  171. data/lib/new_relic/agent/transaction/trace_context.rb +4 -4
  172. data/lib/new_relic/agent/transaction/trace_node.rb +8 -7
  173. data/lib/new_relic/agent/transaction/tracing.rb +2 -2
  174. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  175. data/lib/new_relic/agent/transaction.rb +39 -36
  176. data/lib/new_relic/agent/transaction_error_primitive.rb +5 -5
  177. data/lib/new_relic/agent/transaction_event_aggregator.rb +4 -4
  178. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
  179. data/lib/new_relic/agent/transaction_sampler.rb +3 -3
  180. data/lib/new_relic/agent/transaction_time_aggregator.rb +7 -3
  181. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  182. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  183. data/lib/new_relic/agent/utilization/gcp.rb +3 -3
  184. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  185. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  186. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  187. data/lib/new_relic/agent/vm/mri_vm.rb +9 -8
  188. data/lib/new_relic/agent/worker_loop.rb +1 -1
  189. data/lib/new_relic/agent.rb +78 -16
  190. data/lib/new_relic/cli/command.rb +3 -3
  191. data/lib/new_relic/cli/commands/deployments.rb +26 -25
  192. data/lib/new_relic/cli/commands/install.rb +14 -14
  193. data/lib/new_relic/collection_helper.rb +2 -2
  194. data/lib/new_relic/constants.rb +7 -8
  195. data/lib/new_relic/control/class_methods.rb +3 -3
  196. data/lib/new_relic/control/frameworks/rails.rb +30 -18
  197. data/lib/new_relic/control/instance_methods.rb +5 -5
  198. data/lib/new_relic/control/instrumentation.rb +1 -1
  199. data/lib/new_relic/control/private_instance_methods.rb +1 -1
  200. data/lib/new_relic/dependency_detection.rb +4 -17
  201. data/lib/new_relic/environment_report.rb +4 -4
  202. data/lib/new_relic/helper.rb +2 -1
  203. data/lib/new_relic/language_support.rb +1 -1
  204. data/lib/new_relic/latest_changes.rb +5 -5
  205. data/lib/new_relic/noticed_error.rb +20 -18
  206. data/lib/new_relic/rack/browser_monitoring.rb +20 -16
  207. data/lib/new_relic/recipes/capistrano3.rb +1 -1
  208. data/lib/new_relic/recipes/capistrano_legacy.rb +6 -6
  209. data/lib/new_relic/recipes/helpers/send_deployment.rb +5 -5
  210. data/lib/new_relic/supportability_helper.rb +2 -0
  211. data/lib/new_relic/version.rb +1 -1
  212. data/lib/newrelic_rpm.rb +3 -3
  213. data/lib/sequel/extensions/new_relic_instrumentation.rb +3 -3
  214. data/lib/sequel/plugins/new_relic_instrumentation.rb +1 -1
  215. data/lib/tasks/config.rake +12 -12
  216. data/lib/tasks/coverage_report.rake +3 -3
  217. data/lib/tasks/helpers/format.rb +9 -9
  218. data/lib/tasks/helpers/removers.rb +5 -5
  219. data/lib/tasks/install.rake +4 -4
  220. data/lib/tasks/multiverse.rb +12 -6
  221. data/lib/tasks/tests.rake +6 -6
  222. data/newrelic_rpm.gemspec +13 -13
  223. data/test/agent_helper.rb +25 -24
  224. metadata +2 -2
@@ -65,7 +65,7 @@ module NewRelic
65
65
  Agent.config.register_callback(:marshaller) do |marshaller|
66
66
  if marshaller != 'json'
67
67
  ::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using " \
68
- "JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.")
68
+ 'JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.')
69
69
  end
70
70
 
71
71
  @marshaller = JsonMarshaller.new
@@ -195,16 +195,16 @@ module NewRelic
195
195
  def error_event_data(data)
196
196
  metadata, items = data
197
197
  response = invoke_remote(:error_event_data, [@agent_id, *data], :item_count => items.size)
198
- NewRelic::Agent.record_metric("Supportability/Events/TransactionError/Sent", :count => items.size)
199
- NewRelic::Agent.record_metric("Supportability/Events/TransactionError/Seen", :count => metadata[:events_seen])
198
+ NewRelic::Agent.record_metric('Supportability/Events/TransactionError/Sent', :count => items.size)
199
+ NewRelic::Agent.record_metric('Supportability/Events/TransactionError/Seen', :count => metadata[:events_seen])
200
200
  response
201
201
  end
202
202
 
203
203
  def span_event_data(data)
204
204
  metadata, items = data
205
205
  response = invoke_remote(:span_event_data, [@agent_id, *data], :item_count => items.size)
206
- NewRelic::Agent.record_metric("Supportability/Events/SpanEvents/Sent", :count => items.size)
207
- NewRelic::Agent.record_metric("Supportability/Events/SpanEvents/Seen", :count => metadata[:events_seen])
206
+ NewRelic::Agent.record_metric('Supportability/Events/SpanEvents/Sent', :count => items.size)
207
+ NewRelic::Agent.record_metric('Supportability/Events/SpanEvents/Seen', :count => metadata[:events_seen])
208
208
  response
209
209
  end
210
210
 
@@ -305,7 +305,7 @@ module NewRelic
305
305
  conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
306
306
  set_cert_store(conn)
307
307
  rescue StandardError, LoadError
308
- msg = "SSL is not available in the environment; please install SSL support."
308
+ msg = 'SSL is not available in the environment; please install SSL support.'
309
309
  raise UnrecoverableAgentException.new(msg)
310
310
  end
311
311
 
@@ -313,7 +313,7 @@ module NewRelic
313
313
  if NewRelic::Agent.config[:ca_bundle_path]
314
314
  conn.cert_store = ssl_cert_store
315
315
  else
316
- ::NewRelic::Agent.logger.debug("Using default security certificates")
316
+ ::NewRelic::Agent.logger.debug('Using default security certificates')
317
317
  end
318
318
  end
319
319
 
@@ -363,7 +363,7 @@ module NewRelic
363
363
  start_connection(conn)
364
364
  conn
365
365
  rescue Timeout::Error
366
- ::NewRelic::Agent.logger.info("Timeout while attempting to connect. You may need to install system-level CA Certificates, as the ruby agent no longer includes these.")
366
+ ::NewRelic::Agent.logger.info('Timeout while attempting to connect. You may need to install system-level CA Certificates, as the ruby agent no longer includes these.')
367
367
  raise
368
368
  end
369
369
 
@@ -380,7 +380,7 @@ module NewRelic
380
380
  @marshaller.dump(data)
381
381
  true
382
382
  rescue StandardError, SystemStackError => e
383
- NewRelic::Agent.logger.warn("Unable to marshal environment report on connect.", e)
383
+ NewRelic::Agent.logger.warn('Unable to marshal environment report on connect.', e)
384
384
  false
385
385
  end
386
386
 
@@ -409,7 +409,7 @@ module NewRelic
409
409
  end
410
410
  @audit_logger.log_request_headers(opts[:uri], headers)
411
411
  request['user-agent'] = user_agent
412
- request.content_type = "application/octet-stream"
412
+ request.content_type = 'application/octet-stream'
413
413
  request.body = opts[:data]
414
414
  request
415
415
  end
@@ -521,7 +521,7 @@ module NewRelic
521
521
  # ruled out; see the initializer
522
522
  }
523
523
 
524
- uri = String.new('/agent_listener/invoke_raw_method?')
524
+ uri = +'/agent_listener/invoke_raw_method?'
525
525
  uri << params.map do |k, v|
526
526
  next unless v
527
527
 
@@ -551,7 +551,7 @@ module NewRelic
551
551
  end
552
552
 
553
553
  def handle_serialization_error(method, e)
554
- NewRelic::Agent.increment_metric("Supportability/serialization_failure")
554
+ NewRelic::Agent.increment_metric('Supportability/serialization_failure')
555
555
  NewRelic::Agent.increment_metric("Supportability/serialization_failure/#{method}")
556
556
  msg = "Failed to serialize #{method} data using #{@marshaller.class}: #{e.inspect}"
557
557
  error = SerializationError.new(msg)
@@ -566,7 +566,7 @@ module NewRelic
566
566
  NewRelic::Agent.record_metric("Supportability/Agent/Collector/#{method}/Duration", request_duration)
567
567
  end
568
568
  if serialize_time
569
- NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize", serialize_time)
569
+ NewRelic::Agent.record_metric('Supportability/invoke_remote_serialize', serialize_time)
570
570
  NewRelic::Agent.record_metric("Supportability/invoke_remote_serialize/#{method}", serialize_time)
571
571
  end
572
572
  end
@@ -581,7 +581,7 @@ module NewRelic
581
581
  # of items as arguments.
582
582
  def record_size_supportability_metrics(method, size_bytes, item_count)
583
583
  metrics = [
584
- "Supportability/Ruby/Collector/Output/Bytes",
584
+ 'Supportability/Ruby/Collector/Output/Bytes',
585
585
  "Supportability/Ruby/Collector/#{method}/Output/Bytes"
586
586
  ]
587
587
  # we may not have an item count, in which case, just record 0 for the exclusive time
@@ -33,7 +33,7 @@ module NewRelic
33
33
  def encode(text)
34
34
  return text unless key_bytes
35
35
 
36
- encoded = String.new('')
36
+ encoded = +''
37
37
  encoded.force_encoding('binary') if encoded.respond_to?(:force_encoding)
38
38
  index = 0
39
39
  text.each_byte do |byte|
@@ -7,7 +7,7 @@ module NewRelic
7
7
  module ParameterFiltering
8
8
  extend self
9
9
 
10
- ACTION_DISPATCH_PARAMETER_FILTER ||= "action_dispatch.parameter_filter".freeze
10
+ ACTION_DISPATCH_PARAMETER_FILTER ||= 'action_dispatch.parameter_filter'.freeze
11
11
 
12
12
  if defined?(Rails) && Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new('5.0.0')
13
13
  Rails.application.config.to_prepare do
@@ -41,12 +41,12 @@ module NewRelic
41
41
  end
42
42
 
43
43
  def filter_rack_file_data(env, params)
44
- content_type = env["CONTENT_TYPE"]
45
- multipart = content_type && content_type.start_with?("multipart")
44
+ content_type = env['CONTENT_TYPE']
45
+ multipart = content_type&.start_with?('multipart')
46
46
 
47
47
  params.inject({}) do |memo, (k, v)|
48
48
  if multipart && v.is_a?(Hash) && v[:tempfile]
49
- memo[k] = "[FILE]"
49
+ memo[k] = '[FILE]'
50
50
  else
51
51
  memo[k] = v
52
52
  end
@@ -56,8 +56,8 @@ module NewRelic
56
56
 
57
57
  def filter_rails_request_parameters(params)
58
58
  result = params.dup
59
- result.delete("controller")
60
- result.delete("action")
59
+ result.delete('controller')
60
+ result.delete('action')
61
61
  result
62
62
  end
63
63
 
@@ -55,7 +55,7 @@ module NewRelic
55
55
  # 4 GB - much larger than we'd ever need or want for this application.
56
56
  #
57
57
  class Pipe
58
- READY_MARKER = "READY"
58
+ READY_MARKER = 'READY'
59
59
  NUM_LENGTH_BYTES = 4
60
60
 
61
61
  attr_accessor :in, :out
@@ -76,11 +76,11 @@ module NewRelic
76
76
  end
77
77
 
78
78
  def serialize_message_length(data)
79
- [data.bytesize].pack("L>")
79
+ [data.bytesize].pack('L>')
80
80
  end
81
81
 
82
82
  def deserialize_message_length(data)
83
- data.unpack("L>").first
83
+ data.unpack('L>').first
84
84
  end
85
85
 
86
86
  def write(data)
@@ -103,7 +103,7 @@ module NewRelic
103
103
  nil
104
104
  end
105
105
  else
106
- NewRelic::Agent.logger.error("Failed to read bytes for length from pipe.")
106
+ NewRelic::Agent.logger.error('Failed to read bytes for length from pipe.')
107
107
  nil
108
108
  end
109
109
  end
@@ -218,7 +218,8 @@ module NewRelic
218
218
  def close_all_pipes
219
219
  @pipes_lock.synchronize do
220
220
  @pipes.each do |id, pipe|
221
- pipe.close if pipe
221
+ # Needs else branch coverage
222
+ pipe.close if pipe # rubocop:disable Style/SafeNavigation
222
223
  end
223
224
  @pipes = {}
224
225
  end
@@ -255,7 +256,7 @@ module NewRelic
255
256
  def unmarshal(data)
256
257
  Marshal.load(data)
257
258
  rescue StandardError => e
258
- ::NewRelic::Agent.logger.error("Failure unmarshalling message from Resque child process", e)
259
+ ::NewRelic::Agent.logger.error('Failure unmarshalling message from Resque child process', e)
259
260
  ::NewRelic::Agent.logger.debug(Base64.encode64(data))
260
261
  nil
261
262
  end
@@ -15,7 +15,7 @@ module NewRelic
15
15
  if @pipe && @pipe.parent_pid != $$
16
16
  @pipe.after_fork_in_child
17
17
  else
18
- NewRelic::Agent.logger.error("No communication channel to parent process, please see https://newrelic.com/docs/ruby/resque-instrumentation for more information.")
18
+ NewRelic::Agent.logger.error('No communication channel to parent process, please see https://newrelic.com/docs/ruby/resque-instrumentation for more information.')
19
19
  end
20
20
  end
21
21
 
@@ -65,7 +65,8 @@ module NewRelic
65
65
  end
66
66
 
67
67
  def shutdown
68
- @pipe.close if @pipe
68
+ # no else branch coverage
69
+ @pipe.close if @pipe # rubocop:disable Style/SafeNavigation
69
70
  end
70
71
 
71
72
  # Invokes the block it is passed. This is used to implement HTTP
@@ -82,7 +83,8 @@ module NewRelic
82
83
  end
83
84
 
84
85
  def write_to_pipe(endpoint, data)
85
- @pipe.write(marshal_payload([endpoint, data])) if @pipe
86
+ # the following line needs else branch coverage
87
+ @pipe.write(marshal_payload([endpoint, data])) if @pipe # rubocop:disable Style/SafeNavigation
86
88
  end
87
89
  end
88
90
  end
@@ -8,7 +8,7 @@ require 'new_relic/agent/event_buffer'
8
8
  module NewRelic
9
9
  module Agent
10
10
  class PrioritySampledBuffer < EventBuffer
11
- PRIORITY_KEY = "priority".freeze
11
+ PRIORITY_KEY = 'priority'.freeze
12
12
 
13
13
  attr_reader :seen_lifetime, :captured_lifetime
14
14
 
@@ -56,7 +56,7 @@ module NewRelic
56
56
  end
57
57
 
58
58
  def poll
59
- raise "Implement in the subclass"
59
+ raise 'Implement in the subclass'
60
60
  end
61
61
  end
62
62
  end
@@ -64,7 +64,7 @@ module NewRelic
64
64
  rescue NewRelic::Agent::Sampler::Unsupported => e
65
65
  ::NewRelic::Agent.logger.info("#{sampler_class.name} not available: #{e}")
66
66
  rescue => e
67
- ::NewRelic::Agent.logger.error("Error registering sampler:", e)
67
+ ::NewRelic::Agent.logger.error('Error registering sampler:', e)
68
68
  end
69
69
  end
70
70
  end
@@ -16,26 +16,26 @@ module NewRelic
16
16
  @last_time = nil
17
17
  @processor_count = NewRelic::Agent::SystemInfo.num_logical_processors
18
18
  if @processor_count.nil?
19
- NewRelic::Agent.logger.warn("Failed to determine processor count, assuming 1")
19
+ NewRelic::Agent.logger.warn('Failed to determine processor count, assuming 1')
20
20
  @processor_count = 1
21
21
  end
22
22
  poll
23
23
  end
24
24
 
25
25
  def record_user_util(value)
26
- NewRelic::Agent.record_metric("CPU/User/Utilization", value)
26
+ NewRelic::Agent.record_metric('CPU/User/Utilization', value)
27
27
  end
28
28
 
29
29
  def record_system_util(value)
30
- NewRelic::Agent.record_metric("CPU/System/Utilization", value)
30
+ NewRelic::Agent.record_metric('CPU/System/Utilization', value)
31
31
  end
32
32
 
33
33
  def record_usertime(value)
34
- NewRelic::Agent.record_metric("CPU/User Time", value)
34
+ NewRelic::Agent.record_metric('CPU/User Time', value)
35
35
  end
36
36
 
37
37
  def record_systemtime(value)
38
- NewRelic::Agent.record_metric("CPU/System Time", value)
38
+ NewRelic::Agent.record_metric('CPU/System Time', value)
39
39
  end
40
40
 
41
41
  def self.supported_on_this_platform?
@@ -21,21 +21,21 @@ module NewRelic
21
21
  # DelayedJob supports multiple backends, only some of which we can
22
22
  # handle. Check whether we think we've got what we need here.
23
23
  def self.supported_backend?
24
- ::Delayed::Worker.backend.to_s == "Delayed::Backend::ActiveRecord::Job"
24
+ ::Delayed::Worker.backend.to_s == 'Delayed::Backend::ActiveRecord::Job'
25
25
  end
26
26
 
27
27
  def initialize
28
- raise Unsupported, "DJ queue sampler disabled" if Agent.config[:'instrumentation.delayed_job'] == 'disabled'
28
+ raise Unsupported, 'DJ queue sampler disabled' if Agent.config[:'instrumentation.delayed_job'] == 'disabled'
29
29
  raise Unsupported, "DJ queue sampling unsupported with backend '#{::Delayed::Worker.backend}'" unless self.class.supported_backend?
30
- raise Unsupported, "No DJ worker present. Skipping DJ queue sampler" unless NewRelic::DelayedJobInjection.worker_name
30
+ raise Unsupported, 'No DJ worker present. Skipping DJ queue sampler' unless NewRelic::DelayedJobInjection.worker_name
31
31
  end
32
32
 
33
33
  def record_failed_jobs(value)
34
- NewRelic::Agent.record_metric("Workers/DelayedJob/failed_jobs", value)
34
+ NewRelic::Agent.record_metric('Workers/DelayedJob/failed_jobs', value)
35
35
  end
36
36
 
37
37
  def record_locked_jobs(value)
38
- NewRelic::Agent.record_metric("Workers/DelayedJob/locked_jobs", value)
38
+ NewRelic::Agent.record_metric('Workers/DelayedJob/locked_jobs', value)
39
39
  end
40
40
 
41
41
  FAILED_QUERY = 'failed_at is not NULL'.freeze
@@ -74,10 +74,10 @@ module NewRelic
74
74
 
75
75
  def record_queue_length_metrics
76
76
  counts = []
77
- counts << record_counts_by("queue", "name") if ::Delayed::Job.instance_methods.include?(:queue)
78
- counts << record_counts_by("priority")
77
+ counts << record_counts_by('queue', 'name') if ::Delayed::Job.instance_methods.include?(:queue)
78
+ counts << record_counts_by('priority')
79
79
 
80
- all_metric = "Workers/DelayedJob/queue_length/all"
80
+ all_metric = 'Workers/DelayedJob/queue_length/all'
81
81
  NewRelic::Agent.record_metric(all_metric, counts.max)
82
82
  end
83
83
 
@@ -87,7 +87,7 @@ module NewRelic
87
87
  all_count = 0
88
88
  queue_counts(column_name).each do |column_val, count|
89
89
  all_count += count
90
- column_val = "default" if column_val.nil? || column_val == NewRelic::EMPTY_STR
90
+ column_val = 'default' if column_val.nil? || column_val == NewRelic::EMPTY_STR
91
91
  metric = "Workers/DelayedJob/queue_length/#{metric_node}/#{column_val}"
92
92
  NewRelic::Agent.record_metric(metric, count)
93
93
  end
@@ -23,18 +23,18 @@ module NewRelic
23
23
  @sampler = ProcStatus.new
24
24
  if !@sampler.can_run?
25
25
  ::NewRelic::Agent.logger.debug("Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead.")
26
- @sampler = ShellPS.new("ps -o rsz")
26
+ @sampler = ShellPS.new('ps -o rsz')
27
27
  else
28
28
  ::NewRelic::Agent.logger.debug("Using /proc/#{$$}/status for reading process memory.")
29
29
  end
30
30
  elsif platform.include?('darwin9') # 10.5
31
- @sampler = ShellPS.new("ps -o rsz")
32
- elsif platform =~ /darwin(1|2)\d+/ # >= 10.6
33
- @sampler = ShellPS.new("ps -o rss")
31
+ @sampler = ShellPS.new('ps -o rsz')
32
+ elsif /darwin(1|2)\d+/.match?(platform) # >= 10.6
33
+ @sampler = ShellPS.new('ps -o rss')
34
34
  elsif platform.include?('freebsd')
35
- @sampler = ShellPS.new("ps -o rss")
35
+ @sampler = ShellPS.new('ps -o rss')
36
36
  elsif platform.include?('solaris')
37
- @sampler = ShellPS.new("/usr/bin/ps -o rss -p")
37
+ @sampler = ShellPS.new('/usr/bin/ps -o rss -p')
38
38
  end
39
39
 
40
40
  raise Unsupported, "Unsupported platform for getting memory: #{platform}" if @sampler.nil?
@@ -64,7 +64,7 @@ module NewRelic
64
64
  def poll
65
65
  sample = @sampler.get_sample
66
66
  if sample
67
- NewRelic::Agent.record_metric("Memory/Physical", sample)
67
+ NewRelic::Agent.record_metric('Memory/Physical', sample)
68
68
  end
69
69
  end
70
70
 
@@ -106,7 +106,7 @@ module NewRelic
106
106
  end
107
107
 
108
108
  def to_s
109
- "JRuby Java heap sampler"
109
+ 'JRuby Java heap sampler'
110
110
  end
111
111
  end
112
112
 
@@ -140,7 +140,7 @@ module NewRelic
140
140
  class ProcStatus < Base
141
141
  # Returns the amount of resident memory this process is using in MB
142
142
  def get_memory
143
- proc_status = File.open(proc_status_file, "r") { |f| f.read_nonblock(4096).strip }
143
+ proc_status = File.open(proc_status_file, 'r') { |f| f.read_nonblock(4096).strip }
144
144
  if proc_status =~ /RSS:\s*(\d+) kB/i
145
145
  return $1.to_f / 1024.0
146
146
  end
@@ -16,7 +16,7 @@ module NewRelic
16
16
 
17
17
  def poll
18
18
  live_objects = ObjectSpace.live_objects
19
- NewRelic::Agent.record_metric("GC/objects", live_objects)
19
+ NewRelic::Agent.record_metric('GC/objects', live_objects)
20
20
  end
21
21
  end
22
22
  end
@@ -18,7 +18,7 @@ module NewRelic
18
18
 
19
19
  def record(priority: nil, event: nil, &blk)
20
20
  unless event || priority && blk
21
- raise ArgumentError, "Expected priority and block, or event"
21
+ raise ArgumentError, 'Expected priority and block, or event'
22
22
  end
23
23
 
24
24
  return unless enabled?
@@ -29,9 +29,9 @@ module NewRelic
29
29
  end
30
30
  end
31
31
 
32
- SUPPORTABILITY_TOTAL_SEEN = "Supportability/SpanEvent/TotalEventsSeen".freeze
33
- SUPPORTABILITY_TOTAL_SENT = "Supportability/SpanEvent/TotalEventsSent".freeze
34
- SUPPORTABILITY_DISCARDED = "Supportability/SpanEvent/Discarded".freeze
32
+ SUPPORTABILITY_TOTAL_SEEN = 'Supportability/SpanEvent/TotalEventsSeen'.freeze
33
+ SUPPORTABILITY_TOTAL_SENT = 'Supportability/SpanEvent/TotalEventsSent'.freeze
34
+ SUPPORTABILITY_DISCARDED = 'Supportability/SpanEvent/Discarded'.freeze
35
35
 
36
36
  def after_harvest(metadata)
37
37
  seen = metadata[:seen]
@@ -37,8 +37,8 @@ module NewRelic
37
37
  PEER_HOSTNAME_KEY = 'peer.hostname'
38
38
  SPAN_KIND_KEY = 'span.kind'
39
39
  ENTRY_POINT_KEY = 'nr.entryPoint'
40
- TRUSTED_PARENT_KEY = "trustedParentId"
41
- TRACING_VENDORS_KEY = "tracingVendors"
40
+ TRUSTED_PARENT_KEY = 'trustedParentId'
41
+ TRACING_VENDORS_KEY = 'tracingVendors'
42
42
  TRANSACTION_NAME_KEY = 'transaction.name'
43
43
 
44
44
  # Strings for static values of the event structure
@@ -154,12 +154,12 @@ module NewRelic
154
154
  end
155
155
  end
156
156
 
157
- PRIORITY = "priority".freeze
157
+ PRIORITY = 'priority'.freeze
158
158
 
159
159
  def distributed_trace_attributes(state)
160
160
  transaction = state.current_transaction
161
161
  params = nil
162
- if transaction && transaction.distributed_tracer.distributed_trace_payload
162
+ if transaction&.distributed_tracer&.distributed_trace_payload
163
163
  params = {}
164
164
  payload = transaction.distributed_tracer.distributed_trace_payload
165
165
  DistributedTraceAttributes.copy_from_transaction(transaction, payload, params)
@@ -118,7 +118,7 @@ module NewRelic
118
118
  def inspect_full
119
119
  variables = instance_variables.map do |ivar|
120
120
  "#{ivar.to_s}=#{instance_variable_get(ivar).inspect}"
121
- end.join(" ")
121
+ end.join(' ')
122
122
  "#<NewRelic::Agent::Stats #{variables}>"
123
123
  end
124
124
 
@@ -37,7 +37,7 @@ module NewRelic
37
37
  NewRelic::Agent.logger.debug("Synthetics transaction event limit (#{metadata[:capacity]}) reached. Further synthetics events this harvest period dropped.")
38
38
 
39
39
  engine = NewRelic::Agent.instance.stats_engine
40
- engine.tl_record_supportability_metric_count("SyntheticsEventAggregator/synthetics_events_dropped", num_dropped)
40
+ engine.tl_record_supportability_metric_count('SyntheticsEventAggregator/synthetics_events_dropped', num_dropped)
41
41
  end
42
42
  end
43
43
  end
@@ -128,7 +128,7 @@ module NewRelic
128
128
 
129
129
  num_physical_packages = cores.keys.map(&:first).uniq.size
130
130
  num_physical_cores = cores.size
131
- num_logical_processors = cores.values.reduce(0, :+)
131
+ num_logical_processors = cores.values.sum
132
132
 
133
133
  if num_physical_cores == 0
134
134
  num_logical_processors = total_processors
@@ -202,7 +202,7 @@ module NewRelic
202
202
  return
203
203
  when /docker/
204
204
  ::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id unrecognized: '#{cpu_cgroup}'")
205
- ::NewRelic::Agent.increment_metric("Supportability/utilization/docker/error")
205
+ ::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
206
206
  return
207
207
  else
208
208
  ::NewRelic::Agent.logger.debug("Ignoring unrecognized cgroup ID format: '#{cpu_cgroup}'")
@@ -211,7 +211,7 @@ module NewRelic
211
211
 
212
212
  if container_id && container_id.size != 64
213
213
  ::NewRelic::Agent.logger.debug("Found docker container_id with invalid length: #{container_id}")
214
- ::NewRelic::Agent.increment_metric("Supportability/utilization/docker/error")
214
+ ::NewRelic::Agent.increment_metric('Supportability/utilization/docker/error')
215
215
  nil
216
216
  else
217
217
  container_id
@@ -242,7 +242,7 @@ module NewRelic
242
242
  def self.proc_try_read(path)
243
243
  return nil unless File.exist?(path)
244
244
 
245
- content = String.new('')
245
+ content = +''
246
246
  File.open(path) do |f|
247
247
  loop do
248
248
  begin
@@ -289,8 +289,8 @@ module NewRelic
289
289
 
290
290
  if bid.ascii_only?
291
291
  if bid.empty?
292
- ::NewRelic::Agent.logger.debug("boot_id not found in /proc/sys/kernel/random/boot_id")
293
- ::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
292
+ ::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
293
+ ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
294
294
  nil
295
295
 
296
296
  elsif bid.bytesize == 36
@@ -298,19 +298,19 @@ module NewRelic
298
298
 
299
299
  else
300
300
  ::NewRelic::Agent.logger.debug("Found boot_id with invalid length: #{bid}")
301
- ::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
301
+ ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
302
302
  bid[0, 128]
303
303
 
304
304
  end
305
305
  else
306
306
  ::NewRelic::Agent.logger.debug("Found boot_id with non-ASCII characters: #{bid}")
307
- ::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
307
+ ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
308
308
  nil
309
309
 
310
310
  end
311
311
  else
312
- ::NewRelic::Agent.logger.debug("boot_id not found in /proc/sys/kernel/random/boot_id")
313
- ::NewRelic::Agent.increment_metric("Supportability/utilization/boot_id/error")
312
+ ::NewRelic::Agent.logger.debug('boot_id not found in /proc/sys/kernel/random/boot_id')
313
+ ::NewRelic::Agent.increment_metric('Supportability/utilization/boot_id/error')
314
314
  nil
315
315
 
316
316
  end
@@ -45,7 +45,7 @@ module NewRelic
45
45
 
46
46
  if txn && !txn.recording_web_transaction?
47
47
  :background
48
- elsif txn && txn.recording_web_transaction?
48
+ elsif txn&.recording_web_transaction?
49
49
  :request
50
50
  else
51
51
  :other
@@ -70,7 +70,7 @@ module NewRelic
70
70
  end
71
71
 
72
72
  def dump_string
73
- result = String.new("#<BacktraceRoot:#{object_id}>")
73
+ result = +"#<BacktraceRoot:#{object_id}>"
74
74
  child_results = @children.map { |c| c.dump_string(2) }.join("\n")
75
75
  result << "\n" unless child_results.empty?
76
76
  result << child_results
@@ -116,8 +116,8 @@ module NewRelic
116
116
  def dump_string(indent = 0)
117
117
  @file, @method, @line_no = parse_backtrace_frame(@raw_line)
118
118
  indentation = ' ' * indent
119
- result = String.new("#{indentation}#<BacktraceNode:#{object_id} ) + \
120
- [#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>")
119
+ result = +"#{indentation}#<BacktraceNode:#{object_id} ) + \
120
+ [#{@runnable_count}] #{@file}:#{@line_no} in #{@method}>"
121
121
  child_results = @children.map { |c| c.dump_string(indent + 2) }.join("\n")
122
122
  result << "\n" unless child_results.empty?
123
123
  result << child_results
@@ -6,7 +6,7 @@ module NewRelic
6
6
  module Agent
7
7
  module Threading
8
8
  class BacktraceService
9
- ALL_TRANSACTIONS = "**ALL**".freeze
9
+ ALL_TRANSACTIONS = '**ALL**'.freeze
10
10
 
11
11
  def self.is_supported?
12
12
  !is_resque?
@@ -41,9 +41,7 @@ module NewRelic
41
41
  @overhead_percent_threshold = new_value
42
42
  end
43
43
 
44
- if event_listener
45
- event_listener.subscribe(:transaction_finished, &method(:on_transaction_finished))
46
- end
44
+ event_listener&.subscribe(:transaction_finished, &method(:on_transaction_finished))
47
45
  end
48
46
 
49
47
  # Public interface
@@ -221,9 +219,7 @@ module NewRelic
221
219
 
222
220
  # This method is expected to be called with @lock held.
223
221
  def aggregate_global_backtrace(backtrace, bucket, thread)
224
- if @profiles[ALL_TRANSACTIONS]
225
- @profiles[ALL_TRANSACTIONS].aggregate(backtrace, bucket, thread)
226
- end
222
+ @profiles[ALL_TRANSACTIONS]&.aggregate(backtrace, bucket, thread)
227
223
  end
228
224
 
229
225
  # This method is expected to be called with @lock held.
@@ -72,7 +72,7 @@ module NewRelic
72
72
  all_nodes = @traces.values.map { |n| n.flattened }.flatten
73
73
 
74
74
  NewRelic::Agent.instance.stats_engine
75
- .tl_record_supportability_metric_count("ThreadProfiler/NodeCount", all_nodes.size)
75
+ .tl_record_supportability_metric_count('ThreadProfiler/NodeCount', all_nodes.size)
76
76
 
77
77
  all_nodes.sort! do |a, b|
78
78
  # we primarily prefer higher runnable_count
@@ -103,10 +103,10 @@ module NewRelic
103
103
  convert_N_trace_nodes_to_arrays(THREAD_PROFILER_NODES)
104
104
 
105
105
  {
106
- "OTHER" => @traces[:other].as_array,
107
- "REQUEST" => @traces[:request].as_array,
108
- "AGENT" => @traces[:agent].as_array,
109
- "BACKGROUND" => @traces[:background].as_array
106
+ 'OTHER' => @traces[:other].as_array,
107
+ 'REQUEST' => @traces[:request].as_array,
108
+ 'AGENT' => @traces[:agent].as_array,
109
+ 'BACKGROUND' => @traces[:background].as_array
110
110
  }
111
111
  end
112
112
 
@@ -7,7 +7,7 @@ require 'new_relic/agent/heap'
7
7
  module NewRelic
8
8
  module Agent
9
9
  class TimestampSampledBuffer < PrioritySampledBuffer
10
- TIMESTAMP_KEY = "timestamp".freeze
10
+ TIMESTAMP_KEY = 'timestamp'.freeze
11
11
 
12
12
  private
13
13