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
@@ -107,7 +107,7 @@ module NewRelic
107
107
  current_transaction.notice_error(exception)
108
108
  raise
109
109
  ensure
110
- finishable.finish if finishable
110
+ finishable&.finish
111
111
  end
112
112
  end
113
113
 
@@ -246,8 +246,8 @@ module NewRelic
246
246
  log_error('start_segment', exception)
247
247
  end
248
248
 
249
- UNKNOWN = "Unknown".freeze
250
- OTHER = "other".freeze
249
+ UNKNOWN = 'Unknown'.freeze
250
+ OTHER = 'other'.freeze
251
251
 
252
252
  # Creates and starts a datastore segment used to time
253
253
  # datastore operations.
@@ -355,7 +355,8 @@ module NewRelic
355
355
 
356
356
  yield
357
357
  rescue => exception
358
- if segment && segment.is_a?(Transaction::AbstractSegment)
358
+ # needs else branch coverage
359
+ if segment && segment.is_a?(Transaction::AbstractSegment) # rubocop:disable Style/SafeNavigation
359
360
  segment.notice_error(exception)
360
361
  end
361
362
  raise
@@ -425,6 +426,7 @@ module NewRelic
425
426
  begin
426
427
  if current_txn
427
428
  NewRelic::Agent::Tracer.state.current_transaction = current_txn
429
+ current_txn.async = true
428
430
  segment_name += "/Thread#{::Thread.current.object_id}/Fiber#{::Fiber.current.object_id}" if NewRelic::Agent.config[:'thread_ids_enabled']
429
431
  segment = NewRelic::Agent::Tracer.start_segment(name: segment_name, parent: parent)
430
432
  end
@@ -487,7 +489,8 @@ module NewRelic
487
489
  end
488
490
 
489
491
  def pop_traced
490
- @untraced.pop if @untraced
492
+ # needs else branch coverage
493
+ @untraced.pop if @untraced # rubocop:disable Style/SafeNavigation
491
494
  end
492
495
 
493
496
  def is_execution_traced?
@@ -507,7 +510,5 @@ module NewRelic
507
510
  attr_accessor :sql_sampler_transaction_data
508
511
  end
509
512
  end
510
-
511
- TransactionState = Tracer
512
513
  end
513
514
  end
@@ -56,7 +56,7 @@ module NewRelic
56
56
  @start_time ||= Process.clock_gettime(Process::CLOCK_REALTIME)
57
57
  return unless transaction
58
58
 
59
- parent.child_start(self) if parent
59
+ parent&.child_start(self)
60
60
  end
61
61
 
62
62
  def finish
@@ -228,7 +228,7 @@ module NewRelic
228
228
 
229
229
  if finished?
230
230
  transaction.async = true
231
- parent.descendant_complete(self, segment) if parent
231
+ parent&.descendant_complete(self, segment)
232
232
  end
233
233
  end
234
234
 
@@ -262,19 +262,19 @@ module NewRelic
262
262
 
263
263
  def force_finish
264
264
  finish
265
- NewRelic::Agent.logger.warn("Segment: #{name} was unfinished at " \
266
- "the end of transaction. Timing information for this segment's" \
267
- "parent #{parent.name} in #{transaction.best_name} may be inaccurate.")
265
+ NewRelic::Agent.logger.send(transaction.async? ? :debug : :warn, "Segment: #{name} was unfinished at " \
266
+ "the end of transaction. Timing information for this segment's " \
267
+ "parent #{parent&.name} in #{transaction.best_name} may be inaccurate.")
268
268
  end
269
269
 
270
270
  def run_complete_callbacks
271
271
  segment_complete
272
- parent.child_complete(self) if parent
272
+ parent&.child_complete(self)
273
273
  transaction.segment_complete(self)
274
274
  end
275
275
 
276
276
  def record_metrics
277
- raise NotImplementedError, "Subclasses must implement record_metrics"
277
+ raise NotImplementedError, 'Subclasses must implement record_metrics'
278
278
  end
279
279
 
280
280
  # callback for subclasses to override
@@ -24,7 +24,7 @@ module NewRelic
24
24
  @nosql_statement = nil
25
25
  @record_sql = true
26
26
  set_instance_info(host, port_path_or_id)
