newrelic_rpm 9.0.0 → 9.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (247) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +7 -81
  4. data/.rubocop_todo.yml +4 -43
  5. data/.simplecov +2 -1
  6. data/Brewfile +1 -0
  7. data/CHANGELOG.md +74 -2
  8. data/Gemfile +1 -1
  9. data/Guardfile +8 -7
  10. data/README.md +1 -2
  11. data/Rakefile +8 -8
  12. data/Thorfile +1 -1
  13. data/bin/newrelic +1 -0
  14. data/bin/newrelic_cmd +1 -0
  15. data/bin/nrdebug +20 -20
  16. data/init.rb +1 -1
  17. data/lib/new_relic/agent/agent.rb +3 -16
  18. data/lib/new_relic/agent/agent_helpers/connect.rb +4 -9
  19. data/lib/new_relic/agent/agent_helpers/harvest.rb +4 -4
  20. data/lib/new_relic/agent/agent_helpers/shutdown.rb +5 -5
  21. data/lib/new_relic/agent/agent_helpers/special_startup.rb +2 -2
  22. data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb +47 -39
  23. data/lib/new_relic/agent/agent_helpers/startup.rb +13 -13
  24. data/lib/new_relic/agent/agent_helpers/transmit.rb +6 -6
  25. data/lib/new_relic/agent/agent_logger.rb +9 -9
  26. data/lib/new_relic/agent/attribute_filter.rb +2 -2
  27. data/lib/new_relic/agent/attribute_processing.rb +2 -2
  28. data/lib/new_relic/agent/audit_logger.rb +5 -5
  29. data/lib/new_relic/agent/autostart.rb +1 -1
  30. data/lib/new_relic/agent/commands/agent_command.rb +2 -2
  31. data/lib/new_relic/agent/commands/agent_command_router.rb +5 -4
  32. data/lib/new_relic/agent/commands/thread_profiler_session.rb +5 -5
  33. data/lib/new_relic/agent/configuration/default_source.rb +57 -80
  34. data/lib/new_relic/agent/configuration/environment_source.rb +2 -2
  35. data/lib/new_relic/agent/configuration/high_security_source.rb +3 -3
  36. data/lib/new_relic/agent/configuration/manager.rb +2 -2
  37. data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -10
  38. data/lib/new_relic/agent/configuration/server_source.rb +24 -24
  39. data/lib/new_relic/agent/configuration/yaml_source.rb +4 -4
  40. data/lib/new_relic/agent/connect/request_builder.rb +1 -1
  41. data/lib/new_relic/agent/connect/response_handler.rb +1 -1
  42. data/lib/new_relic/agent/custom_event_aggregator.rb +4 -4
  43. data/lib/new_relic/agent/database/explain_plan_helpers.rb +1 -1
  44. data/lib/new_relic/agent/database/obfuscation_helpers.rb +2 -2
  45. data/lib/new_relic/agent/database/obfuscator.rb +2 -2
  46. data/lib/new_relic/agent/database.rb +4 -4
  47. data/lib/new_relic/agent/datastores/metric_helper.rb +5 -5
  48. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +11 -11
  49. data/lib/new_relic/agent/datastores/redis.rb +6 -6
  50. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +7 -8
  51. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +10 -10
  52. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +7 -7
  53. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -1
  54. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +6 -6
  55. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +7 -7
  56. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +4 -4
  57. data/lib/new_relic/agent/distributed_tracing.rb +5 -5
  58. data/lib/new_relic/agent/error_collector.rb +35 -7
  59. data/lib/new_relic/agent/error_filter.rb +2 -2
  60. data/lib/new_relic/agent/error_trace_aggregator.rb +5 -4
  61. data/lib/new_relic/agent/event_loop.rb +3 -3
  62. data/lib/new_relic/agent/external.rb +1 -1
  63. data/lib/new_relic/agent/harvester.rb +1 -3
  64. data/lib/new_relic/agent/heap.rb +2 -1
  65. data/lib/new_relic/agent/hostname.rb +1 -1
  66. data/lib/new_relic/agent/http_clients/abstract.rb +9 -21
  67. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +7 -3
  68. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +7 -5
  69. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +4 -0
  70. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +6 -2
  71. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +5 -1
  72. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +8 -5
  73. data/lib/new_relic/agent/http_clients/uri_util.rb +2 -2
  74. data/lib/new_relic/agent/instrumentation/action_controller_other_subscriber.rb +5 -2
  75. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +3 -2
  76. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +3 -3
  77. data/lib/new_relic/agent/instrumentation/active_job.rb +1 -1
  78. data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -3
  79. data/lib/new_relic/agent/instrumentation/active_record.rb +3 -2
  80. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +38 -35
  81. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +3 -3
  82. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +2 -2
  83. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +3 -2
  84. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +1 -1
  85. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +3 -3
  86. data/lib/new_relic/agent/instrumentation/bunny.rb +1 -1
  87. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +5 -3
  88. data/lib/new_relic/agent/instrumentation/curb/chain.rb +1 -1
  89. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +5 -5
  90. data/lib/new_relic/agent/instrumentation/curb.rb +1 -1
  91. data/lib/new_relic/agent/instrumentation/custom_events_subscriber.rb +2 -1
  92. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +1 -0
  93. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +1 -1
  94. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +2 -1
  95. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +2 -2
  96. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +4 -3
  97. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +2 -2
  98. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +2 -1
  99. data/lib/new_relic/agent/instrumentation/excon.rb +3 -3
  100. data/lib/new_relic/agent/instrumentation/fiber/chain.rb +1 -1
  101. data/lib/new_relic/agent/instrumentation/fiber.rb +1 -1
  102. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +4 -4
  103. data/lib/new_relic/agent/instrumentation/grape.rb +3 -3
  104. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +1 -1
  105. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +3 -2
  106. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +1 -1
  107. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +1 -1
  108. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +4 -4
  109. data/lib/new_relic/agent/instrumentation/grpc_client.rb +1 -1
  110. data/lib/new_relic/agent/instrumentation/grpc_server.rb +1 -1
  111. data/lib/new_relic/agent/instrumentation/httprb.rb +1 -1
  112. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +1 -1
  113. data/lib/new_relic/agent/instrumentation/logger.rb +1 -1
  114. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +3 -1
  115. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +2 -2
  116. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +3 -1
  117. data/lib/new_relic/agent/instrumentation/memcache.rb +8 -8
  118. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +3 -3
  119. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +1 -1
  120. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +6 -6
  121. data/lib/new_relic/agent/instrumentation/net_http.rb +1 -1
  122. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +1 -1
  123. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +3 -3
  124. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +2 -2
  125. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +1 -1
  126. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +3 -2
  127. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +1 -1
  128. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +7 -7
  129. data/lib/new_relic/agent/instrumentation/rake.rb +2 -2
  130. data/lib/new_relic/agent/instrumentation/redis/constants.rb +1 -1
  131. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +2 -1
  132. data/lib/new_relic/agent/instrumentation/resque/helper.rb +1 -1
  133. data/lib/new_relic/agent/instrumentation/sequel.rb +4 -4
  134. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +10 -10
  135. data/lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb +1 -1
  136. data/lib/new_relic/agent/instrumentation/sidekiq/server.rb +1 -1
  137. data/lib/new_relic/agent/instrumentation/sidekiq.rb +1 -0
  138. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +1 -1
  139. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +6 -5
  140. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +1 -1
  141. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +2 -1
  142. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +5 -5
  143. data/lib/new_relic/agent/javascript_instrumentor.rb +29 -24
  144. data/lib/new_relic/agent/linking_metadata.rb +2 -2
  145. data/lib/new_relic/agent/log_event_aggregator.rb +15 -15
  146. data/lib/new_relic/agent/logging.rb +73 -33
  147. data/lib/new_relic/agent/messaging.rb +7 -5
  148. data/lib/new_relic/agent/method_tracer.rb +7 -7
  149. data/lib/new_relic/agent/method_tracer_helpers.rb +1 -1
  150. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +4 -4
  151. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
  152. data/lib/new_relic/agent/new_relic_service/encoders.rb +1 -1
  153. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +2 -2
  154. data/lib/new_relic/agent/new_relic_service.rb +14 -15
  155. data/lib/new_relic/agent/obfuscator.rb +1 -1
  156. data/lib/new_relic/agent/parameter_filtering.rb +6 -6
  157. data/lib/new_relic/agent/pipe_channel_manager.rb +7 -6
  158. data/lib/new_relic/agent/pipe_service.rb +5 -3
  159. data/lib/new_relic/agent/priority_sampled_buffer.rb +1 -1
  160. data/lib/new_relic/agent/sampler.rb +2 -1
  161. data/lib/new_relic/agent/sampler_collection.rb +1 -1
  162. data/lib/new_relic/agent/samplers/cpu_sampler.rb +5 -5
  163. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +9 -9
  164. data/lib/new_relic/agent/samplers/memory_sampler.rb +9 -9
  165. data/lib/new_relic/agent/samplers/object_sampler.rb +1 -1
  166. data/lib/new_relic/agent/span_event_aggregator.rb +4 -4
  167. data/lib/new_relic/agent/span_event_primitive.rb +2 -2
  168. data/lib/new_relic/agent/sql_sampler.rb +2 -2
  169. data/lib/new_relic/agent/stats.rb +1 -1
  170. data/lib/new_relic/agent/synthetics_event_aggregator.rb +1 -1
  171. data/lib/new_relic/agent/system_info.rb +10 -10
  172. data/lib/new_relic/agent/threading/agent_thread.rb +1 -1
  173. data/lib/new_relic/agent/threading/backtrace_node.rb +3 -3
  174. data/lib/new_relic/agent/threading/backtrace_service.rb +3 -7
  175. data/lib/new_relic/agent/threading/thread_profile.rb +5 -5
  176. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +1 -1
  177. data/lib/new_relic/agent/tracer.rb +8 -7
  178. data/lib/new_relic/agent/transaction/abstract_segment.rb +52 -46
  179. data/lib/new_relic/agent/transaction/datastore_segment.rb +1 -1
  180. data/lib/new_relic/agent/transaction/distributed_tracer.rb +7 -6
  181. data/lib/new_relic/agent/transaction/distributed_tracing.rb +13 -14
  182. data/lib/new_relic/agent/transaction/external_request_segment.rb +11 -11
  183. data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
  184. data/lib/new_relic/agent/transaction/request_attributes.rb +2 -2
  185. data/lib/new_relic/agent/transaction/segment.rb +1 -1
  186. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +1 -1
  187. data/lib/new_relic/agent/transaction/trace.rb +1 -1
  188. data/lib/new_relic/agent/transaction/trace_context.rb +4 -4
  189. data/lib/new_relic/agent/transaction/trace_node.rb +8 -7
  190. data/lib/new_relic/agent/transaction/tracing.rb +2 -2
  191. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +1 -1
  192. data/lib/new_relic/agent/transaction.rb +39 -36
  193. data/lib/new_relic/agent/transaction_error_primitive.rb +5 -5
  194. data/lib/new_relic/agent/transaction_event_aggregator.rb +4 -4
  195. data/lib/new_relic/agent/transaction_event_primitive.rb +3 -3
  196. data/lib/new_relic/agent/transaction_sampler.rb +3 -3
  197. data/lib/new_relic/agent/transaction_time_aggregator.rb +7 -3
  198. data/lib/new_relic/agent/utilization/aws.rb +1 -1
  199. data/lib/new_relic/agent/utilization/azure.rb +3 -3
  200. data/lib/new_relic/agent/utilization/gcp.rb +3 -3
  201. data/lib/new_relic/agent/utilization/pcf.rb +1 -1
  202. data/lib/new_relic/agent/utilization/vendor.rb +1 -1
  203. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +1 -1
  204. data/lib/new_relic/agent/vm/mri_vm.rb +9 -8
  205. data/lib/new_relic/agent/worker_loop.rb +1 -1
  206. data/lib/new_relic/agent.rb +78 -16
  207. data/lib/new_relic/cli/command.rb +3 -3
  208. data/lib/new_relic/cli/commands/deployments.rb +26 -25
  209. data/lib/new_relic/cli/commands/install.rb +14 -14
  210. data/lib/new_relic/collection_helper.rb +2 -2
  211. data/lib/new_relic/constants.rb +7 -8
  212. data/lib/new_relic/control/class_methods.rb +3 -3
  213. data/lib/new_relic/control/frameworks/rails.rb +30 -18
  214. data/lib/new_relic/control/instance_methods.rb +5 -5
  215. data/lib/new_relic/control/instrumentation.rb +1 -1
  216. data/lib/new_relic/control/private_instance_methods.rb +1 -1
  217. data/lib/new_relic/dependency_detection.rb +4 -17
  218. data/lib/new_relic/environment_report.rb +4 -4
  219. data/lib/new_relic/helper.rb +2 -1
  220. data/lib/new_relic/language_support.rb +1 -1
  221. data/lib/new_relic/latest_changes.rb +5 -5
  222. data/lib/new_relic/noticed_error.rb +20 -18
  223. data/lib/new_relic/rack/browser_monitoring.rb +20 -16
  224. data/lib/new_relic/recipes/capistrano3.rb +1 -1
  225. data/lib/new_relic/recipes/capistrano_legacy.rb +6 -6
  226. data/lib/new_relic/recipes/helpers/send_deployment.rb +5 -5
  227. data/lib/new_relic/supportability_helper.rb +2 -0
  228. data/lib/new_relic/version.rb +1 -1
  229. data/lib/newrelic_rpm.rb +3 -3
  230. data/lib/sequel/extensions/new_relic_instrumentation.rb +3 -3
  231. data/lib/sequel/plugins/new_relic_instrumentation.rb +1 -1
  232. data/lib/tasks/config.rake +12 -12
  233. data/lib/tasks/coverage_report.rake +4 -4
  234. data/lib/tasks/helpers/format.rb +9 -9
  235. data/lib/tasks/helpers/removers.rb +5 -5
  236. data/lib/tasks/install.rake +4 -4
  237. data/lib/tasks/instrumentation_generator/instrumentation.thor +8 -8
  238. data/lib/tasks/instrumentation_generator/templates/chain.tt +1 -1
  239. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +1 -1
  240. data/lib/tasks/multiverse.rb +13 -6
  241. data/lib/tasks/newrelic.rb +1 -0
  242. data/lib/tasks/tests.rake +6 -6
  243. data/newrelic.yml +3 -3
  244. data/newrelic_rpm.gemspec +13 -13
  245. data/test/agent_helper.rb +25 -24
  246. metadata +73 -4
  247. data/lib/new_relic/agent/range_extensions.rb +0 -27
