newrelic_rpm 8.10.0 → 8.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (391) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +32 -190
  4. data/.rubocop_todo.yml +52 -0
  5. data/.simplecov +11 -2
  6. data/CHANGELOG.md +91 -26
  7. data/Gemfile +0 -1
  8. data/README.md +1 -1
  9. data/Rakefile +3 -20
  10. data/Thorfile +5 -0
  11. data/bin/nrdebug +63 -43
  12. data/config.dot +5 -5
  13. data/init.rb +1 -2
  14. data/install.rb +1 -2
  15. data/lib/new_relic/agent/adaptive_sampler.rb +0 -1
  16. data/lib/new_relic/agent/agent/shutdown.rb +0 -1
  17. data/lib/new_relic/agent/agent/special_startup.rb +0 -1
  18. data/lib/new_relic/agent/agent/start_worker_thread.rb +0 -1
  19. data/lib/new_relic/agent/agent/startup.rb +0 -1
  20. data/lib/new_relic/agent/agent.rb +100 -73
  21. data/lib/new_relic/agent/agent_logger.rb +4 -5
  22. data/lib/new_relic/agent/attribute_filter.rb +39 -21
  23. data/lib/new_relic/agent/attribute_processing.rb +3 -4
  24. data/lib/new_relic/agent/attributes.rb +0 -1
  25. data/lib/new_relic/agent/audit_logger.rb +2 -3
  26. data/lib/new_relic/agent/autostart.rb +0 -1
  27. data/lib/new_relic/agent/chained_call.rb +0 -1
  28. data/lib/new_relic/agent/commands/agent_command.rb +0 -1
  29. data/lib/new_relic/agent/commands/agent_command_router.rb +3 -4
  30. data/lib/new_relic/agent/commands/thread_profiler_session.rb +0 -1
  31. data/lib/new_relic/agent/configuration/default_source.rb +56 -27
  32. data/lib/new_relic/agent/configuration/dotted_hash.rb +1 -2
  33. data/lib/new_relic/agent/configuration/environment_source.rb +3 -4
  34. data/lib/new_relic/agent/configuration/event_harvest_config.rb +0 -1
  35. data/lib/new_relic/agent/configuration/high_security_source.rb +0 -1
  36. data/lib/new_relic/agent/configuration/manager.rb +1 -2
  37. data/lib/new_relic/agent/configuration/manual_source.rb +0 -1
  38. data/lib/new_relic/agent/configuration/mask_defaults.rb +2 -3
  39. data/lib/new_relic/agent/configuration/security_policy_source.rb +0 -1
  40. data/lib/new_relic/agent/configuration/server_source.rb +0 -1
  41. data/lib/new_relic/agent/configuration/yaml_source.rb +2 -3
  42. data/lib/new_relic/agent/configuration.rb +0 -1
  43. data/lib/new_relic/agent/connect/request_builder.rb +1 -2
  44. data/lib/new_relic/agent/connect/response_handler.rb +1 -2
  45. data/lib/new_relic/agent/custom_event_aggregator.rb +0 -1
  46. data/lib/new_relic/agent/database/explain_plan_helpers.rb +0 -1
  47. data/lib/new_relic/agent/database/obfuscation_helpers.rb +0 -1
  48. data/lib/new_relic/agent/database/obfuscator.rb +0 -1
  49. data/lib/new_relic/agent/database/postgres_explain_obfuscator.rb +0 -1
  50. data/lib/new_relic/agent/database.rb +13 -14
  51. data/lib/new_relic/agent/database_adapter.rb +0 -1
  52. data/lib/new_relic/agent/datastores/metric_helper.rb +0 -4
  53. data/lib/new_relic/agent/datastores/mongo/event_formatter.rb +2 -3
  54. data/lib/new_relic/agent/datastores/mongo/metric_translator.rb +1 -4
  55. data/lib/new_relic/agent/datastores/mongo/obfuscator.rb +0 -1
  56. data/lib/new_relic/agent/datastores/mongo.rb +0 -1
  57. data/lib/new_relic/agent/datastores/redis.rb +0 -1
  58. data/lib/new_relic/agent/datastores.rb +0 -1
  59. data/lib/new_relic/agent/deprecator.rb +0 -1
  60. data/lib/new_relic/agent/distributed_tracing/cross_app_payload.rb +0 -1
  61. data/lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb +0 -1
  62. data/lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb +0 -1
  63. data/lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb +0 -1
  64. data/lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb +0 -2
  65. data/lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb +0 -1
  66. data/lib/new_relic/agent/distributed_tracing/trace_context.rb +0 -1
  67. data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb +0 -1
  68. data/lib/new_relic/agent/distributed_tracing.rb +0 -1
  69. data/lib/new_relic/agent/encoding_normalizer.rb +0 -1
  70. data/lib/new_relic/agent/error_collector.rb +0 -1
  71. data/lib/new_relic/agent/error_event_aggregator.rb +0 -1
  72. data/lib/new_relic/agent/error_filter.rb +4 -5
  73. data/lib/new_relic/agent/error_trace_aggregator.rb +1 -2
  74. data/lib/new_relic/agent/event_aggregator.rb +0 -1
  75. data/lib/new_relic/agent/event_buffer.rb +0 -1
  76. data/lib/new_relic/agent/event_listener.rb +0 -1
  77. data/lib/new_relic/agent/event_loop.rb +2 -3
  78. data/lib/new_relic/agent/external.rb +1 -2
  79. data/lib/new_relic/agent/guid_generator.rb +0 -1
  80. data/lib/new_relic/agent/harvester.rb +0 -1
  81. data/lib/new_relic/agent/heap.rb +2 -3
  82. data/lib/new_relic/agent/hostname.rb +0 -1
  83. data/lib/new_relic/agent/http_clients/abstract.rb +0 -1
  84. data/lib/new_relic/agent/http_clients/curb_wrappers.rb +0 -1
  85. data/lib/new_relic/agent/http_clients/excon_wrappers.rb +0 -1
  86. data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb +1 -2
  87. data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb +1 -2
  88. data/lib/new_relic/agent/http_clients/net_http_wrappers.rb +0 -1
  89. data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb +1 -2
  90. data/lib/new_relic/agent/http_clients/uri_util.rb +0 -1
  91. data/lib/new_relic/agent/instrumentation/action_cable_subscriber.rb +0 -1
  92. data/lib/new_relic/agent/instrumentation/action_controller_subscriber.rb +8 -5
  93. data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb +1 -2
  94. data/lib/new_relic/agent/instrumentation/active_job.rb +0 -1
  95. data/lib/new_relic/agent/instrumentation/active_merchant.rb +2 -2
  96. data/lib/new_relic/agent/instrumentation/active_record.rb +0 -1
  97. data/lib/new_relic/agent/instrumentation/active_record_helper.rb +0 -1
  98. data/lib/new_relic/agent/instrumentation/active_record_notifications.rb +0 -1
  99. data/lib/new_relic/agent/instrumentation/active_record_prepend.rb +0 -1
  100. data/lib/new_relic/agent/instrumentation/active_record_subscriber.rb +0 -1
  101. data/lib/new_relic/agent/instrumentation/active_storage.rb +0 -1
  102. data/lib/new_relic/agent/instrumentation/active_storage_subscriber.rb +0 -1
  103. data/lib/new_relic/agent/instrumentation/active_support_logger/chain.rb +0 -1
  104. data/lib/new_relic/agent/instrumentation/active_support_logger/instrumentation.rb +0 -1
  105. data/lib/new_relic/agent/instrumentation/active_support_logger/prepend.rb +0 -1
  106. data/lib/new_relic/agent/instrumentation/active_support_logger.rb +0 -1
  107. data/lib/new_relic/agent/instrumentation/acts_as_solr.rb +0 -1
  108. data/lib/new_relic/agent/instrumentation/authlogic.rb +0 -1
  109. data/lib/new_relic/agent/instrumentation/bunny/chain.rb +0 -1
  110. data/lib/new_relic/agent/instrumentation/bunny/instrumentation.rb +0 -1
  111. data/lib/new_relic/agent/instrumentation/bunny/prepend.rb +0 -1
  112. data/lib/new_relic/agent/instrumentation/bunny.rb +0 -1
  113. data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb +2 -3
  114. data/lib/new_relic/agent/instrumentation/curb/chain.rb +0 -1
  115. data/lib/new_relic/agent/instrumentation/curb/instrumentation.rb +14 -11
  116. data/lib/new_relic/agent/instrumentation/curb/prepend.rb +0 -1
  117. data/lib/new_relic/agent/instrumentation/curb.rb +0 -1
  118. data/lib/new_relic/agent/instrumentation/data_mapper.rb +1 -2
  119. data/lib/new_relic/agent/instrumentation/delayed_job/chain.rb +0 -1
  120. data/lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb +0 -1
  121. data/lib/new_relic/agent/instrumentation/delayed_job/prepend.rb +0 -1
  122. data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb +0 -1
  123. data/lib/new_relic/agent/instrumentation/excon/middleware.rb +0 -1
  124. data/lib/new_relic/agent/instrumentation/excon.rb +0 -1
  125. data/lib/new_relic/agent/instrumentation/grape/chain.rb +0 -1
  126. data/lib/new_relic/agent/instrumentation/grape/instrumentation.rb +0 -1
  127. data/lib/new_relic/agent/instrumentation/grape/prepend.rb +0 -1
  128. data/lib/new_relic/agent/instrumentation/grape.rb +0 -1
  129. data/lib/new_relic/agent/instrumentation/grpc/client/chain.rb +0 -9
  130. data/lib/new_relic/agent/instrumentation/grpc/client/instrumentation.rb +10 -9
  131. data/lib/new_relic/agent/instrumentation/grpc/client/prepend.rb +0 -6
  132. data/lib/new_relic/agent/instrumentation/grpc/client/request_wrapper.rb +0 -1
  133. data/lib/new_relic/agent/instrumentation/grpc/helper.rb +2 -1
  134. data/lib/new_relic/agent/instrumentation/grpc/server/chain.rb +0 -1
  135. data/lib/new_relic/agent/instrumentation/grpc/server/instrumentation.rb +0 -1
  136. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_desc_prepend.rb +0 -1
  137. data/lib/new_relic/agent/instrumentation/grpc/server/rpc_server_prepend.rb +0 -1
  138. data/lib/new_relic/agent/instrumentation/grpc_client.rb +0 -1
  139. data/lib/new_relic/agent/instrumentation/grpc_server.rb +0 -1
  140. data/lib/new_relic/agent/instrumentation/httpclient/chain.rb +0 -1
  141. data/lib/new_relic/agent/instrumentation/httpclient/instrumentation.rb +0 -1
  142. data/lib/new_relic/agent/instrumentation/httpclient/prepend.rb +0 -1
  143. data/lib/new_relic/agent/instrumentation/httpclient.rb +0 -1
  144. data/lib/new_relic/agent/instrumentation/httprb/chain.rb +0 -1
  145. data/lib/new_relic/agent/instrumentation/httprb/instrumentation.rb +0 -1
  146. data/lib/new_relic/agent/instrumentation/httprb/prepend.rb +0 -1
  147. data/lib/new_relic/agent/instrumentation/httprb.rb +0 -1
  148. data/lib/new_relic/agent/instrumentation/ignore_actions.rb +0 -1
  149. data/lib/new_relic/agent/instrumentation/logger/chain.rb +0 -1
  150. data/lib/new_relic/agent/instrumentation/logger/instrumentation.rb +0 -1
  151. data/lib/new_relic/agent/instrumentation/logger/prepend.rb +0 -1
  152. data/lib/new_relic/agent/instrumentation/logger.rb +0 -1
  153. data/lib/new_relic/agent/instrumentation/memcache/chain.rb +0 -1
  154. data/lib/new_relic/agent/instrumentation/memcache/dalli.rb +1 -2
  155. data/lib/new_relic/agent/instrumentation/memcache/helper.rb +0 -1
  156. data/lib/new_relic/agent/instrumentation/memcache/instrumentation.rb +0 -1
  157. data/lib/new_relic/agent/instrumentation/memcache/prepend.rb +1 -2
  158. data/lib/new_relic/agent/instrumentation/memcache.rb +4 -5
  159. data/lib/new_relic/agent/instrumentation/middleware_proxy.rb +1 -2
  160. data/lib/new_relic/agent/instrumentation/middleware_tracing.rb +0 -1
  161. data/lib/new_relic/agent/instrumentation/mongo.rb +0 -1
  162. data/lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb +1 -2
  163. data/lib/new_relic/agent/instrumentation/net_http/chain.rb +0 -1
  164. data/lib/new_relic/agent/instrumentation/net_http/instrumentation.rb +0 -1
  165. data/lib/new_relic/agent/instrumentation/net_http/prepend.rb +0 -1
  166. data/lib/new_relic/agent/instrumentation/net_http.rb +0 -1
  167. data/lib/new_relic/agent/instrumentation/notifications_subscriber.rb +2 -3
  168. data/lib/new_relic/agent/instrumentation/padrino/chain.rb +0 -1
  169. data/lib/new_relic/agent/instrumentation/padrino/instrumentation.rb +0 -1
  170. data/lib/new_relic/agent/instrumentation/padrino/prepend.rb +0 -1
  171. data/lib/new_relic/agent/instrumentation/padrino.rb +0 -1
  172. data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb +0 -1
  173. data/lib/new_relic/agent/instrumentation/queue_time.rb +0 -2
  174. data/lib/new_relic/agent/instrumentation/rack/chain.rb +0 -1
  175. data/lib/new_relic/agent/instrumentation/rack/helpers.rb +0 -1
  176. data/lib/new_relic/agent/instrumentation/rack/instrumentation.rb +0 -1
  177. data/lib/new_relic/agent/instrumentation/rack/prepend.rb +0 -1
  178. data/lib/new_relic/agent/instrumentation/rack.rb +0 -1
  179. data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb +0 -1
  180. data/lib/new_relic/agent/instrumentation/rails_middleware.rb +0 -1
  181. data/lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb +0 -1
  182. data/lib/new_relic/agent/instrumentation/rails_notifications/action_controller.rb +0 -1
  183. data/lib/new_relic/agent/instrumentation/rails_notifications/action_view.rb +0 -1
  184. data/lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb +0 -1
  185. data/lib/new_relic/agent/instrumentation/rake/chain.rb +0 -1
  186. data/lib/new_relic/agent/instrumentation/rake/instrumentation.rb +5 -1
  187. data/lib/new_relic/agent/instrumentation/rake/prepend.rb +0 -1
  188. data/lib/new_relic/agent/instrumentation/rake.rb +0 -1
  189. data/lib/new_relic/agent/instrumentation/redis/chain.rb +0 -1
  190. data/lib/new_relic/agent/instrumentation/redis/instrumentation.rb +0 -1
  191. data/lib/new_relic/agent/instrumentation/redis/prepend.rb +0 -1
  192. data/lib/new_relic/agent/instrumentation/redis.rb +0 -1
  193. data/lib/new_relic/agent/instrumentation/resque/chain.rb +0 -1
  194. data/lib/new_relic/agent/instrumentation/resque/helper.rb +0 -1
  195. data/lib/new_relic/agent/instrumentation/resque/instrumentation.rb +0 -1
  196. data/lib/new_relic/agent/instrumentation/resque/prepend.rb +0 -1
  197. data/lib/new_relic/agent/instrumentation/resque.rb +0 -1
  198. data/lib/new_relic/agent/instrumentation/sequel.rb +0 -1
  199. data/lib/new_relic/agent/instrumentation/sequel_helper.rb +0 -1
  200. data/lib/new_relic/agent/instrumentation/sidekiq.rb +1 -2
  201. data/lib/new_relic/agent/instrumentation/sinatra/chain.rb +0 -1
  202. data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb +0 -1
  203. data/lib/new_relic/agent/instrumentation/sinatra/instrumentation.rb +0 -1
  204. data/lib/new_relic/agent/instrumentation/sinatra/prepend.rb +0 -1
  205. data/lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb +0 -1
  206. data/lib/new_relic/agent/instrumentation/sinatra.rb +0 -1
  207. data/lib/new_relic/agent/instrumentation/sunspot.rb +0 -1
  208. data/lib/new_relic/agent/instrumentation/thread/chain.rb +0 -1
  209. data/lib/new_relic/agent/instrumentation/thread/instrumentation.rb +0 -1
  210. data/lib/new_relic/agent/instrumentation/thread/prepend.rb +0 -1
  211. data/lib/new_relic/agent/instrumentation/thread.rb +0 -1
  212. data/lib/new_relic/agent/instrumentation/tilt/chain.rb +0 -1
  213. data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb +0 -1
  214. data/lib/new_relic/agent/instrumentation/tilt/prepend.rb +0 -1
  215. data/lib/new_relic/agent/instrumentation/tilt.rb +0 -1
  216. data/lib/new_relic/agent/instrumentation/typhoeus/chain.rb +0 -1
  217. data/lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb +3 -4
  218. data/lib/new_relic/agent/instrumentation/typhoeus/prepend.rb +0 -1
  219. data/lib/new_relic/agent/instrumentation/typhoeus.rb +0 -1
  220. data/lib/new_relic/agent/instrumentation.rb +0 -1
  221. data/lib/new_relic/agent/internal_agent_error.rb +0 -1
  222. data/lib/new_relic/agent/javascript_instrumentor.rb +1 -2
  223. data/lib/new_relic/agent/linking_metadata.rb +0 -1
  224. data/lib/new_relic/agent/local_log_decorator.rb +0 -1
  225. data/lib/new_relic/agent/log_event_aggregator.rb +0 -1
  226. data/lib/new_relic/agent/log_once.rb +0 -1
  227. data/lib/new_relic/agent/log_priority.rb +0 -1
  228. data/lib/new_relic/agent/logging.rb +0 -1
  229. data/lib/new_relic/agent/memory_logger.rb +0 -1
  230. data/lib/new_relic/agent/messaging.rb +1 -2
  231. data/lib/new_relic/agent/method_tracer.rb +0 -1
  232. data/lib/new_relic/agent/method_tracer_helpers.rb +1 -2
  233. data/lib/new_relic/agent/monitors/cross_app_monitor.rb +0 -1
  234. data/lib/new_relic/agent/monitors/distributed_tracing_monitor.rb +0 -1
  235. data/lib/new_relic/agent/monitors/inbound_request_monitor.rb +0 -1
  236. data/lib/new_relic/agent/monitors/synthetics_monitor.rb +0 -1
  237. data/lib/new_relic/agent/monitors.rb +0 -1
  238. data/lib/new_relic/agent/new_relic_service/encoders.rb +0 -1
  239. data/lib/new_relic/agent/new_relic_service/json_marshaller.rb +0 -1
  240. data/lib/new_relic/agent/new_relic_service/marshaller.rb +0 -1
  241. data/lib/new_relic/agent/new_relic_service/security_policy_settings.rb +0 -1
  242. data/lib/new_relic/agent/new_relic_service.rb +193 -142
  243. data/lib/new_relic/agent/{noticible_error.rb → noticeable_error.rb} +1 -2
  244. data/lib/new_relic/agent/null_logger.rb +0 -1
  245. data/lib/new_relic/agent/obfuscator.rb +1 -2
  246. data/lib/new_relic/agent/parameter_filtering.rb +0 -1
  247. data/lib/new_relic/agent/payload_metric_mapping.rb +0 -1
  248. data/lib/new_relic/agent/pipe_channel_manager.rb +0 -1
  249. data/lib/new_relic/agent/pipe_service.rb +0 -1
  250. data/lib/new_relic/agent/prepend_supportability.rb +0 -1
  251. data/lib/new_relic/agent/priority_sampled_buffer.rb +2 -3
  252. data/lib/new_relic/agent/range_extensions.rb +0 -1
  253. data/lib/new_relic/agent/rules_engine/replacement_rule.rb +0 -1
  254. data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb +0 -1
  255. data/lib/new_relic/agent/rules_engine.rb +0 -1
  256. data/lib/new_relic/agent/sampler.rb +0 -1
  257. data/lib/new_relic/agent/sampler_collection.rb +0 -1
  258. data/lib/new_relic/agent/samplers/cpu_sampler.rb +0 -1
  259. data/lib/new_relic/agent/samplers/delayed_job_sampler.rb +0 -1
  260. data/lib/new_relic/agent/samplers/memory_sampler.rb +5 -6
  261. data/lib/new_relic/agent/samplers/object_sampler.rb +0 -1
  262. data/lib/new_relic/agent/samplers/vm_sampler.rb +2 -1
  263. data/lib/new_relic/agent/span_event_aggregator.rb +0 -1
  264. data/lib/new_relic/agent/span_event_primitive.rb +0 -2
  265. data/lib/new_relic/agent/sql_sampler.rb +0 -1
  266. data/lib/new_relic/agent/stats.rb +12 -3
  267. data/lib/new_relic/agent/stats_engine/gc_profiler.rb +0 -2
  268. data/lib/new_relic/agent/stats_engine/stats_hash.rb +1 -2
  269. data/lib/new_relic/agent/stats_engine.rb +0 -1
  270. data/lib/new_relic/agent/synthetics_event_aggregator.rb +0 -1
  271. data/lib/new_relic/agent/system_info.rb +1 -2
  272. data/lib/new_relic/agent/threading/agent_thread.rb +12 -9
  273. data/lib/new_relic/agent/threading/backtrace_node.rb +0 -1
  274. data/lib/new_relic/agent/threading/backtrace_service.rb +0 -1
  275. data/lib/new_relic/agent/threading/thread_profile.rb +1 -2
  276. data/lib/new_relic/agent/timestamp_sampled_buffer.rb +0 -1
  277. data/lib/new_relic/agent/tracer.rb +7 -6
  278. data/lib/new_relic/agent/transaction/abstract_segment.rb +2 -3
  279. data/lib/new_relic/agent/transaction/datastore_segment.rb +0 -1
  280. data/lib/new_relic/agent/transaction/distributed_tracer.rb +0 -1
  281. data/lib/new_relic/agent/transaction/distributed_tracing.rb +0 -1
  282. data/lib/new_relic/agent/transaction/external_request_segment.rb +1 -2
  283. data/lib/new_relic/agent/transaction/message_broker_segment.rb +0 -1
  284. data/lib/new_relic/agent/transaction/request_attributes.rb +0 -1
  285. data/lib/new_relic/agent/transaction/segment.rb +0 -1
  286. data/lib/new_relic/agent/transaction/slowest_sample_buffer.rb +0 -1
  287. data/lib/new_relic/agent/transaction/synthetics_sample_buffer.rb +0 -1
  288. data/lib/new_relic/agent/transaction/trace.rb +0 -1
  289. data/lib/new_relic/agent/transaction/trace_builder.rb +0 -1
  290. data/lib/new_relic/agent/transaction/trace_context.rb +0 -1
  291. data/lib/new_relic/agent/transaction/trace_node.rb +2 -3
  292. data/lib/new_relic/agent/transaction/tracing.rb +0 -1
  293. data/lib/new_relic/agent/transaction/transaction_sample_buffer.rb +0 -2
  294. data/lib/new_relic/agent/transaction.rb +3 -5
  295. data/lib/new_relic/agent/transaction_error_primitive.rb +0 -1
  296. data/lib/new_relic/agent/transaction_event_aggregator.rb +0 -1
  297. data/lib/new_relic/agent/transaction_event_primitive.rb +0 -1
  298. data/lib/new_relic/agent/transaction_event_recorder.rb +1 -2
  299. data/lib/new_relic/agent/transaction_metrics.rb +1 -2
  300. data/lib/new_relic/agent/transaction_sampler.rb +0 -1
  301. data/lib/new_relic/agent/transaction_time_aggregator.rb +1 -2
  302. data/lib/new_relic/agent/utilization/aws.rb +0 -1
  303. data/lib/new_relic/agent/utilization/azure.rb +1 -2
  304. data/lib/new_relic/agent/utilization/gcp.rb +1 -2
  305. data/lib/new_relic/agent/utilization/pcf.rb +1 -2
  306. data/lib/new_relic/agent/utilization/vendor.rb +1 -2
  307. data/lib/new_relic/agent/utilization_data.rb +0 -1
  308. data/lib/new_relic/agent/vm/jruby_vm.rb +0 -1
  309. data/lib/new_relic/agent/vm/monotonic_gc_profiler.rb +0 -1
  310. data/lib/new_relic/agent/vm/mri_vm.rb +35 -23
  311. data/lib/new_relic/agent/vm/snapshot.rb +1 -2
  312. data/lib/new_relic/agent/vm.rb +0 -1
  313. data/lib/new_relic/agent/worker_loop.rb +0 -1
  314. data/lib/new_relic/agent.rb +13 -16
  315. data/lib/new_relic/cli/command.rb +1 -2
  316. data/lib/new_relic/cli/commands/deployments.rb +72 -21
  317. data/lib/new_relic/cli/commands/install.rb +0 -1
  318. data/lib/new_relic/coerce.rb +0 -1
  319. data/lib/new_relic/collection_helper.rb +1 -2
  320. data/lib/new_relic/constants.rb +0 -1
  321. data/lib/new_relic/control/class_methods.rb +0 -1
  322. data/lib/new_relic/control/frameworks/external.rb +0 -1
  323. data/lib/new_relic/control/frameworks/rails.rb +0 -1
  324. data/lib/new_relic/control/frameworks/rails3.rb +0 -1
  325. data/lib/new_relic/control/frameworks/rails4.rb +0 -1
  326. data/lib/new_relic/control/frameworks/rails_notifications.rb +0 -1
  327. data/lib/new_relic/control/frameworks/ruby.rb +0 -1
  328. data/lib/new_relic/control/frameworks/sinatra.rb +0 -1
  329. data/lib/new_relic/control/frameworks.rb +0 -1
  330. data/lib/new_relic/control/instance_methods.rb +17 -40
  331. data/lib/new_relic/control/instrumentation.rb +0 -1
  332. data/lib/new_relic/control/private_instance_methods.rb +48 -0
  333. data/lib/new_relic/control/server_methods.rb +0 -1
  334. data/lib/new_relic/control.rb +0 -1
  335. data/lib/new_relic/delayed_job_injection.rb +0 -1
  336. data/lib/new_relic/dependency_detection.rb +3 -4
  337. data/lib/new_relic/environment_report.rb +23 -14
  338. data/lib/new_relic/helper.rb +1 -2
  339. data/lib/new_relic/language_support.rb +7 -3
  340. data/lib/new_relic/latest_changes.rb +3 -4
  341. data/lib/new_relic/local_environment.rb +3 -4
  342. data/lib/new_relic/metric_data.rb +27 -22
  343. data/lib/new_relic/metric_spec.rb +0 -1
  344. data/lib/new_relic/noticed_error.rb +3 -6
  345. data/lib/new_relic/rack/agent_hooks.rb +0 -1
  346. data/lib/new_relic/rack/agent_middleware.rb +0 -1
  347. data/lib/new_relic/rack/browser_monitoring.rb +131 -123
  348. data/lib/new_relic/rack.rb +0 -1
  349. data/lib/new_relic/recipes/capistrano3.rb +2 -59
  350. data/lib/new_relic/recipes/capistrano_legacy.rb +1 -2
  351. data/lib/new_relic/recipes/helpers/send_deployment.rb +69 -0
  352. data/lib/new_relic/recipes.rb +0 -1
  353. data/lib/new_relic/supportability_helper.rb +1 -2
  354. data/lib/new_relic/traced_thread.rb +0 -1
  355. data/lib/new_relic/version.rb +1 -2
  356. data/lib/newrelic_rpm.rb +0 -1
  357. data/lib/sequel/extensions/newrelic_instrumentation.rb +2 -3
  358. data/lib/sequel/plugins/newrelic_instrumentation.rb +0 -1
  359. data/lib/tasks/all.rb +0 -1
  360. data/lib/tasks/config.rake +4 -113
  361. data/lib/tasks/coverage_report.rake +20 -15
  362. data/lib/tasks/{config.html.erb → helpers/config.html.erb} +0 -0
  363. data/lib/tasks/{config.text.erb → helpers/config.text.erb} +0 -0
  364. data/lib/tasks/helpers/format.rb +120 -0
  365. data/lib/tasks/helpers/matches.rb +12 -0
  366. data/lib/tasks/helpers/prompt.rb +24 -0
  367. data/lib/tasks/helpers/removers.rb +33 -0
  368. data/lib/tasks/install.rake +0 -1
  369. data/lib/tasks/instrumentation_generator/README.md +63 -0
  370. data/lib/tasks/instrumentation_generator/TODO.md +33 -0
  371. data/lib/tasks/instrumentation_generator/instrumentation.thor +102 -0
  372. data/lib/tasks/instrumentation_generator/templates/Envfile.tt +9 -0
  373. data/lib/tasks/instrumentation_generator/templates/chain.tt +21 -0
  374. data/lib/tasks/instrumentation_generator/templates/chain_method.tt +7 -0
  375. data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt +29 -0
  376. data/lib/tasks/instrumentation_generator/templates/instrumentation.tt +12 -0
  377. data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt +3 -0
  378. data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt +19 -0
  379. data/lib/tasks/instrumentation_generator/templates/prepend.tt +13 -0
  380. data/lib/tasks/instrumentation_generator/templates/prepend_method.tt +3 -0
  381. data/lib/tasks/instrumentation_generator/templates/test.tt +15 -0
  382. data/lib/tasks/multiverse.rake +0 -1
  383. data/lib/tasks/multiverse.rb +3 -29
  384. data/lib/tasks/newrelic.rb +0 -1
  385. data/lib/tasks/tests.rake +3 -8
  386. data/newrelic.yml +10 -1
  387. data/newrelic_rpm.gemspec +14 -19
  388. data/recipes/newrelic.rb +0 -1
  389. data/test/agent_helper.rb +22 -54
  390. metadata +50 -101
  391. data/bin/mongrel_rpm +0 -33