27
- @database_name = database_name ? database_name.to_s : nil
27
+ @database_name = database_name&.to_s
28
28
  super(Datastores::MetricHelper.scoped_metric_for(product, operation, collection),
29
29
  nil,
30
30
  start_time)
@@ -35,7 +35,7 @@ module NewRelic
35
35
  end
36
36
 
37
37
  def caller_transport_type
38
- @caller_transport_type ||= "Unknown"
38
+ @caller_transport_type ||= 'Unknown'
39
39
  end
40
40
 
41
41
  def accept_transport_type_from_api(value)
@@ -68,8 +68,9 @@ module NewRelic
68
68
  )
69
69
  end
70
70
 
71
- def log_request_headers(headers, direction = "OUTGOING")
72
- NewRelic::Agent.logger.debug("#{direction} REQUEST HEADERS: #{headers}")
71
+ def log_request_headers(headers, direction = 'OUTGOING')
72
+ printed_headers = headers.is_a?(NewRelic::Agent::HTTPClients::AbstractRequest) ? headers.headers : headers
73
+ NewRelic::Agent.logger.debug("#{direction} REQUEST HEADERS: #{printed_headers}")
73
74
  end
74
75
 
75
76
  def insert_headers(headers)
@@ -82,12 +83,12 @@ module NewRelic
82
83
  end
83
84
 
84
85
  def consume_message_headers(headers, tracer_state, transport_type)
85
- log_request_headers(headers, "INCOMING")
86
+ log_request_headers(headers, 'INCOMING')
86
87
  consume_message_distributed_tracing_headers(headers, transport_type)
87
88
  consume_message_cross_app_tracing_headers(headers, tracer_state)
88
89
  consume_message_synthetics_headers(headers)
89
90
  rescue => e
90
- NewRelic::Agent.logger.error("Error in consume_message_headers", e)
91
+ NewRelic::Agent.logger.error('Error in consume_message_headers', e)
91
92
  end
92
93
 
93
94
  def assign_intrinsics
@@ -135,7 +136,7 @@ module NewRelic
135
136
  transaction.synthetics_payload = incoming_payload
136
137
  end
137
138
  rescue => e
138
- NewRelic::Agent.logger.error("Error in consume_message_synthetics_header", e)
139
+ NewRelic::Agent.logger.error('Error in consume_message_synthetics_header', e)
139
140
  end
140
141
 
141
142
  def consume_message_distributed_tracing_headers(headers, transport_type)
@@ -13,7 +13,7 @@ module NewRelic
13
13
  attr_accessor :distributed_trace_payload
14
14
  attr_writer :distributed_trace_payload_created
15
15
 
16
- SUPPORTABILITY_DISTRIBUTED_TRACE = "Supportability/DistributedTrace"
16
+ SUPPORTABILITY_DISTRIBUTED_TRACE = 'Supportability/DistributedTrace'
17
17
  CREATE_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/CreatePayload"
18
18
  ACCEPT_PREFIX = "#{SUPPORTABILITY_DISTRIBUTED_TRACE}/AcceptPayload"
19
19
  IGNORE_PREFIX = "#{ACCEPT_PREFIX}/Ignored"
@@ -30,10 +30,10 @@ module NewRelic
30
30
  IGNORE_ACCEPT_MAJOR_VERSION_METRIC = "#{IGNORE_PREFIX}/MajorVersion"
31
31
  IGNORE_ACCEPT_UNTRUSTED_ACCOUNT_METRIC = "#{IGNORE_PREFIX}/UntrustedAccount"
32
32
 
33
- LBRACE = "{"
33
+ LBRACE = '{'
34
34
  NULL_PAYLOAD = 'null'
35
35
 
36
- NEWRELIC_TRACE_KEY = "HTTP_NEWRELIC"
36
+ NEWRELIC_TRACE_KEY = 'HTTP_NEWRELIC'
37
37
 
38
38
  def accept_distributed_tracing_incoming_request(request)
39
39
  return unless Agent.config[:'distributed_tracing.enabled']
@@ -55,7 +55,7 @@ module NewRelic
55
55
  payload
56
56
  rescue => e
57
57
  NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
58
- NewRelic::Agent.logger.warn("Failed to create distributed trace payload", e)
58
+ NewRelic::Agent.logger.warn('Failed to create distributed trace payload', e)
59
59
  nil
60
60
  end
61
61
 