@@ -10,10 +10,10 @@ DependencyDetection.defer do
10
10
  end
11
11
 
12
12
  executes do
13
- NewRelic::Agent.logger.debug("Installing Passenger event hooks.")
13
+ NewRelic::Agent.logger.debug('Installing Passenger event hooks.')
14
14
 
15
15
  PhusionPassenger.on_event(:stopping_worker_process) do
16
- NewRelic::Agent.logger.debug("Passenger stopping this process, shutdown the agent.")
16
+ NewRelic::Agent.logger.debug('Passenger stopping this process, shutdown the agent.')
17
17
  NewRelic::Agent.instance.shutdown
18
18
  end
19
19
 
@@ -16,7 +16,7 @@ module NewRelic
16
16
  def deferred_dependency_check
17
17
  return if self.class._nr_deferred_detection_ran
18
18
 
19
- NewRelic::Agent.logger.info("Doing deferred dependency-detection before Rack startup")
19
+ NewRelic::Agent.logger.info('Doing deferred dependency-detection before Rack startup')
20
20
  DependencyDetection.detect!
21
21
  self.class._nr_deferred_detection_ran = true
22
22
  end
@@ -37,7 +37,7 @@ module NewRelic
37
37
  extend self
38
38
  def template_metric(identifier, options = {})
