newrelic_rpm 8.10.1 → 8.12.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (395) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -1
  3. data/.rubocop.yml +20 -190
  4. data/.rubocop_todo.yml +11 -202
  5. data/.simplecov +6 -4
  6. data/Brewfile +1 -0
  7. data/CHANGELOG.md +113 -41
  8. data/Gemfile +0 -1
  9. data/README.md +1 -1
  10. data/Rakefile +3 -20
  11. data/Thorfile +0 -1
  12. data/bin/nrdebug +65 -43
  13. data/config.dot +5 -5
  14. data/docker-compose.yml +22 -0
  15. data/init.rb +1 -2
  16. data/install.rb +1 -2
  17. data/lib/new_relic/agent/adaptive_sampler.rb +0 -1
  18. data/lib/new_relic/agent/agent/shutdown.rb +1 -1
  19. data/lib/new_relic/agent/agent/special_startup.rb +2 -1
  20. data/lib/new_relic/agent/agent/start_worker_thread.rb +0 -1
  21. data/lib/new_relic/agent/agent/startup.rb +1 -1
  22. data/lib/new_relic/agent/agent.rb +100 -73
  23. data/lib/new_relic/agent/agent_logger.rb +4 -5
  24. data/lib/new_relic/agent/attribute_filter.rb +39 -21
  25. data/lib/new_relic/agent/attribute_processing.rb +3 -4
  26. data/lib/new_relic/agent/attributes.rb +1 -1
  27. data/lib/new_relic/agent/audit_logger.rb +3 -3
  28. data/lib/new_relic/agent/autostart.rb +0 -1
  29. data/lib/new_relic/agent/chained_call.rb +0 -1
  30. data/lib/new_relic/agent/commands/agent_command.rb +0 -1
  31. data/lib/new_relic/agent/commands/agent_command_router.rb +3 -4
  32. data/lib/new_relic/agent/commands/thread_profiler_session.rb +1 -1
  33. data/lib/new_relic/agent/configuration/default_source.rb +82 -31
  34. data/lib/new_relic/agent/configuration/dotted_hash.rb +2 -2
  35. data/lib/new_relic/agent/configuration/environment_source.rb +4 -4
  36. data/lib/new_relic/agent/configuration/event_harvest_config.rb +0 -1
  37. data/lib/new_relic/agent/configuration/high_security_source.rb +1 -1
  38. data/lib/new_relic/agent/configuration/manager.rb +4 -2
  39. data/lib/new_relic/agent/configuration/manual_source.rb +0 -1
  40. data/lib/new_relic/agent/configuration/mask_defaults.rb +2 -3
  41. data/lib/new_relic/agent/configuration/security_policy_source.rb +10 -1
  42. data/lib/new_relic/agent/configuration/server_source.rb +0 -1
  43. data/lib/new_relic/agent/configuration/yaml_source.rb +3 -3
  44. data/lib/new_relic/agent/configuration.rb +0 -1
  45. data/lib/new_relic/agent/connect/request_builder.rb +2 -2
  46. data/lib/new_relic/agent/connect/response_handler.rb +1 -2
  47. data/lib/new_relic/agent/custom_event_aggregator.rb +0 -1
  48. data/lib/new_relic/agent/database/explain_plan_helpers.rb +0 -1
  49. data/lib/new_relic/agent/database/obfuscation_helpers.rb +1 -1
  50. data/lib/new_relic/agent/database/obfuscator.rb +0 -1
  51. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +0 -1
  52. data/lib/new_relic/agent/database.rb +20 -14
  53. data/lib/new_relic/agent/database_adapter.rb +2 -1
  54. data/lib/new_relic/agent/datastores/metric_helper.rb +0 -4
  55. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +5 -5
  56. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +2 -5
  57. data/lib/new_relic/agent/datastores/mongo.rb +0 -1
  58. data/lib/new_relic/agent/datastores/nosql_obfuscator.rb +41 -0
  59. data/lib/new_relic/agent/datastores/redis.rb +0 -1
  60. data/lib/new_relic/agent/datastores.rb +0 -1
  61. data/lib/new_relic/agent/deprecator.rb +0 -1
  62. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +0 -1
  63. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +3 -1
  64. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +3 -1
  65. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +1 -1
  66. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +1 -2
  67. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +0 -1
  68. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +1 -1
  69. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +0 -1
  70. data/lib/new_relic/agent/distributed_tracing.rb +0 -1
  71. data/lib/new_relic/agent/encoding_normalizer.rb +2 -1
  72. data/lib/new_relic/agent/error_collector.rb +3 -1
  73. data/lib/new_relic/agent/error_event_aggregator.rb +0 -1
  74. data/lib/new_relic/agent/error_filter.rb +5 -5
  75. data/lib/new_relic/agent/error_trace_aggregator.rb +2 -2
  76. data/lib/new_relic/agent/event_aggregator.rb +1 -1
  77. data/lib/new_relic/agent/event_buffer.rb +0 -1
  78. data/lib/new_relic/agent/event_listener.rb +0 -1
  79. data/lib/new_relic/agent/event_loop.rb +4 -3
  80. data/lib/new_relic/agent/external.rb +1 -2
  81. data/lib/new_relic/agent/guid_generator.rb +0 -1
  82. data/lib/new_relic/agent/harvester.rb +0 -1
  83. data/lib/new_relic/agent/heap.rb +2 -3
  84. data/lib/new_relic/agent/hostname.rb +0 -1
  85. data/lib/new_relic/agent/http_clients/abstract.rb +2 -1
  86. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +0 -1
  87. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +0 -1
  88. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -2
  89. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +1 -2
  90. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +0 -1
  91. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +2 -2
  92. data/lib/new_relic/agent/http_clients/uri_util.rb +0 -1
  93. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +0 -1
  94. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +0 -1
  95. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +1 -2
  96. data/lib/new_relic/agent/instrumentation/active_job.rb +0 -1
  97. data/lib/new_relic/agent/instrumentation/active_merchant.rb +3 -2
  98. data/lib/new_relic/agent/instrumentation/active_record.rb +0 -1
  99. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +0 -1
  100. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +0 -1
  101. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +0 -1
  102. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +0 -1
  103. data/lib/new_relic/agent/instrumentation/active_storage.rb +0 -1
  104. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +2 -1
  105. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +0 -1
  106. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +0 -1
  107. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +0 -1
  108. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +0 -1
  109. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +1 -1
  110. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -1
  111. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +0 -1
  112. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +0 -1
  113. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +0 -1
  114. data/lib/new_relic/agent/instrumentation/bunny.rb +0 -1
  115. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +3 -3
  116. data/lib/new_relic/agent/instrumentation/curb/chain.rb +0 -1
  117. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +14 -11
  118. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +0 -1
  119. data/lib/new_relic/agent/instrumentation/curb.rb +0 -1
  120. data/lib/new_relic/agent/instrumentation/data_mapper.rb +1 -2
  121. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +0 -1
  122. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +0 -1
  123. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +0 -1
  124. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +1 -1
  125. data/lib/new_relic/agent/instrumentation/elasticsearch/chain.rb +29 -0
  126. data/lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb +66 -0
  127. data/lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb +13 -0
  128. data/lib/new_relic/agent/instrumentation/elasticsearch.rb +31 -0
  129. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +0 -1
  130. data/lib/new_relic/agent/instrumentation/excon.rb +0 -1
  131. data/lib/new_relic/agent/instrumentation/grape/chain.rb +0 -1
  132. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +1 -1
  133. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +0 -1
  134. data/lib/new_relic/agent/instrumentation/grape.rb +0 -1
  135. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +0 -1
  136. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +0 -1
  137. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +0 -1
  138. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +0 -1
  139. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +0 -1
  140. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +0 -1
  141. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +0 -1
  142. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +0 -1
  143. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +0 -1
  144. data/lib/new_relic/agent/instrumentation/grpc_client.rb +0 -1
  145. data/lib/new_relic/agent/instrumentation/grpc_server.rb +0 -1
  146. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +0 -1
  147. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +0 -1
  148. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +0 -1
  149. data/lib/new_relic/agent/instrumentation/httpclient.rb +0 -1
  150. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +0 -1
  151. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +0 -1
  152. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +0 -1
  153. data/lib/new_relic/agent/instrumentation/httprb.rb +0 -1
  154. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +0 -1
  155. data/lib/new_relic/agent/instrumentation/logger/chain.rb +0 -1
  156. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +4 -1
  157. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +0 -1
  158. data/lib/new_relic/agent/instrumentation/logger.rb +0 -1
  159. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +0 -1
  160. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +1 -2
  161. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +0 -1
  162. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +0 -1
  163. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +1 -2
  164. data/lib/new_relic/agent/instrumentation/memcache.rb +4 -5
  165. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -2
  166. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +0 -1
  167. data/lib/new_relic/agent/instrumentation/mongo.rb +0 -1
  168. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +3 -2
  169. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +0 -1
  170. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +0 -1
  171. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +0 -1
  172. data/lib/new_relic/agent/instrumentation/net_http.rb +0 -1
  173. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +4 -3
  174. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +0 -1
  175. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +0 -1
  176. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +0 -1
  177. data/lib/new_relic/agent/instrumentation/padrino.rb +0 -1
  178. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +0 -1
  179. data/lib/new_relic/agent/instrumentation/queue_time.rb +0 -2
  180. data/lib/new_relic/agent/instrumentation/rack/chain.rb +0 -1
  181. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +0 -1
  182. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +3 -1
  183. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +0 -1
  184. data/lib/new_relic/agent/instrumentation/rack.rb +0 -1
  185. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +0 -1
  186. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +0 -1
  187. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +0 -1
  188. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +0 -1
  189. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +0 -1
  190. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -1
  191. data/lib/new_relic/agent/instrumentation/rake/chain.rb +0 -1
  192. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +6 -1
  193. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +0 -1
  194. data/lib/new_relic/agent/instrumentation/rake.rb +0 -1
  195. data/lib/new_relic/agent/instrumentation/redis/chain.rb +0 -1
  196. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +0 -1
  197. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +0 -1
  198. data/lib/new_relic/agent/instrumentation/redis.rb +0 -1
  199. data/lib/new_relic/agent/instrumentation/resque/chain.rb +0 -1
  200. data/lib/new_relic/agent/instrumentation/resque/helper.rb +0 -1
  201. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +0 -1
  202. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +0 -1
  203. data/lib/new_relic/agent/instrumentation/resque.rb +0 -1
  204. data/lib/new_relic/agent/instrumentation/sequel.rb +0 -1
  205. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +0 -1
  206. data/lib/new_relic/agent/instrumentation/sidekiq.rb +2 -2
  207. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +0 -1
  208. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +0 -1
  209. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +0 -1
  210. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +0 -1
  211. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +0 -1
  212. data/lib/new_relic/agent/instrumentation/sinatra.rb +1 -1
  213. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -1
  214. data/lib/new_relic/agent/instrumentation/thread/chain.rb +0 -1
  215. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +1 -1
  216. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +0 -1
  217. data/lib/new_relic/agent/instrumentation/thread.rb +0 -1
  218. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +0 -1
  219. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +1 -1
  220. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +0 -1
  221. data/lib/new_relic/agent/instrumentation/tilt.rb +0 -1
  222. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +0 -1
  223. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +3 -4
  224. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +0 -1
  225. data/lib/new_relic/agent/instrumentation/typhoeus.rb +0 -1
  226. data/lib/new_relic/agent/instrumentation.rb +0 -1
  227. data/lib/new_relic/agent/internal_agent_error.rb +0 -1
  228. data/lib/new_relic/agent/javascript_instrumentor.rb +2 -2
  229. data/lib/new_relic/agent/linking_metadata.rb +0 -1
  230. data/lib/new_relic/agent/local_log_decorator.rb +1 -1
  231. data/lib/new_relic/agent/log_event_aggregator.rb +1 -1
  232. data/lib/new_relic/agent/log_once.rb +0 -1
  233. data/lib/new_relic/agent/log_priority.rb +0 -1
  234. data/lib/new_relic/agent/logging.rb +0 -1
  235. data/lib/new_relic/agent/memory_logger.rb +0 -1
  236. data/lib/new_relic/agent/messaging.rb +2 -2
  237. data/lib/new_relic/agent/method_tracer.rb +4 -1
  238. data/lib/new_relic/agent/method_tracer_helpers.rb +1 -2
  239. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +0 -1
  240. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +1 -1
  241. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +0 -1
  242. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +0 -1
  243. data/lib/new_relic/agent/monitors.rb +0 -1
  244. data/lib/new_relic/agent/new_relic_service/encoders.rb +0 -1
  245. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +0 -1
  246. data/lib/new_relic/agent/new_relic_service/marshaller.rb +0 -1
  247. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +0 -1
  248. data/lib/new_relic/agent/new_relic_service.rb +195 -142
  249. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +1 -2
  250. data/lib/new_relic/agent/null_logger.rb +0 -1
  251. data/lib/new_relic/agent/obfuscator.rb +1 -2
  252. data/lib/new_relic/agent/parameter_filtering.rb +0 -1
  253. data/lib/new_relic/agent/payload_metric_mapping.rb +0 -1
  254. data/lib/new_relic/agent/pipe_channel_manager.rb +2 -1
  255. data/lib/new_relic/agent/pipe_service.rb +0 -1
  256. data/lib/new_relic/agent/prepend_supportability.rb +0 -1
  257. data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -3
  258. data/lib/new_relic/agent/range_extensions.rb +0 -1
  259. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +0 -1
  260. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +0 -1
  261. data/lib/new_relic/agent/rules_engine.rb +1 -1
  262. data/lib/new_relic/agent/sampler.rb +0 -1
  263. data/lib/new_relic/agent/sampler_collection.rb +0 -1
  264. data/lib/new_relic/agent/samplers/cpu_sampler.rb +1 -1
  265. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +0 -1
  266. data/lib/new_relic/agent/samplers/memory_sampler.rb +10 -6
  267. data/lib/new_relic/agent/samplers/object_sampler.rb +0 -1
  268. data/lib/new_relic/agent/samplers/vm_sampler.rb +2 -1
  269. data/lib/new_relic/agent/span_event_aggregator.rb +0 -1
  270. data/lib/new_relic/agent/span_event_primitive.rb +1 -2
  271. data/lib/new_relic/agent/sql_sampler.rb +0 -1
  272. data/lib/new_relic/agent/stats.rb +13 -3
  273. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +1 -2
  274. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -2
  275. data/lib/new_relic/agent/stats_engine.rb +0 -1
  276. data/lib/new_relic/agent/synthetics_event_aggregator.rb +0 -1
  277. data/lib/new_relic/agent/system_info.rb +4 -2
  278. data/lib/new_relic/agent/threading/agent_thread.rb +3 -3
  279. data/lib/new_relic/agent/threading/backtrace_node.rb +0 -1
  280. data/lib/new_relic/agent/threading/backtrace_service.rb +1 -1
  281. data/lib/new_relic/agent/threading/thread_profile.rb +4 -2
  282. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +0 -1
  283. data/lib/new_relic/agent/tracer.rb +6 -3
  284. data/lib/new_relic/agent/transaction/abstract_segment.rb +5 -3
  285. data/lib/new_relic/agent/transaction/datastore_segment.rb +3 -1
  286. data/lib/new_relic/agent/transaction/distributed_tracer.rb +4 -1
  287. data/lib/new_relic/agent/transaction/distributed_tracing.rb +1 -1
  288. data/lib/new_relic/agent/transaction/external_request_segment.rb +2 -2
  289. data/lib/new_relic/agent/transaction/message_broker_segment.rb +1 -1
  290. data/lib/new_relic/agent/transaction/request_attributes.rb +0 -1
  291. data/lib/new_relic/agent/transaction/segment.rb +1 -1
  292. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +0 -1
  293. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +0 -1
  294. data/lib/new_relic/agent/transaction/trace.rb +4 -1
  295. data/lib/new_relic/agent/transaction/trace_builder.rb +0 -1
  296. data/lib/new_relic/agent/transaction/trace_context.rb +0 -1
  297. data/lib/new_relic/agent/transaction/trace_node.rb +3 -3
  298. data/lib/new_relic/agent/transaction/tracing.rb +0 -1
  299. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +2 -2
  300. data/lib/new_relic/agent/transaction.rb +13 -5
  301. data/lib/new_relic/agent/transaction_error_primitive.rb +0 -1
  302. data/lib/new_relic/agent/transaction_event_aggregator.rb +1 -1
  303. data/lib/new_relic/agent/transaction_event_primitive.rb +0 -1
  304. data/lib/new_relic/agent/transaction_event_recorder.rb +1 -2
  305. data/lib/new_relic/agent/transaction_metrics.rb +1 -2
  306. data/lib/new_relic/agent/transaction_sampler.rb +0 -1
  307. data/lib/new_relic/agent/transaction_time_aggregator.rb +2 -2
  308. data/lib/new_relic/agent/utilization/aws.rb +0 -1
  309. data/lib/new_relic/agent/utilization/azure.rb +1 -2
  310. data/lib/new_relic/agent/utilization/gcp.rb +1 -2
  311. data/lib/new_relic/agent/utilization/pcf.rb +2 -2
  312. data/lib/new_relic/agent/utilization/vendor.rb +3 -2
  313. data/lib/new_relic/agent/utilization_data.rb +3 -1
  314. data/lib/new_relic/agent/vm/jruby_vm.rb +0 -1
  315. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +0 -1
  316. data/lib/new_relic/agent/vm/mri_vm.rb +35 -23
  317. data/lib/new_relic/agent/vm/snapshot.rb +1 -2
  318. data/lib/new_relic/agent/vm.rb +0 -1
  319. data/lib/new_relic/agent/worker_loop.rb +0 -1
  320. data/lib/new_relic/agent.rb +17 -18
  321. data/lib/new_relic/cli/command.rb +1 -2
  322. data/lib/new_relic/cli/commands/deployments.rb +72 -21
  323. data/lib/new_relic/cli/commands/install.rb +1 -1
  324. data/lib/new_relic/coerce.rb +6 -1
  325. data/lib/new_relic/collection_helper.rb +2 -2
  326. data/lib/new_relic/constants.rb +0 -1
  327. data/lib/new_relic/control/class_methods.rb +0 -1
  328. data/lib/new_relic/control/frameworks/external.rb +0 -1
  329. data/lib/new_relic/control/frameworks/rails.rb +5 -1
  330. data/lib/new_relic/control/frameworks/rails3.rb +0 -1
  331. data/lib/new_relic/control/frameworks/rails4.rb +0 -1
  332. data/lib/new_relic/control/frameworks/rails_notifications.rb +0 -1
  333. data/lib/new_relic/control/frameworks/ruby.rb +0 -1
  334. data/lib/new_relic/control/frameworks/sinatra.rb +0 -1
  335. data/lib/new_relic/control/frameworks.rb +0 -1
  336. data/lib/new_relic/control/instance_methods.rb +17 -40
  337. data/lib/new_relic/control/instrumentation.rb +2 -1
  338. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  339. data/lib/new_relic/control/server_methods.rb +0 -1
  340. data/lib/new_relic/control.rb +0 -1
  341. data/lib/new_relic/delayed_job_injection.rb +0 -1
  342. data/lib/new_relic/dependency_detection.rb +5 -4
  343. data/lib/new_relic/environment_report.rb +23 -14
  344. data/lib/new_relic/helper.rb +2 -2
  345. data/lib/new_relic/language_support.rb +3 -3
  346. data/lib/new_relic/latest_changes.rb +4 -4
  347. data/lib/new_relic/local_environment.rb +9 -4
  348. data/lib/new_relic/metric_data.rb +27 -22
  349. data/lib/new_relic/metric_spec.rb +2 -1
  350. data/lib/new_relic/noticed_error.rb +3 -6
  351. data/lib/new_relic/rack/agent_hooks.rb +0 -1
  352. data/lib/new_relic/rack/agent_middleware.rb +2 -1
  353. data/lib/new_relic/rack/browser_monitoring.rb +131 -123
  354. data/lib/new_relic/rack.rb +0 -1
  355. data/lib/new_relic/recipes/capistrano3.rb +2 -59
  356. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -2
  357. data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
  358. data/lib/new_relic/recipes.rb +0 -1
  359. data/lib/new_relic/supportability_helper.rb +1 -2
  360. data/lib/new_relic/traced_thread.rb +1 -1
  361. data/lib/new_relic/version.rb +2 -3
  362. data/lib/newrelic_rpm.rb +0 -1
  363. data/lib/sequel/extensions/newrelic_instrumentation.rb +2 -3
  364. data/lib/sequel/plugins/newrelic_instrumentation.rb +0 -1
  365. data/lib/tasks/all.rb +0 -1
  366. data/lib/tasks/config.rake +4 -113
  367. data/lib/tasks/coverage_report.rake +14 -19
  368. data/lib/tasks/{config.html.erb → helpers/config.html.erb} +0 -0
  369. data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
  370. data/lib/tasks/helpers/format.rb +123 -0
  371. data/lib/tasks/helpers/matches.rb +12 -0
  372. data/lib/tasks/helpers/prompt.rb +24 -0
  373. data/lib/tasks/helpers/removers.rb +33 -0
  374. data/lib/tasks/install.rake +0 -1
  375. data/lib/tasks/instrumentation_generator/README.md +1 -1
  376. data/lib/tasks/instrumentation_generator/instrumentation.thor +45 -17
  377. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +0 -1
  378. data/lib/tasks/instrumentation_generator/templates/chain.tt +2 -2
  379. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +3 -2
  380. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +0 -1
  381. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +2 -2
  382. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +1 -1
  383. data/lib/tasks/instrumentation_generator/templates/prepend.tt +1 -2
  384. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +1 -1
  385. data/lib/tasks/instrumentation_generator/templates/test.tt +1 -2
  386. data/lib/tasks/multiverse.rake +0 -1
  387. data/lib/tasks/multiverse.rb +3 -29
  388. data/lib/tasks/newrelic.rb +0 -1
  389. data/lib/tasks/tests.rake +3 -8
  390. data/newrelic.yml +23 -4
  391. data/newrelic_rpm.gemspec +8 -9
  392. data/recipes/newrelic.rb +0 -1
  393. data/test/agent_helper.rb +23 -35
  394. metadata +20 -80
  395. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -44
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -29,6 +28,7 @@ module NewRelic
29
28
 