@@ -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
@@ -22,6 +21,9 @@ module NewRelic
22
21
  # underlying TCP connection may be in a bad state.
23
22
  CONNECTION_ERRORS = [Timeout::Error, EOFError, SystemCallError, SocketError].freeze
24
23
 
24
+ # The maximum number of times to attempt an HTTP request
25
+ MAX_ATTEMPTS = 2
26
+
25
27
  # Don't perform compression on the payload unless its uncompressed size is
26
28
  # greater than or equal to this number of bytes. In testing with
27
29
  # Ruby 2.2 - 3.1, we determined an absolute minimum value for ASCII to be
@@ -48,14 +50,22 @@ module NewRelic
48
50
  @request_headers_map = nil
49
51
  reset_remote_method_uris
50
52
 
53
+ prep_audit_logger
54
+ prep_marshaller
55
+ end
56
+
57
+ def prep_audit_logger
51
58
  @audit_logger = ::NewRelic::Agent::AuditLogger.new
52
59
  Agent.config.register_callback(:'audit_log.enabled') do |enabled|
53
60
  @audit_logger.enabled = enabled
54
61
  end
62
+ end
55
63
 
64
+ def prep_marshaller
56
65
  Agent.config.register_callback(:marshaller) do |marshaller|
57
66
  if marshaller != 'json'