39
39
  if options[:file]
40
- "file"
40
+ 'file'
41
41
  elsif identifier.nil?
42
42
  ::NewRelic::Agent::UNKNOWN_METRIC
43
43
  elsif identifier.include?('/') # this is a filepath
@@ -112,7 +112,8 @@ DependencyDetection.defer do
112
112
  def render_with_newrelic(context, options)
113
113
  # This is needed for rails 3.2 compatibility
114
114
  @details = extract_details(options) if respond_to?(:extract_details, true)
115
- identifier = determine_template(options) ? determine_template(options).identifier : nil
115
+ # this file can't be found in SimpleCov, need to check test coverage
116
+ identifier = determine_template(options) ? determine_template(options).identifier : nil # rubocop:disable Style/SafeNavigation
116
117
  scope_name = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
117
118
  trace_execution_scoped(scope_name) do
118
119
  render_without_newrelic(context, options)
@@ -16,7 +16,7 @@ DependencyDetection.defer do
16
16
  end
17
17
 
18
18
  executes do
19
- NewRelic::Agent.logger.info("Installing Rails 3+ middleware instrumentation")
19
+ NewRelic::Agent.logger.info('Installing Rails 3+ middleware instrumentation')
20
20
  module ActionDispatch
21
21
  class MiddlewareStack