@@ -75,7 +75,7 @@ module NewRelic
75
75
  true
76
76
  rescue => e
77
77
  NewRelic::Agent.increment_metric(ACCEPT_EXCEPTION_METRIC)
78
- NewRelic::Agent.logger.warn("Failed to accept distributed trace payload", e)
78
+ NewRelic::Agent.logger.warn('Failed to accept distributed trace payload', e)
79
79
  false
80
80
  end
81
81
 
@@ -114,7 +114,7 @@ module NewRelic
114
114
  decoded
115
115
  rescue => e
116
116
  NewRelic::Agent.increment_metric(ACCEPT_PARSE_EXCEPTION_METRIC)
117
- NewRelic::Agent.logger.warn("Error parsing distributed trace payload", e)
117
+ NewRelic::Agent.logger.warn('Error parsing distributed trace payload', e)
118
118
  nil
119
119
  end
120
120
 
@@ -16,10 +16,10 @@ module NewRelic
16
16
  NR_SYNTHETICS_HEADER = 'X-NewRelic-Synthetics'
17
17
  APP_DATA_KEY = 'NewRelicAppData'
18
18
 
19
- EXTERNAL_ALL = "External/all"
20
- EXTERNAL_ALL_WEB = "External/allWeb"
21
- EXTERNAL_ALL_OTHER = "External/allOther"
22
- MISSING_STATUS_CODE = "MissingHTTPStatusCode"
19
+ EXTERNAL_ALL = 'External/all'
20
+ EXTERNAL_ALL_WEB = 'External/allWeb'
21
+ EXTERNAL_ALL_OTHER = 'External/allOther'
22
+ MISSING_STATUS_CODE = 'MissingHTTPStatusCode'
23
23
 
24
24
  attr_reader :library, :uri, :procedure, :http_status_code
25
25
  attr_writer :record_agent_attributes
@@ -62,14 +62,14 @@ module NewRelic
62
62
  # @api public
63
63
  def add_request_headers(request)
64
64
  process_host_header(request)
65
- synthetics_header = transaction && transaction.raw_synthetics_header
65
+ synthetics_header = transaction&.raw_synthetics_header
66
66
  insert_synthetics_header(request, synthetics_header) if synthetics_header
67
67
 
68
68
  return unless record_metrics?
69
69
 
70
70
  transaction.distributed_tracer.insert_headers(request)
71
71
  rescue => e
72
- NewRelic::Agent.logger.error("Error in add_request_headers", e)
72
+ NewRelic::Agent.logger.error('Error in add_request_headers', e)
73
73
  end
74
74
 
75
75
  # This method extracts app data from an external response if present. If
@@ -92,10 +92,10 @@ module NewRelic
92
92
  @app_data = data
93
93
  update_segment_name
94
94
  else
95
- NewRelic::Agent.logger.debug("External segment response has invalid cross_app_id")
95
+ NewRelic::Agent.logger.debug('External segment response has invalid cross_app_id')
96
96
  end
97
97
  rescue => e
98
- NewRelic::Agent.logger.error("Error in read_response_headers", e)
98
+ NewRelic::Agent.logger.error('Error in read_response_headers', e)
99
99
  end
100
100
 
101
101
  def cross_app_request? # :nodoc:
@@ -154,7 +154,7 @@ module NewRelic
154
154
 
155
155
  end
156
156
  rescue => e
157
- NewRelic::Agent.logger.error("error during get_request_metadata", e)
157
+ NewRelic::Agent.logger.error('error during get_request_metadata', e)
158
158
  end
159
159
 
160
160
  # Process obfuscated +String+ sent from a called application that is also running a New Relic agent and
@@ -176,13 +176,13 @@ module NewRelic
176
176
  @app_data = app_data
177
177
  update_segment_name
178
178
  else
179
- NewRelic::Agent.logger.error("error processing response metadata: invalid/non-trusted ID")
179
+ NewRelic::Agent.logger.error('error processing response metadata: invalid/non-trusted ID')
180
180
  end
181
181
  end
182
182
 
183
183
  nil
184
184
  rescue => e
185
- NewRelic::Agent.logger.error("error during process_response_metadata", e)
185
+ NewRelic::Agent.logger.error('error during process_response_metadata', e)
186
186
  end
187
187
 
188
188
  def record_metrics