58
- ::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.")
67
+ ::NewRelic::Agent.logger.warn("Non-JSON marshaller '#{marshaller}' requested but not supported, using " \
68
+ "JSON marshaller instead. pruby marshalling has been removed as of version 3.14.0.")
59
69
  end
60
70
 
61
71
  @marshaller = JsonMarshaller.new
@@ -131,12 +141,11 @@ module NewRelic
131
141
  timeslice_start = stats_hash.started_at
132
142
  timeslice_end = stats_hash.harvested_at || Process.clock_gettime(Process::CLOCK_REALTIME)
133
143
  metric_data_array = build_metric_data_array(stats_hash)
134
- result = invoke_remote(
144
+ invoke_remote(
135
145
  :metric_data,
136
146
  [@agent_id, timeslice_start, timeslice_end, metric_data_array],
137
147
  :item_count => metric_data_array.size
138
148
  )
139
- result
140
149
  end
141
150
 
142
151
  def error_data(unsent_errors)
@@ -217,7 +226,7 @@ module NewRelic
217
226
  # represents 1 tcp connection which may transmit multiple HTTP requests
218
227
  # via keep-alive.
219
228
  def session(&block)
220
- raise ArgumentError, "#{self.class}#shared_connection must be passed a block" unless block_given?
229
+ raise ArgumentError, "#{self.class}#shared_connection must be passed a block" unless block
221
230
 
222
231
  begin
223
232
  t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -237,22 +246,20 @@ module NewRelic
237
246
 
238
247
  def session_with_keepalive(&block)
239
248
  establish_shared_connection
240
- block.call
249
+ yield
241
250
  end
242
251
 
243
252
  def session_without_keepalive(&block)
244
253
  begin
245
254
  establish_shared_connection
246
- block.call
255
+ yield
247
256
  ensure
248
257
  close_shared_connection
249
258
  end
250
259
  end
251
260
 
252
261
  def establish_shared_connection
253
- unless @shared_tcp_connection
254
- @shared_tcp_connection = create_and_start_http_connection
255
- end
262
+ @shared_tcp_connection ||= create_and_start_http_connection
256
263
  @shared_tcp_connection
257
264
  end
258
265
 
@@ -326,20 +333,7 @@ module NewRelic
326
333
  end
327
334
 
328
335
  def create_http_connection
329
- if Agent.config[:proxy_host]
330
- ::NewRelic::Agent.logger.debug("Using proxy server #{Agent.config[:proxy_host]}:#{Agent.config[:proxy_port]}")
331
-
332
- proxy = Net::HTTP::Proxy(
333
- Agent.config[:proxy_host],
334
- Agent.config[:proxy_port],
335
- Agent.config[:proxy_user],
336
- Agent.config[:proxy_pass]
337
- )
338
- conn = proxy.new(@collector.name, @collector.port)
339
- else
340
- conn = Net::HTTP.new(@collector.name, @collector.port)
341
- end
342
-
336
+ conn = prep_connection
343
337
  setup_connection_for_ssl(conn)
344
338
  setup_connection_timeouts(conn)
345
339
 
@@ -347,6 +341,23 @@ module NewRelic
347
341
  conn
348
342
  end
349
343
 
344
+ def prep_connection
345
+ return Net::HTTP.new(@collector.name, @collector.port) unless Agent.config[:proxy_host]
346
+
347
+ ::NewRelic::Agent.logger.debug("Using proxy server #{Agent.config[:proxy_host]}:#{Agent.config[:proxy_port]}")
348
+ prep_proxy_connection
349
+ end
350
+
351
+ def prep_proxy_connection
352
+ proxy = Net::HTTP::Proxy(
353
+ Agent.config[:proxy_host],
354
+ Agent.config[:proxy_port],
355
+ Agent.config[:proxy_user],
356
+ Agent.config[:proxy_pass]
357
+ )
358
+ proxy.new(@collector.name, @collector.port)
359
+ end
360
+
350
361
  def create_and_start_http_connection
351
362
  conn = create_http_connection
352
363
  start_connection(conn)
@@ -380,6 +391,116 @@ module NewRelic
380
391
  NewRelic::Control.instance
381
392
  end
382
393
 
394
+ def prep_headers(opts)
395
+ headers = {
396
+ 'Content-Encoding' => opts[:encoding],
397
+ 'Host' => opts[:collector].name
398
+ }
399
+ headers.merge!(@request_headers_map) if @request_headers_map
400
+ headers
401
+ end
402
+
403
+ def prep_request(opts)
404
+ headers = prep_headers(opts)
405
+ if Agent.config[:put_for_data_send]
406
+ request = Net::HTTP::Put.new(opts[:uri], headers)
407
+ else
408
+ request = Net::HTTP::Post.new(opts[:uri], headers)
409
+ end
410
+ @audit_logger.log_request_headers(opts[:uri], headers)
411
+ request['user-agent'] = user_agent
412
+ request.content_type = "application/octet-stream"
413
+ request.body = opts[:data]
414
+ request
415
+ end
416
+
417
+ def relay_request(request, opts)
418
+ response = nil
419
+ attempts = 0
420
+
421
+ begin
422
+ attempts += 1
423
+ response = attempt_request(request, opts)
424
+ rescue *CONNECTION_ERRORS => e
425
+ close_shared_connection
426
+ if attempts < MAX_ATTEMPTS
427
+ ::NewRelic::Agent.logger.debug("Retrying request to #{opts[:collector]}#{opts[:uri]} after #{e}")
428
+ retry
429
+ else
430
+ raise ServerConnectionException, "Recoverable error talking to #{@collector} after #{attempts} attempts: #{e}"
431
+ end
432
+ end
433
+
434
+ log_response(response)
435
+ response
436
+ end
437
+
438
+ def attempt_request(request, opts)
439
+ response = nil
440
+ conn = http_connection
441
+ ::NewRelic::Agent.logger.debug("Sending request to #{opts[:collector]}#{opts[:uri]} with #{request.method}")
442
+ Timeout.timeout(@request_timeout) do
443
+ response = conn.request(request)
444
+ end
445
+ response
446
+ end
447
+
448
+ def handle_error_response(response, endpoint)
449
+ case response
450
+ when Net::HTTPRequestTimeOut,
451
+ Net::HTTPTooManyRequests,
452
+ Net::HTTPInternalServerError,
453
+ Net::HTTPServiceUnavailable
454
+ handle_server_connection_exception(response, endpoint)
455
+ when Net::HTTPBadRequest,
456
+ Net::HTTPForbidden,
457
+ Net::HTTPNotFound,
458
+ Net::HTTPMethodNotAllowed,
459
+ Net::HTTPProxyAuthenticationRequired,
460
+ Net::HTTPLengthRequired,
461
+ Net::HTTPRequestEntityTooLarge,
462
+ Net::HTTPRequestURITooLong,
463
+ Net::HTTPUnsupportedMediaType,
464
+ Net::HTTPExpectationFailed,
465
+ Net::HTTPUnsupportedMediaType,
466
+ Net::HTTPRequestHeaderFieldsTooLarge
467
+ handle_unrecoverable_server_exception(response, endpoint)
468
+ when Net::HTTPConflict,
469
+ Net::HTTPUnauthorized
470
+ handle_unauthorized_error_response(response, endpoint)
471
+ raise ForceRestartException, "#{response.code}: #{response.message}"
472
+ when Net::HTTPGone
473
+ handle_gone_response(response, endpoint)
474
+ else
475
+ record_endpoint_attempts_supportability_metrics(endpoint)
476
+ record_error_response_supportability_metrics(response.code)
477
+ raise UnrecoverableServerException, "#{response.code}: #{response.message}"
478
+ end
479
+ response
480
+ end
481
+
482
+ def handle_server_connection_exception(response, endpoint)
483
+ record_endpoint_attempts_supportability_metrics(endpoint)
484
+ raise ServerConnectionException, "#{response.code}: #{response.message}"
485
+ end
486
+
487
+ def handle_unrecoverable_server_exception(response, endpoint)
488
+ record_endpoint_attempts_supportability_metrics(endpoint)
489
+ record_error_response_supportability_metrics(response.code)
490
+ raise UnrecoverableServerException, "#{response.code}: #{response.message}"
491
+ end
492
+
493
+ def handle_unauthorized_error_response(response, endpoint)
494
+ record_endpoint_attempts_supportability_metrics(endpoint)
495
+ record_error_response_supportability_metrics(response.code)
496
+ end
497
+
498
+ def handle_gone_response(response, endpoint)
499
+ record_endpoint_attempts_supportability_metrics(endpoint)
500
+ record_error_response_supportability_metrics(response.code)
501
+ raise ForceDisconnectException, "#{response.code}: #{response.message}"
502
+ end
503
+
383
504
  def remote_method_uri(method)
384
505
  @remote_method_uris[method]
385
506
  end
@@ -418,42 +539,14 @@ module NewRelic
418
539
  # server may return
419
540
  def invoke_remote(method, payload = [], options = {})
420
541
  start_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
421
-
422
- data, size, serialize_finish_ts, request_send_ts, response_check_ts = nil
423
- begin
424
- data = @marshaller.dump(payload, options)
425
- rescue StandardError, SystemStackError => e
426
- handle_serialization_error(method, e)
427
- end
428
- serialize_finish_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
429
-
430
- size = data.size # only the uncompressed size is reported
431
- data, encoding = compress_request_if_needed(data, method)
432
-
433
- # Preconnect needs to always use the configured collector host, not the redirect host
434
- # We reset it here so we are always using the configured collector during our creation of the new connection
435
- # and we also don't want to keep the previous redirect host around anymore
436
- if method == :preconnect
437
- @collector = @configured_collector
438
- end
439
-
440
- uri = remote_method_uri(method)
441
- full_uri = "#{@collector}#{uri}"
442
-
443
- @audit_logger.log_request(full_uri, payload, @marshaller)
444
- request_send_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
445
- response = send_request(:data => data,
446
- :uri => uri,
447
- :encoding => encoding,
448
- :collector => @collector,
449
- :endpoint => method)
450
- response_check_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
542
+ request_send_ts, response_check_ts = nil
543
+ data, encoding, size, serialize_finish_ts = marshal_payload(method, payload, options)
544
+ prep_collector(method)
545
+ response, request_send_ts, response_check_ts = invoke_remote_send_request(method, payload, data, encoding)
451
546
  @marshaller.load(decompress_response(response))
452
547
  ensure
453
548
  record_timing_supportability_metrics(method, start_ts, serialize_finish_ts, request_send_ts, response_check_ts)
454
- if size
455
- record_size_supportability_metrics(method, size, options[:item_count])
456
- end
549
+ record_size_supportability_metrics(method, size, options[:item_count]) if size
457
550
  end
458
551
 
459
552
  def handle_serialization_error(method, e)
@@ -515,86 +608,11 @@ module NewRelic
515
608
  # contact
516
609
  # - :data => the data to send as the body of the request
517
610
  def send_request(opts)
518
- headers = {
519
- 'Content-Encoding' => opts[:encoding],
520
- 'Host' => opts[:collector].name
521
- }
522
- headers.merge!(@request_headers_map) if @request_headers_map
523
-
524
- if Agent.config[:put_for_data_send]
525
- request = Net::HTTP::Put.new(opts[:uri], headers)
526
- else
527
- request = Net::HTTP::Post.new(opts[:uri], headers)
528
- end
529
- @audit_logger.log_request_headers(opts[:uri], headers)
530
- request['user-agent'] = user_agent
531
- request.content_type = "application/octet-stream"
532
- request.body = opts[:data]
533
-
534
- response = nil
535
- attempts = 0
536
- max_attempts = 2
537
- endpoint = opts[:endpoint]
611
+ request = prep_request(opts)
612
+ response = relay_request(request, opts)
613
+ return response if response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPAccepted)
538
614
 