22
22
  class Middleware
@@ -16,7 +16,7 @@ module NewRelic
16
16
  timeout = NewRelic::Agent.config[:'rake.connect_timeout']
17
17
  NewRelic::Agent.instance.wait_on_connect(timeout)
18
18
  rescue => e
19
- NewRelic::Agent.logger.error("Exception in wait_on_connect", e)
19
+ NewRelic::Agent.logger.error('Exception in wait_on_connect', e)
20
20
  return yield
21
21
  end
22
22
 
@@ -36,9 +36,9 @@ module NewRelic
36
36
  end
37
37
 
38
38
  def safe_from_third_party_gem?
39
- return true unless NewRelic::LanguageSupport.bundled_gem?("newrelic-rake")
39
+ return true unless NewRelic::LanguageSupport.bundled_gem?('newrelic-rake')
40
40
 
41
- ::NewRelic::Agent.logger.info("Not installing New Relic supported Rake instrumentation because the third party newrelic-rake gem is present")
41
+ ::NewRelic::Agent.logger.info('Not installing New Relic supported Rake instrumentation because the third party newrelic-rake gem is present')
42
42
  false
43
43
  end
44
44
 
@@ -72,7 +72,7 @@ module NewRelic
72
72
  def instrument_invoke_prerequisites_concurrently(task)
73
73
  task.instance_eval do
74
74
  def invoke_prerequisites_concurrently(*_)
75
- NewRelic::Agent::MethodTracer.trace_execution_scoped("Rake/execute/multitask") do
75
+ NewRelic::Agent::MethodTracer.trace_execution_scoped('Rake/execute/multitask') do
76
76
  super
77
77
  end
78
78
  end
@@ -87,11 +87,11 @@ module NewRelic
87
87
  instrument_invoke_prerequisites_concurrently(task)
88
88
  end
89
89
  rescue => e
90
- NewRelic::Agent.logger.error("Error during Rake task invoke", e)
90
+ NewRelic::Agent.logger.error('Error during Rake task invoke', e)
91
91
  end
92
92
 
93
93
  def record_attributes(args, task)
94
- command_line = task.application.top_level_tasks.join(" ")
94
+ command_line = task.application.top_level_tasks.join(' ')
95
95
  NewRelic::Agent::Transaction.merge_untrusted_agent_attributes({:command => command_line},
96
96
  :'job.rake',
97
97
  NewRelic::Agent::AttributeFilter::DST_NONE)
@@ -102,7 +102,7 @@ module NewRelic
102
102
  NewRelic::Agent::AttributeFilter::DST_NONE)
103
103
  end
104
104
  rescue => e
105
- NewRelic::Agent.logger.error("Error during Rake task attribute recording.", e)
105
+ NewRelic::Agent.logger.error('Error during Rake task attribute recording.', e)
106
106
  end
107
107
 
108
108
  # Expects literal args passed to the task and array of task names
@@ -12,12 +12,12 @@ DependencyDetection.defer do
12
12
  configure_with :rake
13
13
 
14
14
  depends_on { defined?(Rake) && defined?(Rake::VERSION) }
15
- depends_on { Gem::Version.new(Rake::VERSION) >= Gem::Version.new("10.0.0") }
15
+ depends_on { Gem::Version.new(Rake::VERSION) >= Gem::Version.new('10.0.0') }
16
16
  depends_on { NewRelic::Agent.config[:'rake.tasks'].any? }
17
17
  depends_on { NewRelic::Agent::Instrumentation::Rake.safe_from_third_party_gem? }
18
18
 
19
19
  executes do
20
- NewRelic::Agent.logger.info("Installing Rake instrumentation")
20
+ NewRelic::Agent.logger.info('Installing Rake instrumentation')
21
21
  NewRelic::Agent.logger.debug("Instrumenting Rake tasks: #{NewRelic::Agent.config[:'rake.tasks']}")