30
29
  def select_allowed_params(params)
31
30
  return unless params
31
+
32
32
  params.select do |p|
33
33
  NewRelic::Agent.instance.attribute_filter.allows_key?(p, AttributeFilter::DST_TRANSACTION_SEGMENTS)
34
34
  end
@@ -134,7 +134,7 @@ module NewRelic
134
134
  # call the provided block for this node and each
135
135
  # of the called nodes
136
136
  def each_node(&block)
137
- block.call(self)
137
+ yield(self)
138
138
 
139
139
  if @children
140
140
  @children.each do |node|
@@ -146,7 +146,7 @@ module NewRelic
146
146
  # call the provided block for this node and each
147
147
  # of the called nodes while keeping track of nested nodes
148
148
  def each_node_with_nest_tracking(&block)
149
- summary = block.call(self)
149
+ summary = yield(self)
150
150
  summary.current_nest_count += 1 if summary
151
151
 
152
152
  if @children
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -10,7 +9,6 @@ module NewRelic
10
9
  attr_reader :samples
11
10
 
12
11
  SINGLE_BUFFER_MAX = 20
13
- NO_SAMPLES = NewRelic::EMPTY_ARRAY
14
12
 
15
13
  def initialize
16
14
  @samples = []
@@ -36,6 +34,7 @@ module NewRelic
36
34
 