539
- begin
540
- attempts += 1
541
- conn = http_connection
542
- ::NewRelic::Agent.logger.debug("Sending request to #{opts[:collector]}#{opts[:uri]} with #{request.method}")
543
- Timeout.timeout(@request_timeout) do
544
- response = conn.request(request)
545
- end
546
- rescue *CONNECTION_ERRORS => e
547
- close_shared_connection
548
- if attempts < max_attempts
549
- ::NewRelic::Agent.logger.debug("Retrying request to #{opts[:collector]}#{opts[:uri]} after #{e}")
550
- retry
551
- else
552
- raise ServerConnectionException, "Recoverable error talking to #{@collector} after #{attempts} attempts: #{e}"
553
- end
554
- end
555
-
556
- log_response(response)
557
-
558
- case response
559
- when Net::HTTPSuccess,
560
- Net::HTTPAccepted
561
- true # do nothing
562
- when Net::HTTPRequestTimeOut,
563
- Net::HTTPTooManyRequests,
564
- Net::HTTPInternalServerError,
565
- Net::HTTPServiceUnavailable
566
- record_endpoint_attempts_supportability_metrics(endpoint)
567
- raise ServerConnectionException, "#{response.code}: #{response.message}"
568
- when Net::HTTPBadRequest,
569
- Net::HTTPForbidden,
570
- Net::HTTPNotFound,
571
- Net::HTTPMethodNotAllowed,
572
- Net::HTTPProxyAuthenticationRequired,
573
- Net::HTTPLengthRequired,
574
- Net::HTTPRequestEntityTooLarge,
575
- Net::HTTPRequestURITooLong,
576
- Net::HTTPUnsupportedMediaType,
577
- Net::HTTPExpectationFailed,
578
- Net::HTTPUnsupportedMediaType,
579
- Net::HTTPRequestHeaderFieldsTooLarge
580
- record_endpoint_attempts_supportability_metrics(endpoint)
581
- record_error_response_supportability_metrics(response.code)
582
- raise UnrecoverableServerException, "#{response.code}: #{response.message}"
583
- when Net::HTTPConflict,
584
- Net::HTTPUnauthorized
585
- record_endpoint_attempts_supportability_metrics(endpoint)
586
- record_error_response_supportability_metrics(response.code)
587
- raise ForceRestartException, "#{response.code}: #{response.message}"
588
- when Net::HTTPGone
589
- record_endpoint_attempts_supportability_metrics(endpoint)
590
- record_error_response_supportability_metrics(response.code)
591
- raise ForceDisconnectException, "#{response.code}: #{response.message}"
592
- else
593
- record_endpoint_attempts_supportability_metrics(endpoint)
594
- record_error_response_supportability_metrics(response.code)
595
- raise UnrecoverableServerException, "#{response.code}: #{response.message}"
596
- end
597
- response
615
+ handle_error_response(response, opts[:endpoint])
598
616
  end