@@ -91,7 +91,7 @@ module NewRelic
91
91
  transaction.distributed_tracer.log_request_headers(headers)
92
92
  end
93
93
  rescue => e
94
- NewRelic::Agent.logger.error("Error during message header processing", e)
94
+ NewRelic::Agent.logger.error('Error during message header processing', e)
95
95
  end
96
96
  end
97
97
  end
@@ -11,7 +11,7 @@ module NewRelic
11
11
  attr_reader :request_path, :referer, :accept, :content_length, :content_type,
12
12
  :host, :port, :user_agent, :request_method
13
13
 
14
- HTTP_ACCEPT_HEADER_KEY = "HTTP_ACCEPT".freeze
14
+ HTTP_ACCEPT_HEADER_KEY = 'HTTP_ACCEPT'.freeze
15
15
 
16
16
  def initialize(request)
17
17
  @request_path = path_from_request(request)
@@ -85,7 +85,7 @@ module NewRelic
85
85
  # rails construct the PATH_INFO enviroment variable improperly and we're generally
86
86
  # being defensive.
87
87
 
88
- ROOT_PATH = "/".freeze
88
+ ROOT_PATH = '/'.freeze
89
89
 
90
90
  def path_from_request(request)
91
91
  path = attribute_from_request(request, :path) || ''
@@ -32,7 +32,7 @@ module NewRelic
32
32
  if segment = NewRelic::Agent::Tracer.current_segment
33
33
  segment.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
34
34
  else
35
- NewRelic::Agent.logger.debug("Attempted to merge untrusted attributes without segment")
35
+ NewRelic::Agent.logger.debug('Attempted to merge untrusted attributes without segment')
36
36
  end
37
37
  end
38
38
 
@@ -13,7 +13,7 @@ module NewRelic
13
13
  end
14
14
 
15
15
  def allow_sample?(sample)
16
- sample.synthetics_resource_id != nil
16
+ !sample.synthetics_resource_id.nil?
17
17
  end
18
18
 
19
19
  def truncate_samples
@@ -14,7 +14,7 @@ module NewRelic
14
14
  attr_accessor :transaction_name, :guid, :attributes,
15
15
  :node_count, :finished, :threshold, :profile
16
16
 
17
- ROOT = "ROOT".freeze
17
+ ROOT = 'ROOT'.freeze
18
18
 
19
19
  def initialize(start_time)
20
20
  @start_time = start_time
@@ -20,7 +20,7 @@ module NewRelic
20
20
  end
21
21
  end
22
22
 
23
- SUPPORTABILITY_PREFIX = "Supportability/TraceContext"
23
+ SUPPORTABILITY_PREFIX = 'Supportability/TraceContext'
24
24
  CREATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/Create"
25
25
  ACCEPT_PREFIX = "#{SUPPORTABILITY_PREFIX}/Accept"
26
26
  TRACESTATE_PREFIX = "#{SUPPORTABILITY_PREFIX}/TraceState"
@@ -73,7 +73,7 @@ module NewRelic
73
73
  true
74
74
  rescue Exception => e
75
75
  NewRelic::Agent.increment_metric(CREATE_EXCEPTION_METRIC)
76
- NewRelic::Agent.logger.warn("Failed to create trace context payload", e)
76
+ NewRelic::Agent.logger.warn('Failed to create trace context payload', e)
77
77
  false
78
78
  end
79
79
 
@@ -95,7 +95,7 @@ module NewRelic
95
95
 
96
96
  def create_trace_state_payload
97
97
  unless Agent.config[:'distributed_tracing.enabled']
98
- NewRelic::Agent.logger.warn("Not configured to create WC3 trace context payload")
98
+ NewRelic::Agent.logger.warn('Not configured to create WC3 trace context payload')
99
99
  return
100
100
  end
101
101
 
@@ -144,7 +144,7 @@ module NewRelic
144
144
  true
145
145
  rescue => e
146
146
  NewRelic::Agent.increment_metric(ACCEPT_EXCEPTION_METRIC)
147
- NewRelic::Agent.logger.warn("Failed to accept trace context payload", e)
147
+ NewRelic::Agent.logger.warn('Failed to accept trace context payload', e)
148
148
  false
149
149
  end
150
150
 
@@ -58,7 +58,7 @@ module NewRelic
58
58
  end