37
35
  def store(sample)
38
36
  return unless enabled?
37
+
39
38
  if allow_sample?(sample)
40
39
  add_sample(sample)
41
40
  truncate_samples_if_needed
@@ -44,6 +43,7 @@ module NewRelic
44
43
 
45
44
  def store_previous(previous_samples)
46
45
  return unless enabled?
46
+
47
47
  previous_samples.each do |sample|
48
48
  add_sample(sample) if allow_sample?(sample)
49
49
  end
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -37,7 +36,6 @@ module NewRelic
37
36
  ACTION_CABLE_PREFIX = "#{CONTROLLER_PREFIX}ActionCable/"
38
37
 
39
38
  WEB_TRANSACTION_CATEGORIES = [:web, :controller, :uri, :rack, :sinatra, :grape, :middleware, :action_cable].freeze
40
- TRANSACTION_NAMING_SOURCES = [:child, :api].freeze
41
39
 
42
40
  MIDDLEWARE_SUMMARY_METRICS = ["Middleware/all"].freeze
43
41
  WEB_SUMMARY_METRIC = "HttpDispatcher"
@@ -129,7 +127,7 @@ module NewRelic
129
127
  end
130
128
 
131
129
  def self.nested_transaction_name(name)
132
- if name.start_with?(CONTROLLER_PREFIX) || name.start_with?(OTHER_TRANSACTION_PREFIX)
130
+ if name.start_with?(CONTROLLER_PREFIX, OTHER_TRANSACTION_PREFIX)
133
131
  "#{NESTED_TRANSACTION_PREFIX}#{name}"