22
22
  end
23
23
 
@@ -12,6 +12,6 @@ module NewRelic::Agent::Instrumentation::Redis
12
12
  PIPELINE_OPERATION = 'pipeline'
13
13
  HAS_REDIS_CLIENT = defined?(::Redis) &&
14
14
  Gem::Version.new(::Redis::VERSION) >= Gem::Version.new('5.0.0') &&
15
- !!defined?(::RedisClient)
15
+ !defined?(::RedisClient).nil?
16
16
  end
17
17
  end
@@ -79,7 +79,8 @@ module NewRelic::Agent::Instrumentation
79
79
  self
80
80
  # redis-client gem v0.11+ (self is a RedisClient::Middlewares)
81
81
  elsif respond_to?(:client)
82
- client && client.config
82
+ # The following line needs else branch coverage
83
+ client && client.config # rubocop:disable Style/SafeNavigation
83
84
  # redis-client gem <0.11 (self is a RedisClient::Middlewares)
84
85
  elsif defined?(::RedisClient)
85
86
  ::RedisClient.config if ::RedisClient.respond_to?(:config)
@@ -10,7 +10,7 @@ module NewRelic
10
10
  extend self
11
11
 
12
12
  def resque_fork_per_job?
13
- ENV["FORK_PER_JOB"] != 'false' && NewRelic::LanguageSupport.can_fork?
13
+ ENV['FORK_PER_JOB'] != 'false' && NewRelic::LanguageSupport.can_fork?
14
14
  end
15
15
  end
16
16
  end
@@ -28,9 +28,9 @@ DependencyDetection.defer do
28
28
  if Sequel::Database.respond_to?(:extension)
29
29
  Sequel::Database.extension(:new_relic_instrumentation)
30
30
  else
31
- NewRelic::Agent.logger.info("Detected Sequel version %s." % [Sequel::VERSION])
32
- NewRelic::Agent.logger.info("Please see additional documentation: " +
33
- "https://newrelic.com/docs/ruby/sequel-instrumentation")
31
+ NewRelic::Agent.logger.info('Detected Sequel version %s.' % [Sequel::VERSION])
32
+ NewRelic::Agent.logger.info('Please see additional documentation: ' +
33
+ 'https://newrelic.com/docs/ruby/sequel-instrumentation')
34
34
  end
35
35
 
36
36
  Sequel.synchronize { Sequel::DATABASES.dup }.each do |db|
@@ -40,7 +40,7 @@ DependencyDetection.defer do
40
40
  Sequel::Model.plugin(:new_relic_instrumentation) if defined?(Sequel::Model)
41
41
  else
42
42
 
43
- NewRelic::Agent.logger.info("Sequel instrumentation requires at least version 3.37.0.")
43
+ NewRelic::Agent.logger.info('Sequel instrumentation requires at least version 3.37.0.')
44
44
 
45
45
  end
46
46
  end
@@ -9,22 +9,22 @@ module NewRelic
9
9
  extend self
10
10
 
11
11
  # Fallback if the product cannot be determined
12
- DEFAULT_PRODUCT_NAME = "Sequel".freeze
12
+ DEFAULT_PRODUCT_NAME = 'Sequel'.freeze
13
13
 
14
14
  # A Sequel adapter is called an "adapter_scheme" and can be accessed from
15
15
  # the database:
16
16
  #
17
17
  # DB.adapter_scheme
18
18
  PRODUCT_NAMES = {
19
- :ibmdb => "IBMDB2",
20
- :firebird => "Firebird",
21
- :informix => "Informix",
22
- :jdbc => "JDBC",
23
- :mysql => "MySQL",
24
- :mysql2 => "MySQL",
25
- :oracle => "Oracle",
26
- :postgres => "Postgres",
27
- :sqlite => "SQLite"
19
+ :ibmdb => 'IBMDB2',
20
+ :firebird => 'Firebird',
21
+ :informix => 'Informix',
22
+ :jdbc => 'JDBC',
23
+ :mysql => 'MySQL',
24
+ :mysql2 => 'MySQL',
25
+ :oracle => 'Oracle',
26
+ :postgres => 'Postgres',
27
+ :sqlite => 'SQLite'
28
28
  }.freeze
29
29
 
30
30
  def product_name_from_adapter(adapter)
@@ -23,7 +23,7 @@ if defined?(Sidekiq::VERSION) && Sidekiq::VERSION < '7.0.0'
23
23
  :category => 'OtherTransaction/SidekiqJob'
24
24
  }
25
25
  rescue => e
26
- NewRelic::Agent.logger.error("Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass", e)
26
+ NewRelic::Agent.logger.error('Failure during deserializing YAML for Sidekiq::Extensions::DelayedClass', e)
27
27
  NewRelic::Agent::Instrumentation::Sidekiq::Server.default_trace_args(msg)
28
28
  end
29
29
  end
@@ -21,7 +21,7 @@ module NewRelic::Agent::Instrumentation::Sidekiq
21
21
  NewRelic::Agent::Transaction.merge_untrusted_agent_attributes(msg['args'], :'job.sidekiq.args',
22
22
  NewRelic::Agent::AttributeFilter::DST_NONE)
23
23
 