599
617
 
600
618
  def log_response(response)
@@ -614,11 +632,9 @@ module NewRelic
614
632
  # Decompresses the response from the server, if it is gzip
615
633
  # encoded, otherwise returns it verbatim
616
634
  def decompress_response(response)
617
- if response['content-encoding'] == 'gzip'
618
- Zlib::GzipReader.new(StringIO.new(response.body)).read
619
- else
620
- response.body
621
- end
635
+ return response.body unless response['content-encoding'] == 'gzip'
636
+
637
+ Zlib::GzipReader.new(StringIO.new(response.body)).read
622
638
  end
623
639
 
624
640
  # Sets the user agent for connections to the server, to
@@ -627,11 +643,46 @@ module NewRelic
627
643
  # that may cause corrupt compression if there is a problem.
628
644
  def user_agent
629
645
  if defined?(::RUBY_VERSION) && defined?(::RUBY_PLATFORM)
630
- ruby_description = "(ruby #{::RUBY_VERSION} #{::RUBY_PLATFORM}) " # note the trailing space!
646
+ ruby_description = "(ruby #{::RUBY_VERSION} #{::RUBY_PLATFORM}) " # NOTE: the trailing space!
631
647
  end
632
648
  zlib_version = "zlib/#{Zlib.zlib_version}" if defined?(::Zlib) && Zlib.respond_to?(:zlib_version)