59
59
 
60
60
  def to_s_compact
61
- str = String.new('')
61
+ str = +''
62
62
  str << metric_name
63
63
  if children.any?
64
64
  str << "{#{children.map { |cs| cs.to_s_compact }.join(',')}}"
@@ -67,9 +67,9 @@ module NewRelic
67
67
  end
68
68
 
69
69
  def to_debug_str(depth)
70
- tab = String.new(' ') * depth
70
+ tab = (+' ') * depth
71
71
  s = tab.clone
72
- s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split("::").last}] #{metric_name} \n"
72
+ s << ">> #{'%3i ms' % (@entry_timestamp * 1000)} [#{self.class.name.split('::').last}] #{metric_name} \n"
73
73
  unless params.empty?
74
74
  params.each do |k, v|
75
75
  s << "#{tab} -#{'%-16s' % k}: #{v.to_s[0..80]}\n"
@@ -136,10 +136,8 @@ module NewRelic
136
136
  def each_node(&block)
137
137
  yield(self)
138
138
 
139
- if @children
140
- @children.each do |node|
141
- node.each_node(&block)
142
- end
139
+ @children&.each do |node|
140
+ node.each_node(&block)
143
141
  end
144
142
  end
145
143
 
@@ -149,11 +147,14 @@ module NewRelic
149
147
  summary = yield(self)
150
148
  summary.current_nest_count += 1 if summary
151
149
 
150
+ # no then branch coverage
151
+ # rubocop:disable Style/SafeNavigation
152
152
  if @children
153
153
  @children.each do |node|
154
154
  node.each_node_with_nest_tracking(&block)
155
155
  end
156
156
  end
157
+ # rubocop:enable Style/SafeNavigation
157
158
 
158
159
  summary.current_nest_count -= 1 if summary
159
160
  end
@@ -52,8 +52,8 @@ module NewRelic
52
52
  segments.each { |s| s.finalize }
53
53
  end
54
54
 
55
- WEB_TRANSACTION_TOTAL_TIME = "WebTransactionTotalTime".freeze
56
- OTHER_TRANSACTION_TOTAL_TIME = "OtherTransactionTotalTime".freeze
55
+ WEB_TRANSACTION_TOTAL_TIME = 'WebTransactionTotalTime'.freeze
56
+ OTHER_TRANSACTION_TOTAL_TIME = 'OtherTransactionTotalTime'.freeze
57
57
 
58
58
  def record_total_time_metrics
59
59
  total_time_metric = if recording_web_transaction?
@@ -63,7 +63,7 @@ module NewRelic
63
63
  #
64
64
  # This value will be forcibly capped by the max_capacity
65
65
  def capacity
66
- raise NotImplementedError.new("TransactionSampleBuffer subclasses must provide a capacity override")
66
+ raise NotImplementedError.new('TransactionSampleBuffer subclasses must provide a capacity override')
67
67
  end
68
68
 
69
69
  # Apply hard upper limit to the capacity to prevent users from
@@ -23,10 +23,10 @@ module NewRelic
23
23
  include Tracing
24
24
 
25
25
  # for nested transactions
26
- NESTED_TRANSACTION_PREFIX = "Nested/"
27
- CONTROLLER_PREFIX = "Controller/"
28
- MIDDLEWARE_PREFIX = "Middleware/Rack/"
29
- OTHER_TRANSACTION_PREFIX = "OtherTransaction/"
26
+ NESTED_TRANSACTION_PREFIX = 'Nested/'
27
+ CONTROLLER_PREFIX = 'Controller/'
28
+ MIDDLEWARE_PREFIX = 'Middleware/Rack/'
29
+ OTHER_TRANSACTION_PREFIX = 'OtherTransaction/'
30
30
  TASK_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Background/"
31
31
  RAKE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Rake/"
32
32
  MESSAGE_PREFIX = "#{OTHER_TRANSACTION_PREFIX}Message/"
@@ -37,21 +37,21 @@ module NewRelic
37
37
 
38
38
  WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
39
39
 
40
- MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
41
- WEB_SUMMARY_METRIC = "HttpDispatcher"
40
+ MIDDLEWARE_SUMMARY_METRICS = ['Middleware/all'].freeze
41
+ WEB_SUMMARY_METRIC = 'HttpDispatcher'
42
42
  OTHER_SUMMARY_METRIC = "#{OTHER_TRANSACTION_PREFIX}all"