24
- ::NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(trace_headers, "Other") if ::NewRelic::Agent.config[:'distributed_tracing.enabled']
24
+ ::NewRelic::Agent::DistributedTracing::accept_distributed_trace_headers(trace_headers, 'Other') if ::NewRelic::Agent.config[:'distributed_tracing.enabled'] && trace_headers&.any?
25
25
  yield
26
26
  end
27
27
  end
@@ -1,6 +1,7 @@
1
1
  # This file is distributed under New Relic's license terms.
2
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
3
3
  # frozen_string_literal: true
4
+
4
5
  require_relative 'sidekiq/client'
5
6
  require_relative 'sidekiq/server'
6
7
  require_relative 'sidekiq/extensions/delayed_class'
@@ -33,7 +33,7 @@ module NewRelic::Agent::Instrumentation
33
33
  set(:newrelic_ignores, Hash.new([])) if !respond_to?(:newrelic_ignores)
34
34
 
35
35
  # If we call an ignore without a route, it applies to the whole app
36
- routes = ["*"] if routes.empty?
36
+ routes = ['*'] if routes.empty?
37
37
 
38
38
  settings.newrelic_ignores[type] += routes.map do |r|
39
39
  # Ugly sending to private Base#compile, but we want to mimic
@@ -45,7 +45,8 @@ module NewRelic::Agent::Instrumentation
45
45
 
46
46
  def try_to_use(app, clazz)
47
47
  install_lock.synchronize do
48
- has_middleware = app.middleware && app.middleware.any? { |info| info && info[0] == clazz }
48
+ # The following line needs else branch coverage
49
+ has_middleware = app.middleware && app.middleware.any? { |info| info && info[0] == clazz } # rubocop:disable Style/SafeNavigation
49
50
  app.use(clazz) unless has_middleware
50
51
  end
51
52
  end
@@ -53,9 +54,9 @@ module NewRelic::Agent::Instrumentation
53
54
  # Capture last route we've seen. Will set for transaction on route_eval
54
55
  def process_route_with_tracing(*args)
55
56
  begin
56
- env["newrelic.last_route"] = args[0]
57
+ env['newrelic.last_route'] = args[0]
57
58
  rescue => e
58
- ::NewRelic::Agent.logger.debug("Failed determining last route in Sinatra", e)
59
+ ::NewRelic::Agent.logger.debug('Failed determining last route in Sinatra', e)
59
60
  end
60
61
  yield
61
62
  end
@@ -74,7 +75,7 @@ module NewRelic::Agent::Instrumentation
74
75
  )
75
76
  end
76
77
  rescue => e
77
- ::NewRelic::Agent.logger.debug("Failed during route_eval to set transaction name", e)
78
+ ::NewRelic::Agent.logger.debug('Failed during route_eval to set transaction name', e)
78
79
  end
79
80
  yield
80
81
  end
@@ -83,7 +84,7 @@ module NewRelic::Agent::Instrumentation
83
84
  begin
84
85
  @request.params
85
86
  rescue => e
86
- NewRelic::Agent.logger.debug("Failed to get params from Rack request.", e)
87
+ NewRelic::Agent.logger.debug('Failed to get params from Rack request.', e)
87
88
  nil
88
89
  end
89
90
  end
@@ -47,7 +47,7 @@ module NewRelic
47
47
  # For bare Sinatra, our override on process_route captures the last
48
48
  # route into the environment for us to use later on
49
49
  def route_for_sinatra(env)
50
- env["newrelic.last_route"]
50
+ env['newrelic.last_route']
51
51
  end
52
52
 
53
53
  # For Padrino, the request object has a copy of the matched route
@@ -32,7 +32,8 @@ module NewRelic
32
32
  raise
33
33
  end
34
34
  ensure
35
- finishable.finish if finishable
35
+ # The following line needs else branch coverage
36
+ finishable.finish if finishable # rubocop:disable Style/SafeNavigation
36
37
  end
37
38
  end
38
39
  end
@@ -6,10 +6,10 @@ module NewRelic
6
6
  module Agent
7
7
  module Instrumentation
8
8
  module Typhoeus
9
- HYDRA_SEGMENT_NAME = "External/Multiple/Typhoeus::Hydra/run"
10
- NOTICEABLE_ERROR_CLASS = "Typhoeus::Errors::TyphoeusError"
9
+ HYDRA_SEGMENT_NAME = 'External/Multiple/Typhoeus::Hydra/run'
10
+ NOTICEABLE_ERROR_CLASS = 'Typhoeus::Errors::TyphoeusError'
11
11
 
12
- EARLIEST_VERSION = Gem::Version.new("0.5.3")
12
+ EARLIEST_VERSION = Gem::Version.new('0.5.3')
13
13
 
14
14
  def self.is_supported_version?
15
15
  Gem::Version.new(::Typhoeus::VERSION) >= EARLIEST_VERSION
@@ -26,7 +26,7 @@ module NewRelic
26
26
  response.return_message
27
27
  else
28
28
  # 0.5.4 seems to have lost xxxx_message methods altogether.
29
- "timeout"
29
+ 'timeout'
30
30
  end
31
31
  end
32
32
 
@@ -72,7 +72,7 @@ module NewRelic
72
72
  end
73
73
  request.on_complete.unshift(callback)
74
74
  rescue => e