633
649
  "NewRelic-RubyAgent/#{NewRelic::VERSION::STRING} #{ruby_description}#{zlib_version}"
634
650
  end
651
+
652
+ def marshal_payload(method, payload, options)
653
+ begin
654
+ data = @marshaller.dump(payload, options)
655
+ rescue StandardError, SystemStackError => e
656
+ handle_serialization_error(method, e)
657
+ end
658
+ serialize_finish_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
659
+
660
+ size = data.size # only the uncompressed size is reported
661
+ data, encoding = compress_request_if_needed(data, method)
662
+
663
+ [data, encoding, size, serialize_finish_ts]
664
+ end
665
+
666
+ def prep_collector(method)
667
+ # Preconnect needs to always use the configured collector host, not the redirect host
668
+ # We reset it here so we are always using the configured collector during our creation of the new connection
669
+ # and we also don't want to keep the previous redirect host around anymore
670
+ @collector = @configured_collector if method == :preconnect
671
+ end
672
+
673
+ def invoke_remote_send_request(method, payload, data, encoding)
674
+ uri = remote_method_uri(method)
675
+ full_uri = "#{@collector}#{uri}"
676
+
677
+ @audit_logger.log_request(full_uri, payload, @marshaller)
678
+ request_send_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
679
+ response = send_request(:data => data,
680
+ :uri => uri,
681
+ :encoding => encoding,
682
+ :collector => @collector,
683
+ :endpoint => method)
684
+ [response, request_send_ts, Process.clock_gettime(Process::CLOCK_MONOTONIC)]
685
+ end
635
686
  end