43
- QUEUE_TIME_METRIC = "WebFrontend/QueueTime"
43
+ QUEUE_TIME_METRIC = 'WebFrontend/QueueTime'
44
44
 
45
- APDEX_S = "S"
46
- APDEX_T = "T"
47
- APDEX_F = "F"
48
- APDEX_ALL_METRIC = "ApdexAll"
49
- APDEX_METRIC = "Apdex"
50
- APDEX_OTHER_METRIC = "ApdexOther"
51
- APDEX_TXN_METRIC_PREFIX = "Apdex/"
52
- APDEX_OTHER_TXN_METRIC_PREFIX = "ApdexOther/Transaction/"
45
+ APDEX_S = 'S'
46
+ APDEX_T = 'T'
47
+ APDEX_F = 'F'
48
+ APDEX_ALL_METRIC = 'ApdexAll'
49
+ APDEX_METRIC = 'Apdex'
50
+ APDEX_OTHER_METRIC = 'ApdexOther'
51
+ APDEX_TXN_METRIC_PREFIX = 'Apdex/'
52
+ APDEX_OTHER_TXN_METRIC_PREFIX = 'ApdexOther/Transaction/'
53
53
 
54
- JRUBY_CPU_TIME_ERROR = "Error calculating JRuby CPU Time"
54
+ JRUBY_CPU_TIME_ERROR = 'Error calculating JRuby CPU Time'
55
55
 
56
56
  # A Time instance for the start time, never nil
57
57
  attr_accessor :start_time
@@ -155,7 +155,7 @@ module NewRelic
155
155
  NewRelic::Agent.record_api_supportability_metric(:recording_web_transaction?)
156
156
 
157
157
  txn = tl_current
158
- txn && txn.recording_web_transaction?
158
+ txn&.recording_web_transaction?
159
159
  end
160
160
 
161
161
  def self.apdex_bucket(duration, failed, apdex_t)
@@ -181,20 +181,21 @@ module NewRelic
181
181
 
182
182
  def add_agent_attribute(key, value, default_destinations)
183
183
  @attributes.add_agent_attribute(key, value, default_destinations)
184
- current_segment.add_agent_attribute(key, value) if current_segment
184
+ # the following line needs else branch coverage
185
+ current_segment.add_agent_attribute(key, value) if current_segment # rubocop:disable Style/SafeNavigation
185
186
  end
186
187
 
187
188
  def self.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
188
189
  if txn = tl_current
189
190
  txn.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
190
191
  else
191
- NewRelic::Agent.logger.debug("Attempted to merge untrusted attributes without transaction")
192
+ NewRelic::Agent.logger.debug('Attempted to merge untrusted attributes without transaction')
192
193
  end
193
194
  end
194
195
 
195
196
  def merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
196
197
  @attributes.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
197
- current_segment.merge_untrusted_agent_attributes(attributes, prefix, default_destinations) if current_segment
198
+ current_segment&.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
198
199
  end
199
200
 
200
201
  @@java_classes_loaded = false
@@ -209,7 +210,7 @@ module NewRelic
209
210
  end
210
211
  end
211
212
 
212
- def initialize(category, options)
213
+ def initialize(category, options) # rubocop:disable Metrics/AbcSize
213
214
  @nesting_max_depth = 0
214
215
  @current_segment_by_thread = {}
215
216
  @current_segment_lock = Mutex.new
@@ -309,15 +310,15 @@ module NewRelic
309
310
  end
310
311
 
311
312
  def referer
312
- @request_attributes && @request_attributes.referer
313
+ @request_attributes&.referer
313
314
  end
314
315
 
315
316
  def request_path
316
- @request_attributes && @request_attributes.request_path
317
+ @request_attributes&.request_path
317
318
  end
318
319
 
319
320
  def request_port
320
- @request_attributes && @request_attributes.port
321
+ @request_attributes&.port
321
322
  end
322
323
 
323
324
  # This transaction-local hash may be used as temporary storage by
@@ -533,7 +534,7 @@ module NewRelic
533
534
 
534
535
  commit!(initial_segment.name) unless @ignore_this_transaction
535
536
  rescue => e