75
- NewRelic::Agent.logger.error("Exception during trace setup for Typhoeus request", e)
75
+ NewRelic::Agent.logger.error('Exception during trace setup for Typhoeus request', e)
76
76
  end
77
77
  end
78
78
  end
@@ -23,7 +23,7 @@ module NewRelic
23
23
  "JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
24
24
 
25
25
  if !NewRelic::Agent.config[:'rum.enabled']
26
- NewRelic::Agent.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
26
+ NewRelic::Agent.logger.debug('Real User Monitoring is disabled for this agent. Edit your configuration to change this.')
27
27
  end
28
28
  end
29
29
 
@@ -38,19 +38,19 @@ module NewRelic
38
38
  def js_enabled_and_ready?
39
39
  if !enabled?
40
40
  ::NewRelic::Agent.logger.log_once(:debug, :js_agent_disabled,
41
- "JS agent instrumentation is disabled.")
41
+ 'JS agent instrumentation is disabled.')
42
42
  false
43
43
  elsif missing_config?(:js_agent_loader)
44
44
  ::NewRelic::Agent.logger.log_once(:debug, :missing_js_agent_loader,
45
- "Missing :js_agent_loader. Skipping browser instrumentation.")
45
+ 'Missing :js_agent_loader. Skipping browser instrumentation.')
46
46
  false
47
47
  elsif missing_config?(:beacon)
48
48
  ::NewRelic::Agent.logger.log_once(:debug, :missing_beacon,
49
- "Beacon configuration not received (yet?). Skipping browser instrumentation.")
49
+ 'Beacon configuration not received (yet?). Skipping browser instrumentation.')
50
50
  false
51
51
  elsif missing_config?(:browser_key)
52
52
  ::NewRelic::Agent.logger.log_once(:debug, :missing_browser_key,
53
- "Browser key is not set. Skipping browser instrumentation.")
53
+ 'Browser key is not set. Skipping browser instrumentation.')
54
54
  false
55
55
  else
56
56
  true
@@ -62,19 +62,19 @@ module NewRelic
62
62
 
63
63
  def insert_js?(state)
64
64
  if !state.current_transaction
65
- ::NewRelic::Agent.logger.debug("Not in transaction. Skipping browser instrumentation.")
65
+ ::NewRelic::Agent.logger.debug('Not in transaction. Skipping browser instrumentation.')
66
66
  false
67
67
  elsif !state.is_execution_traced?
68
- ::NewRelic::Agent.logger.debug("Execution is not traced. Skipping browser instrumentation.")
68
+ ::NewRelic::Agent.logger.debug('Execution is not traced. Skipping browser instrumentation.')
69
69
  false
70
70
  elsif state.current_transaction.ignore_enduser?
71
- ::NewRelic::Agent.logger.debug("Ignore end user for this transaction is set. Skipping browser instrumentation.")
71
+ ::NewRelic::Agent.logger.debug('Ignore end user for this transaction is set. Skipping browser instrumentation.')
72
72
  false
73
73
  else
74
74
  true
75
75
  end
76
76
  rescue => e
77
- ::NewRelic::Agent.logger.debug("Failure during insert_js", e)
77
+ ::NewRelic::Agent.logger.debug('Failure during insert_js', e)
78
78
  false
79
79
  end
80
80
 
@@ -95,7 +95,7 @@ module NewRelic
95
95
 
96
96
  bt_config + browser_timing_loader(nonce)
97
97
  rescue => e
98
- ::NewRelic::Agent.logger.debug("Failure during RUM browser_timing_header construction", e)
98
+ ::NewRelic::Agent.logger.debug('Failure during RUM browser_timing_header construction', e)
99
99
  ''
100
100
  end
101
101
 
@@ -122,18 +122,18 @@ module NewRelic
122
122
  " nonce=\"#{nonce.to_s}\""
123
123
  end
124
124
 
125
- BEACON_KEY = "beacon".freeze
126
- ERROR_BEACON_KEY = "errorBeacon".freeze
127
- LICENSE_KEY_KEY = "licenseKey".freeze
128
- APPLICATIONID_KEY = "applicationID".freeze
129
- TRANSACTION_NAME_KEY = "transactionName".freeze
130
- QUEUE_TIME_KEY = "queueTime".freeze
131
- APPLICATION_TIME_KEY = "applicationTime".freeze
132
- AGENT_KEY = "agent".freeze
133
- SSL_FOR_HTTP_KEY = "sslForHttp".freeze
134
- ATTS_KEY = "atts".freeze
135
- ATTS_USER_SUBKEY = "u".freeze
136
- ATTS_AGENT_SUBKEY = "a".freeze
125
+ BEACON_KEY = 'beacon'.freeze
126
+ ERROR_BEACON_KEY = 'errorBeacon'.freeze
127
+ LICENSE_KEY_KEY = 'licenseKey'.freeze
128
+ APPLICATIONID_KEY = 'applicationID'.freeze
129
+ TRANSACTION_NAME_KEY = 'transactionName'.freeze
130
+ QUEUE_TIME_KEY = 'queueTime'.freeze
131
+ APPLICATION_TIME_KEY = 'applicationTime'.freeze
132
+ AGENT_KEY = 'agent'.freeze
133
+ SSL_FOR_HTTP_KEY = 'sslForHttp'.freeze
134
+ ATTS_KEY = 'atts'.freeze
135
+ ATTS_USER_SUBKEY = 'u'.freeze
136
+ ATTS_AGENT_SUBKEY = 'a'.freeze
137
137
 