134
132
  else
135
133
  name
@@ -270,6 +268,7 @@ module NewRelic
270
268
  current_thread_id = ::Thread.current.object_id
271
269
  return current_segment_by_thread[current_thread_id] if current_segment_by_thread[current_thread_id]
272
270
  return current_segment_by_thread[parent_thread_id] if current_segment_by_thread[parent_thread_id]
271
+
273
272
  current_segment_by_thread[@starting_thread_id]
274
273
  end
275
274
 
@@ -287,6 +286,7 @@ module NewRelic
287
286
 
288
287
  def sampled?
289
288
  return unless Agent.config[:'distributed_tracing.enabled']
289
+
290
290
  if @sampled.nil?
291
291
  @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
292
292
  end
@@ -317,7 +317,7 @@ module NewRelic
317
317
  @request_attributes && @request_attributes.port
318
318
  end
319
319
 
320
- # This transaction-local hash may be used as temprory storage by
320
+ # This transaction-local hash may be used as temporary storage by
321
321
  # instrumentation that needs to pass data from one instrumentation point
322
322
  # to another.
323
323
  #
@@ -349,6 +349,7 @@ module NewRelic
349
349
 
350
350
  def set_default_transaction_name(name, category)
351
351
  return log_frozen_name(name) if name_frozen?