636
687
  end
637
688
  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
@@ -8,7 +7,7 @@ module NewRelic
8
7
  # This class is used for instrumentations that have exceptions or error classes
9
8
  # not derived from Ruby's usual Exception or StandardError or in situations
10
9
  # where we do not have such Exception object to work with.
11
- class NoticibleError
10
+ class NoticeableError
12
11
  attr_reader :class_name, :message
13
12
 
14
13
  def initialize(class_name, message)
@@ -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,7 +23,7 @@ module NewRelic
24
23
  end
25
24
 
26
25
  def obfuscate(text)
27
- [encode(text)].pack(PACK_FORMAT).gsub(/\n/, '')
26
+ [encode(text)].pack(PACK_FORMAT).delete("\n")
28
27
  end
29
28
 
30
29
  def deobfuscate(text)
@@ -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
@@ -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
@@ -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
@@ -35,13 +34,13 @@ module NewRelic
35
34
  priority ||= priority_for(event)
36
35
  if priority_for(@items[0]) < priority
37
36
  heapify_items_array
38
- incoming = event || blk.call
37
+ incoming = event || yield
39
38
  @items[0] = incoming
40
39
  @items.fix(0)
41
40
  incoming
42
41
  end
43
42
  else
44
- @items << (event || blk.call)
43
+ @items << (event || yield)
45
44
  @captured_lifetime += 1