138
138
  # NOTE: Internal prototyping may override this, so leave name stable!
139
139
  def data_for_js_agent(transaction)
@@ -185,9 +185,14 @@ module NewRelic
185
185
 
186
186
  def append_custom_attributes!(txn, atts)
187
187
  custom_attributes = txn.attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_BROWSER_MONITORING)
188
- unless custom_attributes.empty?
189
- atts[ATTS_USER_SUBKEY] = custom_attributes
188
+ if custom_attributes.empty?
189
+ NewRelic::Agent.logger.debug("#{self.class}: No custom attributes found to append.")
190
+ return
190
191
  end
192
+
193
+ NewRelic::Agent.logger.debug("#{self.class}: Appending the following custom attribute keys for browser " \
194
+ "monitoring: #{custom_attributes.keys}")
195
+ atts[ATTS_USER_SUBKEY] = custom_attributes
191
196
  end
192
197
 
193
198
  def append_agent_attributes!(txn, atts)
@@ -11,7 +11,7 @@ module NewRelic
11
11
  extend self
12
12
 
13
13
  def append_service_linking_metadata(metadata)
14
- raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
14
+ raise ArgumentError, 'Missing argument `metadata`' if metadata.nil?
15
15
 
16
16
  config = ::NewRelic::Agent.config
17
17
 
@@ -27,7 +27,7 @@ module NewRelic
27
27
  end
28
28
 
29
29
  def append_trace_linking_metadata(metadata)
30
- raise ArgumentError, "Missing argument `metadata`" if metadata.nil?
30
+ raise ArgumentError, 'Missing argument `metadata`' if metadata.nil?
31
31
 
32
32
  if trace_id = Tracer.current_trace_id
33
33
  metadata[TRACE_ID_KEY] = trace_id
@@ -9,20 +9,20 @@ module NewRelic
9
9
  module Agent
10
10
  class LogEventAggregator < EventAggregator
11
11
  # Per-message keys
12
- LEVEL_KEY = "level".freeze
13
- MESSAGE_KEY = "message".freeze
14
- TIMESTAMP_KEY = "timestamp".freeze
15
- PRIORITY_KEY = "priority".freeze
12
+ LEVEL_KEY = 'level'.freeze
13
+ MESSAGE_KEY = 'message'.freeze
14
+ TIMESTAMP_KEY = 'timestamp'.freeze
15
+ PRIORITY_KEY = 'priority'.freeze
16
16
 
17
17
  # Metric keys
18
- LINES = "Logging/lines".freeze
19
- DROPPED_METRIC = "Logging/Forwarding/Dropped".freeze
20
- SEEN_METRIC = "Supportability/Logging/Forwarding/Seen".freeze
21
- SENT_METRIC = "Supportability/Logging/Forwarding/Sent".freeze
22
- OVERALL_SUPPORTABILITY_FORMAT = "Supportability/Logging/Ruby/Logger/%s".freeze
23
- METRICS_SUPPORTABILITY_FORMAT = "Supportability/Logging/Metrics/Ruby/%s".freeze
24
- FORWARDING_SUPPORTABILITY_FORMAT = "Supportability/Logging/Forwarding/Ruby/%s".freeze
25
- DECORATING_SUPPORTABILITY_FORMAT = "Supportability/Logging/LocalDecorating/Ruby/%s".freeze
18
+ LINES = 'Logging/lines'.freeze
19
+ DROPPED_METRIC = 'Logging/Forwarding/Dropped'.freeze
20
+ SEEN_METRIC = 'Supportability/Logging/Forwarding/Seen'.freeze
21
+ SENT_METRIC = 'Supportability/Logging/Forwarding/Sent'.freeze
22
+ OVERALL_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Ruby/Logger/%s'.freeze
23
+ METRICS_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Metrics/Ruby/%s'.freeze
24
+ FORWARDING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/Forwarding/Ruby/%s'.freeze
25
+ DECORATING_SUPPORTABILITY_FORMAT = 'Supportability/Logging/LocalDecorating/Ruby/%s'.freeze
26
26
  MAX_BYTES = 32768 # 32 * 1024 bytes (32 kibibytes)
27
27
 
28
28
  named :LogEventAggregator
@@ -54,7 +54,7 @@ module NewRelic
54
54
  def record(formatted_message, severity)
55
55
  return unless enabled?
56
56
 
57
- severity = "UNKNOWN" if severity.nil? || severity.empty?
57
+ severity = 'UNKNOWN' if severity.nil? || severity.empty?
58
58
 
59
59
  if NewRelic::Agent.config[METRICS_ENABLED_KEY]
60
60
  @counter_lock.synchronize do
@@ -174,9 +174,9 @@ module NewRelic
174
174
  def record_configuration_metric(format, key)
175
175
  state = NewRelic::Agent.config[key]
176
176
  label = if !enabled?
177
- "disabled"
177
+ 'disabled'
178
178
  else
179
- state ? "enabled" : "disabled"
179
+ state ? 'enabled' : 'disabled'
180
180
  end
181
181
  NewRelic::Agent.increment_metric(format % label)
182
182
  end