352
+
352
353
  if influences_transaction_name?(category)
353
354
  self.default_name = name
354
355
  @category = category if category
@@ -357,6 +358,7 @@ module NewRelic
357
358
 
358
359
  def set_overriding_transaction_name(name, category)
359
360
  return log_frozen_name(name) if name_frozen?
361
+
360
362
  if influences_transaction_name?(category)
361
363
  self.overridden_name = name
362
364
  @category = category if category
@@ -512,6 +514,7 @@ module NewRelic
512
514
 
513
515
  def finish
514
516
  return unless state.is_execution_traced?
517
+
515
518
  @end_time = Process.clock_gettime(Process::CLOCK_REALTIME)
516
519
  @duration = @end_time - @start_time
517
520
  freeze_name_and_execute_if_not_ignored
@@ -671,7 +674,7 @@ module NewRelic
671
674
  end
672
675
 
673
676
  def is_synthetics_request?
674
- synthetics_payload != nil && raw_synthetics_header != nil
677
+ !synthetics_payload.nil? && !raw_synthetics_header.nil?
675
678
  end
676
679
 
677
680
  def synthetics_version
@@ -881,11 +884,13 @@ module NewRelic
881
884
 
882
885
  def normal_cpu_burn
883
886
  return unless @process_cpu_start
887
+
884
888
  process_cpu - @process_cpu_start
885
889
  end
886
890
 
887
891
  def jruby_cpu_burn
888
892
  return unless @jruby_cpu_start
893
+
889
894
  jruby_cpu_time - @jruby_cpu_start
890
895
  end
891
896
 
@@ -921,15 +926,18 @@ module NewRelic
921
926
 
922
927
  def process_cpu