536
- NewRelic::Agent.logger.error("Exception during Transaction#finish", e)
537
+ NewRelic::Agent.logger.error('Exception during Transaction#finish', e)
537
538
  nil
538
539
  ensure
539
540
  state.reset
@@ -594,9 +595,7 @@ module NewRelic
594
595
  add_agent_attribute(:'response.headers.contentType', response_content_type, default_destinations)
595
596
  end
596
597
 
597
- if @request_attributes
598
- @request_attributes.assign_agent_attributes(self)
599
- end
598
+ @request_attributes&.assign_agent_attributes(self)
600
599
 
601
600
  display_host = Agent.config[:'process_host.display_name']
602
601
  unless display_host == NewRelic::Agent::Hostname.get
@@ -735,15 +734,19 @@ module NewRelic
735
734
  def record_exceptions
736
735
  error_recorded = false
737
736
  @exceptions.each do |exception, options|
738
- options[:uri] ||= request_path if request_path
739
- options[:port] = request_port if request_port
740
- options[:metric] = best_name
741
- options[:attributes] = @attributes
742
-
743
- span_id = options.delete(:span_id)
744
- error_recorded = !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
737
+ error_recorded = record_exception(exception, options, error_recorded)
745
738
  end
746
- payload[:error] = error_recorded if payload
739
+ payload&.[]=(:error, error_recorded)
740
+ end
741
+
742
+ def record_exception(exception, options, error_recorded)
743
+ options[:uri] ||= request_path if request_path
744
+ options[:port] = request_port if request_port
745
+ options[:metric] = best_name
746
+ options[:attributes] = @attributes
747
+
748
+ span_id = options.delete(:span_id)
749
+ !!agent.error_collector.notice_error(exception, options, span_id) || error_recorded
747
750
  end
748
751
 
749
752
  # Do not call this. Invoke the class method instead.
@@ -28,11 +28,11 @@ module NewRelic
28
28
  SAMPLED_KEY = 'sampled'.freeze
29
29
  GUID_KEY = 'nr.transactionGuid'.freeze
30
30
  REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
31
- SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId".freeze
32
- SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId".freeze
33
- SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId".freeze
34
- PRIORITY_KEY = "priority".freeze
35
- SPAN_ID_KEY = "spanId".freeze
31
+ SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'.freeze
32
+ SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'.freeze
33
+ SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'.freeze
34
+ PRIORITY_KEY = 'priority'.freeze
35
+ SPAN_ID_KEY = 'spanId'.freeze
36
36
 
37
37
  def create(noticed_error, payload, span_id)
38
38
  [
@@ -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?
@@ -38,7 +38,7 @@ module NewRelic
38
38
  end
39
39
 
40
40
  def record_sampling_rate(metadata) # THREAD_LOCAL_ACCESS
41
- NewRelic::Agent.logger.debug("Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup" % [
41
+ NewRelic::Agent.logger.debug('Sampled %d / %d (%.1f %%) requests this cycle, %d / %d (%.1f %%) since startup' % [
42
42
  metadata[:captured],
43
43
  metadata[:seen],
44
44
  (metadata[:captured].to_f / metadata[:seen] * 100.0),
@@ -48,8 +48,8 @@ module NewRelic
48
48
  ])
49
49
 
50
50
  engine = NewRelic::Agent.instance.stats_engine
51
- engine.tl_record_supportability_metric_count("TransactionEventAggregator/requests", metadata[:seen])
52
- engine.tl_record_supportability_metric_count("TransactionEventAggregator/samples", metadata[:captured])
51
+ engine.tl_record_supportability_metric_count('TransactionEventAggregator/requests', metadata[:seen])
52
+ engine.tl_record_supportability_metric_count('TransactionEventAggregator/samples', metadata[:captured])
53
53
  end
54
54
  end
55
55
  end
@@ -35,9 +35,9 @@ module NewRelic
35
35
  CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
36
36
  CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
37
37
  APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
38
- SYNTHETICS_RESOURCE_ID_KEY = "nr.syntheticsResourceId"
39
- SYNTHETICS_JOB_ID_KEY = "nr.syntheticsJobId"
40
- SYNTHETICS_MONITOR_ID_KEY = "nr.syntheticsMonitorId"
38
+ SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'
39
+ SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'
40
+ SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'
41
41
 
42
42
  def create(payload)
43
43
  intrinsics = {