46
45
  @items[-1]
47
46
  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
@@ -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
@@ -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
@@ -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
@@ -20,7 +19,7 @@ module NewRelic
20
19
  # macos, linux, solaris
21
20
  if defined? JRuby
22
21
  @sampler = JavaHeapSampler.new
23
- elsif platform =~ /linux/
22
+ elsif platform.include?('linux')
24
23
  @sampler = ProcStatus.new
25
24
  if !@sampler.can_run?
26
25
  ::NewRelic::Agent.logger.debug("Error attempting to use /proc/#{$$}/status file for reading memory. Using ps command instead.")
@@ -28,13 +27,13 @@ module NewRelic
28
27
  else
29
28
  ::NewRelic::Agent.logger.debug("Using /proc/#{$$}/status for reading process memory.")
30
29
  end
31
- elsif platform =~ /darwin9/ # 10.5
30
+ elsif platform.include?('darwin9') # 10.5
32
31
  @sampler = ShellPS.new("ps -o rsz")
33
32
  elsif platform =~ /darwin(1|2)\d+/ # >= 10.6
34
33
  @sampler = ShellPS.new("ps -o rss")
35
- elsif platform =~ /freebsd/
34
+ elsif platform.include?('freebsd')
36
35
  @sampler = ShellPS.new("ps -o rss")
37
- elsif platform =~ /solaris/
36
+ elsif platform.include?('solaris')
38
37
  @sampler = ShellPS.new("/usr/bin/ps -o rss -p")
39
38
  end
40
39
 
@@ -47,7 +46,7 @@ module NewRelic
47
46
  end
48
47
 
49
48
  def self.platform
50
- if RUBY_PLATFORM =~ /java/
49
+ if RUBY_PLATFORM.include?('java')
51
50
  begin
52
51
  NewRelic::Helper.run_command('uname -s').downcase
53
52
  rescue NewRelic::CommandRunFailedError, NewRelic::CommandExecutableNotFoundError
@@ -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
@@ -19,6 +18,7 @@ module NewRelic
19
18
  MINOR_GC_METRIC = 'RubyVM/GC/minor_gc_count'.freeze
20
19
  METHOD_INVALIDATIONS_METRIC = 'RubyVM/CacheInvalidations/method'.freeze
21
20
  CONSTANT_INVALIDATIONS_METRIC = 'RubyVM/CacheInvalidations/constant'.freeze
21
+ CONSTANT_MISSES_METRIC = 'RubyVM/CacheMisses/constant'.freeze
22
22
 
23
23
  attr_reader :transaction_count
24
24
 
@@ -115,6 +115,7 @@ module NewRelic
115
115
  record_delta(snap, :minor_gc_count, MINOR_GC_METRIC, tcount)
116
116
  record_delta(snap, :method_cache_invalidations, METHOD_INVALIDATIONS_METRIC, tcount)
117
117
  record_delta(snap, :constant_cache_invalidations, CONSTANT_INVALIDATIONS_METRIC, tcount)
118
+ record_delta(snap, :constant_cache_misses, CONSTANT_MISSES_METRIC, tcount)
118
119
  record_heap_live_metric(snap)
119
120
  record_heap_free_metric(snap)
120
121
  record_thread_count_metric(snap)
@@ -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