923
928
  return nil if defined? JRuby
929
+
924
930
  p = Process.times
925
931
  p.stime + p.utime
926
932
  end
927
933
 
928
934
  def jruby_cpu_time
929
935
  return nil unless @@java_classes_loaded
936
+
930
937
  threadMBean = Java::JavaLangManagement::ManagementFactory.getThreadMXBean()
931
938
 
932
939
  return nil unless threadMBean.isCurrentThreadCpuTimeSupported
940
+
933
941
  java_utime = threadMBean.getCurrentThreadUserTime() # ns
934
942
 
935
943
  -1 == java_utime ? 0.0 : java_utime / 1e9
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,5 +1,4 @@
1
1
  # -*- ruby -*-
2
- # encoding: utf-8
3
2
  # This file is distributed under New Relic's license terms.
4
3
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
5
4
  # frozen_string_literal: true
@@ -34,6 +33,7 @@ module NewRelic
34
33
 
35
34
  def after_harvest(metadata)
36
35
  return unless enabled?
36
+
37
37
  record_sampling_rate(metadata)
38
38
  end
39
39
 
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -9,7 +8,7 @@ require 'new_relic/agent/transaction_event_primitive'
9
8
 
10
9
  module NewRelic
11
10
  module Agent
12
- # This is responsibile for recording transaction events and managing
11
+ # This is responsible for recording transaction events and managing
13
12
  # the relationship between events generated from synthetics requests
14
13
  # vs normal requests.
15
14
  class TransactionEventRecorder
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -11,7 +10,7 @@
11
10
  module NewRelic
12
11
  module Agent
13
12
  class TransactionMetrics
14
- DEFAULT_PROC = Proc.new { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
13
+ DEFAULT_PROC = proc { |hash, name| hash[name] = NewRelic::Agent::Stats.new }
15
14
 
16
15
  def initialize
17
16
  @lock = Mutex.new
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -108,7 +107,7 @@ module NewRelic
108
107
  end
109
108
 
110
109
  # ObjectSpace is faster on MRI, but disabled by default on JRuby for
111
- # perfomance reasons. We have two implmentations of `thread_by_id`
110
+ # performance reasons. We have two implementations of `thread_by_id`
112
111
  # based on ruby implementation.
113
112
  if RUBY_ENGINE == 'jruby'
114
113
  def thread_by_id(thread_id)
@@ -128,6 +127,7 @@ module NewRelic
128
127
 
129
128
  def split_transaction_at_harvest(timestamp, thread_id = nil)
130
129
  raise ArgumentError, 'thread_id required' unless thread_id
130
+
131
131
  @stats[thread_id].transaction_started_at = timestamp
132
132
  @stats[thread_id].elapsed_transaction_time = 0.0
133
133
  end
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -10,7 +9,7 @@ module NewRelic
10
9
  vendor_name "azure"
11
10
  endpoint "http://169.254.169.254/metadata/instance/compute?api-version=2017-03-01"
12
11
  headers "Metadata" => "true"
13
- keys ["vmId", "name", "vmSize", "location"]
12
+ keys %w[vmId name vmSize location]
14
13
  key_transforms :to_sym
15
14
  end
16
15
  end
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -12,7 +11,7 @@ module NewRelic
12
11
  vendor_name "gcp"
13
12
  endpoint "http://metadata.google.internal/computeMetadata/v1/instance/?recursive=true"
14
13
  headers "Metadata-Flavor" => "Google"
15
- keys ["id", "machineType", "name", "zone"]
14
+ keys %w[id machineType name zone]
16
15
  key_transforms :to_sym
17
16
 
18
17
  MACH_TYPE = 'machineType'.freeze
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -10,12 +9,13 @@ module NewRelic
10
9
  module Utilization
11
10
  class PCF < Vendor
12
11
  vendor_name "pcf"
13
- keys ["CF_INSTANCE_GUID", "CF_INSTANCE_IP", "MEMORY_LIMIT"]
12
+ keys %w[CF_INSTANCE_GUID CF_INSTANCE_IP MEMORY_LIMIT]
14
13
  key_transforms [:downcase, :to_sym]
15
14
 
16
15
  def detect
17
16
  begin
18
17
  return false unless pcf_keys_present?
18
+
19
19
  process_response(ENV)
20
20
  rescue
21
21
  NewRelic::Agent.logger.error("Error occurred detecting: #{vendor_name}", e)
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -74,7 +73,7 @@ module NewRelic
74
73
 
75
74
  def request_metadata
76
75
  processed_headers = headers
77
- raise if processed_headers.values.include?(:error)
76
+ raise if processed_headers.value?(:error)
78
77
 
79
78
  Timeout.timeout(1) do
80
79
  response = nil
@@ -135,6 +134,7 @@ module NewRelic
135
134
  def valid_chars?(value)
136
135
  value.each_char do |ch|
137
136
  next if ch =~ VALID_CHARS
137
+
138
138
  code_point = ch[0].ord # this works in Ruby 1.8.7 - 2.1.2
139
139
  next if code_point >= 0x80
140
140
 
@@ -146,6 +146,7 @@ module NewRelic
146
146
 
147
147
  def transform_key(key)
148
148
  return key unless key_transforms
149
+
149
150
  key_transforms.inject(key) { |memo, transform| memo.send(transform) }
150
151
  end
151
152
 
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -88,6 +87,7 @@ module NewRelic
88
87
  def append_vendor_info(collector_hash)
89
88
  VENDORS.each_pair do |klass, config_option|
90
89
  next unless Agent.config[config_option]
90
+
91
91
  vendor = klass.new
92
92
 
93
93
  if vendor.detect
@@ -126,6 +126,7 @@ module NewRelic
126
126
 
127
127
  def append_kubernetes_info(collector_hash)
128
128
  return unless Agent.config[:'utilization.detect_kubernetes']
129
+
129
130
  if host = ENV[KUBERNETES_SERVICE_HOST]
130
131
  collector_hash[:vendors] ||= {}
131
132
  collector_hash[:vendors][:kubernetes] = {
@@ -137,6 +138,7 @@ module NewRelic
137
138
  def append_full_hostname(collector_hash)
138
139
  full_hostname = fqdn
139
140
  return if full_hostname.nil? || full_hostname.empty?
141
+
140
142
  collector_hash[:full_hostname] = full_hostname
141
143
  end
142
144
 
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -24,24 +23,35 @@ module NewRelic
24
23
  end
25
24
 
26
25
  def gather_gc_stats(snap)
27
- if supports?(:gc_runs)
28
- snap.gc_runs = GC.count
29
- end
26
+ gather_gc_runs(snap) if supports?(:gc_runs)
27
+ gather_derived_stats(snap) if GC.respond_to?(:stat)
28
+ end
29
+
30
+ def gather_gc_runs(snap)
31
+ snap.gc_runs = GC.count
32
+ end
30
33
 
31
- if GC.respond_to?(:stat)
32
- gc_stats = GC.stat
33
- snap.total_allocated_object = gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
34
- snap.major_gc_count = gc_stats[:major_gc_count]
35
- snap.minor_gc_count = gc_stats[:minor_gc_count]
36
- snap.heap_live = gc_stats[:heap_live_slots] || gc_stats[:heap_live_slot] || gc_stats[:heap_live_num]
37
- snap.heap_free = gc_stats[:heap_free_slots] || gc_stats[:heap_free_slot] || gc_stats[:heap_free_num]
34
+ def gather_derived_stats(snap)
35
+ stat = GC.stat
36
+ snap.total_allocated_object = derive_from_gc_stats(%i[total_allocated_objects total_allocated_object], stat)
37
+ snap.major_gc_count = derive_from_gc_stats(:major_gc_count, stat)
38
+ snap.minor_gc_count = derive_from_gc_stats(:minor_gc_count, stat)
39
+ snap.heap_live = derive_from_gc_stats(%i[heap_live_slots heap_live_slot heap_live_num], stat)
40
+ snap.heap_free = derive_from_gc_stats(%i[heap_free_slots heap_free_slot heap_free_num], stat)
41
+ end
42
+
43
+ def derive_from_gc_stats(keys, stat)
44
+ Array(keys).each do |key|
45
+ value = stat[key]
46
+ return value if value
38
47
  end
48
+ nil
39
49
  end
40
50
 
41
51
  def gather_gc_time(snap)
42
- if supports?(:gc_total_time)
43
- snap.gc_total_time = NewRelic::Agent.instance.monotonic_gc_profiler.total_time_s
44
- end
52
+ return unless supports?(:gc_total_time)
53
+
54
+ snap.gc_total_time = NewRelic::Agent.instance.monotonic_gc_profiler.total_time_s
45
55
  end
46
56
 
47
57
  def gather_ruby_vm_stats(snap)
@@ -52,18 +62,18 @@ module NewRelic
52
62
  if supports?(:constant_cache_invalidations)
53
63
  snap.constant_cache_invalidations = gather_constant_cache_invalidations
54
64
  end
65
+
66
+ if supports?(:constant_cache_misses)
67
+ snap.constant_cache_misses = gather_constant_cache_misses
68
+ end
55
69
  end
56
70
 
57
71
  def gather_constant_cache_invalidations
58
- # Ruby >= 3.2 uses :constant_cache
59
- # see: https://github.com/ruby/ruby/pull/5433 and https://bugs.ruby-lang.org/issues/18589
60
- # TODO: now that 3.2+ provides more granual cache invalidation data, should we report it instead of summing?
61
- if RUBY_VERSION >= '3.2.0'
62
- RubyVM.stat[:constant_cache].values.sum
63
- # Ruby < 3.2 uses :global_constant_state
64
- else
65
- RubyVM.stat[:global_constant_state]
66
- end
72
+ RubyVM.stat[RUBY_VERSION >= '3.2.0' ? :constant_cache_invalidations : :global_constant_state]
73
+ end
74
+
75
+ def gather_constant_cache_misses
76
+ RubyVM.stat[:constant_cache_misses]
67
77
  end
68
78
 
69
79
  def gather_thread_stats(snap)
@@ -84,6 +94,8 @@ module NewRelic
84
94
  RUBY_VERSION >= '2.1.0' && RUBY_VERSION < '3.0.0'
85
95
  when :constant_cache_invalidations
86
96
  RUBY_VERSION >= '2.1.0'
97
+ when :constant_cache_misses
98
+ RUBY_VERSION >= '3.2.0'
87
99
  else
88
100
  false
89
101
  end
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -10,7 +9,7 @@ module NewRelic
10
9
  attr_accessor :gc_total_time, :gc_runs, :major_gc_count, :minor_gc_count,
11
10
  :total_allocated_object, :heap_live, :heap_free,
12
11
  :method_cache_invalidations, :constant_cache_invalidations,
13
- :thread_count, :taken_at
12
+ :constant_cache_misses, :thread_count, :taken_at
14
13
 
15
14
  def initialize
16
15
  @taken_at = Process.clock_gettime(Process::CLOCK_REALTIME)
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -30,7 +29,7 @@ module NewRelic
30
29
  require 'new_relic/metric_spec'
31
30
  require 'new_relic/metric_data'
32
31
  require 'new_relic/noticed_error'
33
- require 'new_relic/agent/noticible_error'
32
+ require 'new_relic/agent/noticeable_error'
34
33
  require 'new_relic/supportability_helper'
35
34
 
36
35
  require 'new_relic/agent/encoding_normalizer'
@@ -103,8 +102,6 @@ module NewRelic
103
102
  # An error while serializing data for the collector
104
103
  class SerializationError < StandardError; end
105
104
 
106
- class BackgroundLoadingError < StandardError; end
107
-
108
105
  # placeholder name used when we cannot determine a transaction's name
109
106
  UNKNOWN_METRIC = '(unknown)'.freeze
110
107
 
@@ -116,6 +113,7 @@ module NewRelic
116
113
  # The singleton Agent instance. Used internally.
117
114
  def agent # :nodoc:
118
115
  return @agent if @agent
116
+
119
117
  NewRelic::Agent.logger.warn("Agent unavailable as it hasn't been started.")
120
118
  NewRelic::Agent.logger.warn(caller.join("\n"))
121
119
  nil
@@ -199,15 +197,9 @@ module NewRelic
199
197
 
200
198
  if value.is_a?(Hash)
201
199
  stats = NewRelic::Agent::Stats.new
202
-
203
- stats.call_count = value[:count] if value[:count]
204
- stats.total_call_time = value[:total] if value[:total]
205
- stats.total_exclusive_time = value[:total] if value[:total]
206
- stats.min_call_time = value[:min] if value[:min]
207
- stats.max_call_time = value[:max] if value[:max]
208
- stats.sum_of_squares = value[:sum_of_squares] if value[:sum_of_squares]
209
- value = stats
200
+ value = stats.hash_merge(value)
210
201
  end
202
+
211
203
  agent.stats_engine.tl_record_unscoped_metrics(metric_name, value)
212
204
  end
213
205
 
@@ -224,6 +216,7 @@ module NewRelic
224
216
 
225
217
  def increment_metric(metric_name, amount = 1) # THREAD_LOCAL_ACCESS
226
218
  return unless agent
219
+
227
220
  if amount == 1
228
221
  metrics = [metric_name, SUPPORTABILITY_INCREMENT_METRIC]
229
222
  agent.stats_engine.tl_record_unscoped_metrics(metrics) { |stats| stats.increment_count }
@@ -238,7 +231,7 @@ module NewRelic
238
231
  # @!group Recording custom errors
239
232
 
240
233
  # Set a filter to be applied to errors that the Ruby Agent will
241
- # track. The block should evalute to the exception to track
234
+ # track. The block should evaluate to the exception to track
242
235
  # (which could be different from the original exception) or nil to
243
236
  # ignore this exception.
244
237
  #
@@ -290,7 +283,7 @@ module NewRelic
290
283
  record_api_supportability_metric(:notice_error)
291
284
 
292
285
  Transaction.notice_error(exception, options)
293
- nil # don't return a noticed error datastructure. it can only hurt.
286
+ nil # don't return a noticed error data structure. it can only hurt.
294
287
  end
295
288
 
296
289
  # @!endgroup
@@ -354,6 +347,7 @@ module NewRelic
354
347
  #
355
348
  def manual_start(options = {})
356
349
  raise "Options must be a hash" unless Hash === options
350
+
357
351
  NewRelic::Control.instance.init_plugin({:agent_enabled => true, :sync_startup => true}.merge(options))
358
352
  record_api_supportability_metric(:manual_start)
359
353
  end
@@ -586,15 +580,19 @@ module NewRelic
586
580
 
587
581
  segment = ::NewRelic::Agent::Tracer.current_segment
588
582
  if segment
589
- # Make sure not to override existing segment-level custom attributes
590
- segment_custom_keys = segment.attributes.custom_attributes.keys.map(&:to_sym)
591
- segment.add_custom_attributes(params.reject { |k, _v| segment_custom_keys.include?(k.to_sym) })
583
+ add_new_segment_attributes(params, segment)
592
584
  end
593
585
  else
594
586
  ::NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_attributes. Expected Hash but got #{params.class}")
595
587
  end
596
588
  end
597
589
 
590
+ def add_new_segment_attributes(params, segment)
591
+ # Make sure not to override existing segment-level custom attributes
592
+ segment_custom_keys = segment.attributes.custom_attributes.keys.map(&:to_sym)
593
+ segment.add_custom_attributes(params.reject { |k, _v| segment_custom_keys.include?(k.to_sym) })
594
+ end
595
+
598
596
  # Add custom attributes to the span event for the current span. Attributes will be visible on spans in the
599
597
  # New Relic Distributed Tracing UI and on span events in New Relic Insights.
600
598
  #
@@ -673,7 +671,7 @@ module NewRelic
673
671
 
674
672
  # Yield to a block that is run with a database metric name context. This means
675
673
  # the Database instrumentation will use this for the metric name if it does not
676
- # otherwise know about a model. This is re-entrant.
674
+ # otherwise know about a model. This is reentrant.
677
675
  #
678
676
  # @param [String,Class,#to_s] model the DB model class
679
677
  #
@@ -760,6 +758,7 @@ module NewRelic
760
758
  record_api_supportability_metric(:browser_timing_header)
761
759
 
762
760
  return EMPTY_STR unless agent
761
+
763
762
  agent.javascript_instrumentor.browser_timing_header(nonce)
764
763
  end
765
764
 
@@ -1,4 +1,3 @@
1
- # encoding: utf-8
2
1
  # This file is distributed under New Relic's license terms.
3
2
  # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
4
3
  # frozen_string_literal: true
@@ -72,7 +71,7 @@ module NewRelic
72
71
  extra = options.order!
73
72
  command = extra.shift
74
73
  # just make it a little easier on them
75
- command = 'deployments' if command =~ /deploy/
74
+ command = 'deployments' if command.include?('deploy')
76
75
  if command.nil?
77
76
  STDERR.puts options
78
77
  elsif !@command_names.include?(command)